From 956d939cc69655dbe951ffc29b357a086b95c7db 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, 26 Feb 2026 11:26:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E6=89=98=E5=8A=A0=E5=B7=A5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=8F=90=E4=BA=A4erp=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/entrustorder/vo/EntrustOrderOrderRespVO.java | 2 ++ .../controller/admin/salesorder/vo/SalesOrderRespVO.java | 3 +++ .../service/purchaseorder/PurchaseOrderServiceImpl.java | 6 ++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderRespVO.java index 3e81ac2a..0d205bf6 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderRespVO.java @@ -192,5 +192,7 @@ public class EntrustOrderOrderRespVO { @ExcelProperty("订单类型") @Schema(description = "订单类型，(字典：SPLY_BSN_TP)") private String splyBsnTp; + @Schema(description = "相关订单id") + private Long relatedOrderId; } \ 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/controller/admin/salesorder/vo/SalesOrderRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderRespVO.java index 4c5e34bb..a95f5b74 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderRespVO.java @@ -227,4 +227,7 @@ public class SalesOrderRespVO { @Schema(description = "erp失败原因") private String issueCause; + @Schema(description = "相关订单id") + private Long relatedOrderId; + } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java index 6660ab38..8d283c09 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java @@ -981,8 +981,10 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService { int update = purchaseOrderMapper.update(updateWrapper); log.info("已绑定的订单已解绑，订单ID：{},影响行数：{}",orderDO.getRelatedOrderId(),update); } - orderDO.setRelatedOrderId(reqVO.getBoundId()); - purchaseOrderMapper.updateById(orderDO); + LambdaUpdateWrapper boundUpdateWrapper = new LambdaUpdateWrapper<>(); + boundUpdateWrapper.eq(PurchaseOrderDO::getId, reqVO.getId()) + .set(PurchaseOrderDO::getRelatedOrderId, reqVO.getBoundId()); + purchaseOrderMapper.update(boundUpdateWrapper); log.info("订单ID：{} 已绑定订单ID：{}", reqVO.getId(), reqVO.getBoundId()); //修改已绑定的的订单 if (boundOrder.getRelatedOrderId() != null){