From 0c6f349683d535dafca01d7d1ec6a6592e5a01ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?= <9691125+pan-rongsheng@user.noreply.gitee.com> Date: Thu, 5 Feb 2026 17:55:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E6=89=98=E5=8A=A0=E5=B7=A5=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3=E7=9B=B8=E5=85=B3=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EntrustOrderOrderService.java | 4 +-- .../EntrustOrderOrderServiceImplImpl.java | 32 +++++++++++-------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderOrderService.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderOrderService.java index a84999ee..ee4b75e5 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderOrderService.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderOrderService.java @@ -98,8 +98,8 @@ public interface EntrustOrderOrderService { /** * 提交erp062 * - * @param id 编号 + * @param updateReqVO 编号 */ - void submitErpUpdate062(Long id); + void submitErpUpdate062(EntrustOrderOrderSaveReqVO updateReqVO); } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderOrderServiceImplImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderOrderServiceImplImpl.java index dd6c5cc2..c94fe27a 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderOrderServiceImplImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderOrderServiceImplImpl.java @@ -112,7 +112,6 @@ public class EntrustOrderOrderServiceImplImpl implements EntrustOrderOrderServic validateEntrustOrderOrderExists(updateReqVO.getId()); // 更新 EntrustOrderOrderDO updateObj = BeanUtils.toBean(updateReqVO, EntrustOrderOrderDO.class); - entrustOrderOrderMapper.updateById(updateObj); if (updateReqVO.getDetails() != null && !updateReqVO.getDetails().isEmpty()) { //如果明细ID为空(表示新增)，则设置订单ID updateReqVO.getDetails().forEach(item -> { @@ -120,8 +119,13 @@ public class EntrustOrderOrderServiceImplImpl implements EntrustOrderOrderServic item.setOrderId(updateReqVO.getId()); } }); + submitErpUpdate062(updateReqVO); + } + entrustOrderOrderMapper.updateById(updateObj); + if (updateReqVO.getDetails() != null && !updateReqVO.getDetails().isEmpty()) { entrustOrderDetailService.updateBatchSomeColumn(updateReqVO.getDetails()); } + } @Override @@ -316,22 +320,22 @@ public class EntrustOrderOrderServiceImplImpl implements EntrustOrderOrderServic } @Override - public void submitErpUpdate062(Long id) { - EntrustOrderOrderDO entrustOrderOrderDO = entrustOrderOrderMapper.selectById(id); + public void submitErpUpdate062(EntrustOrderOrderSaveReqVO updateReqVO) { + EntrustOrderOrderDO entrustOrderOrderDO = BeanUtils.toBean(updateReqVO, EntrustOrderOrderDO.class); if (entrustOrderOrderDO == null) { throw exception(ENTRUST_ORDER_NOT_EXISTS); } //获取订单明细 - List entrustOrderDetailList = entrustOrderDetailService.getEntrustOrderDetailListByOrderId(id); + List entrustOrderDetailList = BeanUtils.toBean(updateReqVO.getDetails(), EntrustOrderDetailRespVO.class); if (entrustOrderDetailList == null || entrustOrderDetailList.isEmpty()) { throw exception(ENTRUST_ORDER_DETAIL_NOT_EXISTS); } - log.info("提交订单到ERP：【{}】，订单信息：【{}】", id, entrustOrderOrderDO); - log.info("提交订单到ERP：【{}】，订单明细信息：【{}】", id, entrustOrderDetailList); + log.info("提交订单到ERP：【{}】，订单信息：【{}】", updateReqVO.getId(), entrustOrderOrderDO); + log.info("提交订单到ERP：【{}】，订单明细信息：【{}】", updateReqVO.getId(), entrustOrderDetailList); ErpOrderUpdateReqVO erpOrderUpdateReqVO = new ErpOrderUpdateReqVO(); buildErp062Data(erpOrderUpdateReqVO, entrustOrderOrderDO, entrustOrderDetailList); String result = erpOrderService.submitOrderToErp062(erpOrderUpdateReqVO); - log.info("提交订单到ERP：【{}】，结果：【{}】", id, result); + log.info("提交订单到ERP：【{}】，结果：【{}】", updateReqVO.getId(), result); } private void buildErp062Data(ErpOrderUpdateReqVO erpOrderUpdateReqVO, EntrustOrderOrderDO order, List entrustOrderDetailList) { @@ -349,7 +353,7 @@ public class EntrustOrderOrderServiceImplImpl implements EntrustOrderOrderServic //item List items = new ArrayList<>(); List comps = new ArrayList<>(); - AtomicReference index= new AtomicReference<>(0); + AtomicReference index = new AtomicReference<>(0); entrustOrderDetailList.forEach(detail -> { index.getAndSet(index.get() + 1); ErpOrderUpdateReqVO.item item = new ErpOrderUpdateReqVO.item(); // item @@ -378,13 +382,13 @@ public class EntrustOrderOrderServiceImplImpl implements EntrustOrderOrderServic comps.add(comp); }); erpOrderUpdateReqVO.setItems(items); - //comp + //comp erpOrderUpdateReqVO.setComps(comps); } private void buildErp061Data(ErpOrderSaveReqVO erpOrderSaveReqVO, EntrustOrderOrderDO order, List entrustOrderDetailList) { - //订单号 + //订单号 erpOrderSaveReqVO.setOrderNo(order.getSystemOrderNumber()); // 1. 处理抬头信息(Head) @@ -447,10 +451,10 @@ public class EntrustOrderOrderServiceImplImpl implements EntrustOrderOrderServic ErpOrderSaveReqVO.Itex itex = new ErpOrderSaveReqVO.Itex(); itex.setPo_item(detail.getLineNumber() != null ? detail.getLineNumber() : null); - itex.setZmatnr(getMtrlZhongtongCode(detail.getSendMaterialNumber())); // 物料号 -> 销售物料号 -// itex.setZaufnr(detail.get()); // 统计型内部订单 -> 统计型内部订单 -// itex.setZpurty(detail.getPrchCtgr()); // 采购类别 -> 采购类别 -// itex.setZmenge(detail.getOrigWet()); // 原料湿重 -> 原料湿重 + //itex.setZmatnr(getMtrlZhongtongCode(detail.getSendMaterialNumber())); // 物料号 -> 销售物料号 + //itex.setZaufnr(detail.get()); // 统计型内部订单 -> 统计型内部订单 + //itex.setZpurty(detail.getPrchCtgr()); // 采购类别 -> 采购类别 + //itex.setZmenge(detail.getOrigWet()); // 原料湿重 -> 原料湿重 itexes.add(itex); // 列表-comp