From 0f6ee62126ff0d8693c791d84fa735f88dbdf51a Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Fri, 20 Sep 2024 14:35:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E8=B4=AD=E5=8D=95=E3=80=81=E8=AF=B7?= =?UTF-8?q?=E6=AC=BE=E5=8D=95=E6=8E=A5=E5=8F=A3=E5=AE=8C=E5=96=84=202024?= =?UTF-8?q?=E5=B9=B49=E6=9C=8820=E6=97=A514:35:03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dgx/u9c/dao/IPrepaymentDetailDao.java | 12 + .../dgx/u9c/dao/IRequisitionDetailDao.java | 12 + .../u9c/dao/impl/PrepaymentDetailDaoImpl.java | 13 + .../dao/impl/RequisitionDetailDaoImpl.java | 13 + .../u9c/entity/PrepaymentDetailEntity.java | 11 + .../u9c/entity/RequisitionDetailEntity.java | 11 + .../u9c/service/IPrepaymentDetailService.java | 21 ++ .../service/IRequisitionDetailService.java | 20 ++ .../impl/PrepaymentDetailServiceImpl.java | 38 +++ .../impl/RequisitionDetailServiceImpl.java | 38 +++ .../service/impl/U9CPluginServiceImpl.java | 294 +++++++++++++++--- .../dgx/spring/spring-buildpackage-dao.xml | 4 +- .../spring/spring-buildpackage-service.xml | 2 + 13 files changed, 451 insertions(+), 38 deletions(-) create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/IPrepaymentDetailDao.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/IRequisitionDetailDao.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/impl/PrepaymentDetailDaoImpl.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/impl/RequisitionDetailDaoImpl.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentDetailEntity.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/RequisitionDetailEntity.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/IPrepaymentDetailService.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/IRequisitionDetailService.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/PrepaymentDetailServiceImpl.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/RequisitionDetailServiceImpl.java diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/IPrepaymentDetailDao.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/IPrepaymentDetailDao.java new file mode 100644 index 00000000..61dcfe37 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/IPrepaymentDetailDao.java @@ -0,0 +1,12 @@ +package com.hzya.frame.plugin.dgx.u9c.dao; + +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.plugin.dgx.u9c.entity.PrepaymentDetailEntity; + +/** + * @Description 德广信U9C预付单明细表 + * @Author xiangerlin + * @Date 2024/9/18 17:18 + **/ +public interface IPrepaymentDetailDao extends IBaseDao { +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/IRequisitionDetailDao.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/IRequisitionDetailDao.java new file mode 100644 index 00000000..d077ae1c --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/IRequisitionDetailDao.java @@ -0,0 +1,12 @@ +package com.hzya.frame.plugin.dgx.u9c.dao; + +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.plugin.dgx.u9c.entity.RequisitionDetailEntity; + +/** + * @Description 德广信U9C请购单明细 + * @Author xiangerlin + * @Date 2024/9/18 17:15 + **/ +public interface IRequisitionDetailDao extends IBaseDao { +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/impl/PrepaymentDetailDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/impl/PrepaymentDetailDaoImpl.java new file mode 100644 index 00000000..74ccc168 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/impl/PrepaymentDetailDaoImpl.java @@ -0,0 +1,13 @@ +package com.hzya.frame.plugin.dgx.u9c.dao.impl; + +import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.plugin.dgx.u9c.dao.IPrepaymentDetailDao; +import com.hzya.frame.plugin.dgx.u9c.entity.PrepaymentDetailEntity; + +/** + * @Description 德广信U9C预付单明细表 + * @Author xiangerlin + * @Date 2024/9/18 17:19 + **/ +public class PrepaymentDetailDaoImpl extends MybatisGenericDao implements IPrepaymentDetailDao { +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/impl/RequisitionDetailDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/impl/RequisitionDetailDaoImpl.java new file mode 100644 index 00000000..7f495405 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/impl/RequisitionDetailDaoImpl.java @@ -0,0 +1,13 @@ +package com.hzya.frame.plugin.dgx.u9c.dao.impl; + +import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.plugin.dgx.u9c.dao.IRequisitionDetailDao; +import com.hzya.frame.plugin.dgx.u9c.entity.RequisitionDetailEntity; + +/** + * @Description 德广信U9C请购单明细 + * @Author xiangerlin + * @Date 2024/9/18 17:17 + **/ +public class RequisitionDetailDaoImpl extends MybatisGenericDao implements IRequisitionDetailDao { +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentDetailEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentDetailEntity.java new file mode 100644 index 00000000..35565ce0 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentDetailEntity.java @@ -0,0 +1,11 @@ +package com.hzya.frame.plugin.dgx.u9c.entity; + +import com.hzya.frame.web.entity.BaseEntity; + +/** + * @Description 德广信U9C预付单明细 + * @Author xiangerlin + * @Date 2024/9/18 17:11 + **/ +public class PrepaymentDetailEntity extends BaseEntity { +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/RequisitionDetailEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/RequisitionDetailEntity.java new file mode 100644 index 00000000..ec5b5174 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/RequisitionDetailEntity.java @@ -0,0 +1,11 @@ +package com.hzya.frame.plugin.dgx.u9c.entity; + +import com.hzya.frame.web.entity.BaseEntity; + +/** + * @Description 德广信U9C请购单明细 + * @Author xiangerlin + * @Date 2024/9/18 17:11 + **/ +public class RequisitionDetailEntity extends BaseEntity { +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/IPrepaymentDetailService.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/IPrepaymentDetailService.java new file mode 100644 index 00000000..095081d2 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/IPrepaymentDetailService.java @@ -0,0 +1,21 @@ +package com.hzya.frame.plugin.dgx.u9c.service; + +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.plugin.dgx.u9c.entity.PrepaymentDetailEntity; + +import java.util.List; + +/** + * @Description 德广信U9C预付单明细 + * @Author xiangerlin + * @Date 2024/9/18 17:22 + **/ +public interface IPrepaymentDetailService extends IBaseService { + + /** + * 查询预付单明细 + * @param entity + * @return + */ + List queryDetails(PrepaymentDetailEntity entity); +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/IRequisitionDetailService.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/IRequisitionDetailService.java new file mode 100644 index 00000000..7e3c5c98 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/IRequisitionDetailService.java @@ -0,0 +1,20 @@ +package com.hzya.frame.plugin.dgx.u9c.service; + +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.plugin.dgx.u9c.entity.RequisitionDetailEntity; + +import java.util.List; + +/** + * @Description 广信U9C请购单 明细 + * @Author xiangerlin + * @Date 2024/9/18 17:22 + **/ +public interface IRequisitionDetailService extends IBaseService { + /** + * 查询请购单明细 + * @param entity + * @return + */ + List queryDetails(RequisitionDetailEntity entity); +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/PrepaymentDetailServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/PrepaymentDetailServiceImpl.java new file mode 100644 index 00000000..50cb86af --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/PrepaymentDetailServiceImpl.java @@ -0,0 +1,38 @@ +package com.hzya.frame.plugin.dgx.u9c.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.plugin.dgx.u9c.dao.IPrepaymentDetailDao; +import com.hzya.frame.plugin.dgx.u9c.entity.PrepaymentDetailEntity; +import com.hzya.frame.plugin.dgx.u9c.service.IPrepaymentDetailService; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; + +/** + * @Description 德广信U9C预付单明细 + * @Author xiangerlin + * @Date 2024/9/18 17:23 + **/ +public class PrepaymentDetailServiceImpl extends BaseService implements IPrepaymentDetailService { + + private IPrepaymentDetailDao prepaymentDetailDao; + + @Autowired + public void setPrepaymentDetailDao(IPrepaymentDetailDao dao) { + this.prepaymentDetailDao = dao; + this.dao = dao; + } + + /** + * 查询预付单明细 + * + * @param entity + * @return + */ + @DS("#entity.dataSourceCode") + @Override + public List queryDetails(PrepaymentDetailEntity entity) { + return null; + } +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/RequisitionDetailServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/RequisitionDetailServiceImpl.java new file mode 100644 index 00000000..32de1489 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/RequisitionDetailServiceImpl.java @@ -0,0 +1,38 @@ +package com.hzya.frame.plugin.dgx.u9c.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.plugin.dgx.u9c.dao.IRequisitionDetailDao; +import com.hzya.frame.plugin.dgx.u9c.entity.RequisitionDetailEntity; +import com.hzya.frame.plugin.dgx.u9c.service.IRequisitionDetailService; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; + +/** + * @Description + * @Author xiangerlin + * @Date 2024/9/18 17:25 + **/ +public class RequisitionDetailServiceImpl extends BaseService implements IRequisitionDetailService { + + private IRequisitionDetailDao requisitionDetailDao; + + @Autowired + public void setRequisitionDetailDao(IRequisitionDetailDao dao) { + this.requisitionDetailDao = dao; + this.dao = dao; + } + + /** + * 查询请购单明细 + * + * @param entity + * @return + */ + @DS("#entity.dataSourceCode") + @Override + public List queryDetails(RequisitionDetailEntity entity) { + return null; + } +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/U9CPluginServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/U9CPluginServiceImpl.java index 6e3577a5..487ee9d5 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/U9CPluginServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/U9CPluginServiceImpl.java @@ -4,11 +4,11 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.plugin.dgx.u9c.entity.PrepaymentDetailEntity; import com.hzya.frame.plugin.dgx.u9c.entity.PrepaymentEntity; +import com.hzya.frame.plugin.dgx.u9c.entity.RequisitionDetailEntity; import com.hzya.frame.plugin.dgx.u9c.entity.RequisitionEntity; -import com.hzya.frame.plugin.dgx.u9c.service.IPrepaymentService; -import com.hzya.frame.plugin.dgx.u9c.service.IRequisitionService; -import com.hzya.frame.plugin.dgx.u9c.service.IU9CPluginService; +import com.hzya.frame.plugin.dgx.u9c.service.*; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.apache.commons.collections.CollectionUtils; @@ -28,8 +28,12 @@ public class U9CPluginServiceImpl implements IU9CPluginService { Logger logger = LoggerFactory.getLogger(getClass()); @Resource(name = "prepaymentServiceImpl") private IPrepaymentService prepaymentService; + @Resource + private IPrepaymentDetailService prepaymentDetailServiceImpl; @Resource(name = "requisitionServiceImpl") private IRequisitionService requisitionService; + @Resource + private IRequisitionDetailService requisitionDetailServiceImpl; /** * u9c预付单发起OA请款单流程 @@ -59,23 +63,175 @@ public class U9CPluginServiceImpl implements IU9CPluginService { List prepaymentList = prepaymentService.queryList(prepaymentEntity); if (CollectionUtils.isNotEmpty(prepaymentList)){ for (PrepaymentEntity prepayment : prepaymentList) { - //主表 - JSONObject formmain_0668 = new JSONObject(); - //子表 - List formsonList = new LinkedList<>(); - JSONObject formson_0669 = new JSONObject(); - formsonList.add(formson_0669); - JSONObject formData = new JSONObject(); - formData.put("formmain_0668",formmain_0668); - formData.put("formson_0669",formsonList); - JSONObject data = new JSONObject(); - data.put("templateCode",""); - data.put("draft","0"); - data.put("data",formData); - JSONObject param = new JSONObject(); - param.put("appName","collaboration"); - param.put("data",data); - String s = invokeEsb(param, "800045", "8000450001"); + //查询u9c预付单明细 + PrepaymentDetailEntity prepaymentDetailEntity = new PrepaymentDetailEntity(); + List prepaymentDetailList = prepaymentDetailServiceImpl.queryDetails(prepaymentDetailEntity); + if (CollectionUtils.isNotEmpty(prepaymentDetailList)){ + //主表 + JSONObject formmain_0668 = new JSONObject(); + //单据类型 + formmain_0668.put("field0001",""); + //币种 + formmain_0668.put("field0002",""); + //单号 + formmain_0668.put("field0003",""); + //业务员 + formmain_0668.put("field0004",""); + //申请日期 + formmain_0668.put("field0005",""); + //部门 + formmain_0668.put("field0006",""); + //预计付款日 + formmain_0668.put("field0007",""); + //付款方式 + formmain_0668.put("field0008",""); + //请款对象 + formmain_0668.put("field0009",""); + //状态 + formmain_0668.put("field0010",""); + //请款用途 + formmain_0668.put("field0011",""); + //出纳确认 + formmain_0668.put("field0012",""); + //折扣前请款金额合计 + formmain_0668.put("field0044",""); + //请款对应折扣合计 + formmain_0668.put("field0045",""); + //折扣后请款金额合计 + formmain_0668.put("field0046",""); + //付款本币金额合计 + formmain_0668.put("field0047",""); + //请款金额合计 + formmain_0668.put("field0053",""); + //请款数量合计 + formmain_0668.put("field0061",""); + //请款金额和明细合计 + formmain_0668.put("field0063",""); + //单据编号 + formmain_0668.put("field0070",""); + //发起人 + formmain_0668.put("field0071",""); + //发起部门 + formmain_0668.put("field0072",""); + //发起时间 + formmain_0668.put("field0073",""); + //子表 + List formson69List = new LinkedList<>(); + List formson70List = new LinkedList<>(); + for (PrepaymentDetailEntity detail : prepaymentDetailList) { + JSONObject formson_0669 = new JSONObject(); + //行号 + formson_0669.put("field0013",""); + //供应商 + formson_0669.put("field0014",""); + //选单 + formson_0669.put("field0015",""); + //折扣前请款金额 + formson_0669.put("field0016",""); + //请款对应折扣 + formson_0669.put("field0017",""); + //折扣后请款金额 + formson_0669.put("field0018",""); + //付款本币金额 + formson_0669.put("field0019",""); + //结算方式 + formson_0669.put("field0020",""); + //收款银行帐号 + formson_0669.put("field0021",""); + //收款账号名称 + formson_0669.put("field0022",""); + //开户银行 + formson_0669.put("field0023",""); + //收支项目 + formson_0669.put("field0024",""); + //部门-供应商 + formson_0669.put("field0025",""); + //业务员-供应商 + formson_0669.put("field0026",""); + //项目-供应商 + formson_0669.put("field0027",""); + //预付款类型 + formson_0669.put("field0051",""); + //请款金额 + formson_0669.put("field0052",""); + //料品 + formson_0669.put("field0054",""); + formson69List.add(formson_0669); + + JSONObject formson_0070 = new JSONObject(); + //单据类型明细 + formson_0070.put("field0028",""); + //应付单 + formson_0070.put("field0029",""); + //折扣前可请款金额 + formson_0070.put("field0030",""); + //可享受折扣 + formson_0070.put("field0031",""); + //折扣前请款金额明细 + formson_0070.put("field0032",""); + //请款享受折扣 + formson_0070.put("field0033",""); + //折扣后请款金额明细 + formson_0070.put("field0034",""); + //累计确认对应金额 + formson_0070.put("field0035",""); + //发票号 + formson_0070.put("field0036",""); + //发票日期 + formson_0070.put("field0037",""); + //立账日期 + formson_0070.put("field0038",""); + //记账日期 + formson_0070.put("field0039",""); + //到期日 + formson_0070.put("field0040",""); + //付款条件 + formson_0070.put("field0041",""); + //部门明细 + formson_0070.put("field0042",""); + //业务员明细 + formson_0070.put("field0043",""); + //预付款类型明细 + formson_0070.put("field0055",""); + //单号明细 + formson_0070.put("field0056",""); + //单价 + formson_0070.put("field0057",""); + //数量 + formson_0070.put("field0058",""); + //单位 + formson_0070.put("field0059",""); + //请款数量 + formson_0070.put("field0060",""); + //请款金额明细 + formson_0070.put("field0062",""); + //费用 + formson_0070.put("field0064",""); + //料号 + formson_0070.put("field0065",""); + //料品明细 + formson_0070.put("field0066",""); + //项目 + formson_0070.put("field0067",""); + //立账供应商 + formson_0070.put("field0068",""); + //单据状态 + formson_0070.put("field0069",""); + formson70List.add(formson_0070); + } + JSONObject formData = new JSONObject(); + formData.put("formmain_0668",formmain_0668); + formData.put("formson_0669",formson69List); + formData.put("formson_0670",formson70List); + JSONObject data = new JSONObject(); + data.put("templateCode",""); + data.put("draft","0"); + data.put("data",formData); + JSONObject param = new JSONObject(); + param.put("appName","collaboration"); + param.put("data",data); + String s = invokeEsb(param, "800045", "8000450001"); + } } } @@ -100,6 +256,7 @@ public class U9CPluginServiceImpl implements IU9CPluginService { String taskId = requestJson.getString("integration_task_living_details_id"); //查询u9c请购单 RequisitionEntity requisitionEntity = new RequisitionEntity(); + requisitionEntity.setDataSourceCode(datasourceCode); if (StrUtil.isEmpty(taskId)){ requisitionEntity.setStartTime(startTime); requisitionEntity.setEndTime(endTime); @@ -109,23 +266,86 @@ public class U9CPluginServiceImpl implements IU9CPluginService { List requisitionList = requisitionService.queryList(requisitionEntity); if (CollectionUtils.isNotEmpty(requisitionList)){ for (RequisitionEntity requisition : requisitionList) { - //主表 - JSONObject formmain_0652 = new JSONObject(); - //子表 - List formsonList = new LinkedList<>(); - JSONObject formson_0653 = new JSONObject(); - formsonList.add(formson_0653); - JSONObject formData = new JSONObject(); - formData.put("formmain_0652",formmain_0652); - formData.put("formson_0653",formsonList); - JSONObject data = new JSONObject(); - data.put("templateCode",""); - data.put("draft","0"); - data.put("data",formData); - JSONObject param = new JSONObject(); - param.put("appName","collaboration"); - param.put("data",data); - String s = invokeEsb(param, "800045", "8000450001"); + //查询u9c请购单明细 + RequisitionDetailEntity requisitionDetail = new RequisitionDetailEntity(); + List requisitionDetailList = requisitionDetailServiceImpl.queryDetails(requisitionDetail); + if (CollectionUtils.isNotEmpty(requisitionDetailList)){ + //主表 + JSONObject formmain_0652 = new JSONObject(); + //单据类型 + formmain_0652.put("field0001",""); + //发起人 + formmain_0652.put("field0002",""); + //发起部门 + formmain_0652.put("field0003",""); + //发起时间 + formmain_0652.put("field0004",""); + //需求人员 + formmain_0652.put("field0005",""); + //来源类型 + formmain_0652.put("field0006",""); + //单号 + formmain_0652.put("field0007",""); + //需求部门 + formmain_0652.put("field0008",""); + //来源单号 + formmain_0652.put("field0009",""); + //日期 + formmain_0652.put("field0010",""); + //项目 + formmain_0652.put("field0011",""); + //厂区 + formmain_0652.put("field0012",""); + //状态 + formmain_0652.put("field0013",""); + //请购数量合计 + formmain_0652.put("field0030",""); + //子表 + List formsonList = new LinkedList<>(); + for (RequisitionDetailEntity detail : requisitionDetailList) { + JSONObject formson_0653 = new JSONObject(); + //行号 + formson_0653.put("field0014",""); + //需求分类 + formson_0653.put("field0015",""); + //厂区明细 + formson_0653.put("field0016",""); + //项目明细 + formson_0653.put("field0017",""); + //料号 + formson_0653.put("field0018",""); + //品名 + formson_0653.put("field0021",""); + //规格 + formson_0653.put("field0022",""); + //请购数量 + formson_0653.put("field0023",""); + //单位 + formson_0653.put("field0024",""); + //单据备注 + formson_0653.put("field0025",""); + //需求交货日期 + formson_0653.put("field0026",""); + //来源单号明细 + formson_0653.put("field0027",""); + //库存可用量 + formson_0653.put("field0028",""); + //状态明细 + formson_0653.put("field0029",""); + formsonList.add(formson_0653); + } + JSONObject formData = new JSONObject(); + formData.put("formmain_0652",formmain_0652); + formData.put("formson_0653",formsonList); + JSONObject data = new JSONObject(); + data.put("templateCode",""); + data.put("draft","0"); + data.put("data",formData); + JSONObject param = new JSONObject(); + param.put("appName","collaboration"); + param.put("data",data); + String s = invokeEsb(param, "800045", "8000450002"); + } } } return BaseResult.getSuccessMessageEntity("德广信U9C请购单推送OA插件执行成功"); diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/dgx/spring/spring-buildpackage-dao.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/dgx/spring/spring-buildpackage-dao.xml index 2a1b781e..d909da1e 100644 --- a/base-buildpackage/src/main/resources/cfgHome/plugin/dgx/spring/spring-buildpackage-dao.xml +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/dgx/spring/spring-buildpackage-dao.xml @@ -2,5 +2,7 @@ - + + + diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/dgx/spring/spring-buildpackage-service.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/dgx/spring/spring-buildpackage-service.xml index 80a34930..caa65e06 100644 --- a/base-buildpackage/src/main/resources/cfgHome/plugin/dgx/spring/spring-buildpackage-service.xml +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/dgx/spring/spring-buildpackage-service.xml @@ -2,6 +2,8 @@ + +