From d821b9616e8abd5c97cc9abb060a9565455a7867 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: Tue, 2 Dec 2025 16:47:09 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=98=8E=E7=BB=86=E6=8F=90=E7=A4=BA=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/salesorder/SalesOrderDetailServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderDetailServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderDetailServiceImpl.java index 45b9e63a..777f6d2d 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderDetailServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderDetailServiceImpl.java @@ -95,7 +95,7 @@ public class SalesOrderDetailServiceImpl implements SalesOrderDetailService { CommonResult booleanCommonResult = billMainApi.notOffsetIsExistOrderDetailId(id); if (booleanCommonResult.isSuccess() && booleanCommonResult.getData()) { SalesOrderDetailDO salesOrderDetailDO = salesOrderDetailMapper.selectById(id); - throw exception(new ErrorCode(1_008_00_600, "订单明细【" + salesOrderDetailDO.getMaterialName() + "】已生成收发货单，不能删除")); + throw exception(new ErrorCode(1_008_00_600, "订单明细【" + salesOrderDetailDO.getLineNumber() + "】已生成收发货单，不能删除")); } }); } From 2aed717aa16f0cb81aa4aecf5cc9d29109076cca 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: Tue, 2 Dec 2025 17:12:44 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=B4=AF=E7=A7=AF=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zt/plat/module/contractorder/api/OrderApiImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java index 054c1183..987f120d 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java @@ -116,7 +116,7 @@ public class OrderApiImpl implements OrderApi { } else if ("PUR".equals(f.getSplyBsnTp())) { // 采购 PrchOrdDtlDO prchOrdDtlDO = prchOrdDtlMapper.selectById(f.getOrderDetailId()); - BigDecimal lstQty = Optional.ofNullable(prchOrdDtlDO.getTrfQty()) + BigDecimal lstQty = Optional.ofNullable(prchOrdDtlDO.getLstQty()) .orElse(BigDecimal.ZERO); PrchOrdDtlDO updateDO = new PrchOrdDtlDO(); updateDO.setId(f.getOrderDetailId()); From 8a4c49059d2c6c56c4c6953b6eeaf1e8e0bb2f15 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: Tue, 2 Dec 2025 17:14:01 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=B4=AF=E7=A7=AF=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zt/plat/module/contractorder/api/OrderApi.java | 2 +- .../java/com/zt/plat/module/contractorder/api/OrderApiImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/OrderApi.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/OrderApi.java index 83ec87e1..b6da0b9b 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/OrderApi.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/OrderApi.java @@ -28,7 +28,7 @@ public interface OrderApi { @PostMapping(PREFIX + "/update-lst-qty-by-order-id") @Operation(summary = "根据订单明细id更新累积量", description = "根据订单明细id更新收货量") - CommonResult UpdateOrderLstQty(@RequestBody @Validated List updateOrderLstQtyDTOS); + CommonResult updateOrderLstQty(@RequestBody @Validated List updateOrderLstQtyDTOS); @PostMapping(PREFIX + "/void -lst-qty-by-order-id") @Operation(summary = "根据订单明细id更新累积量(冲销)", description = "根据订单明细id更新收货量(冲销)") diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java index 987f120d..267bf397 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java @@ -154,7 +154,7 @@ public class OrderApiImpl implements OrderApi { } else if ("PUR".equals(f.getSplyBsnTp())) { // 采购 PrchOrdDtlDO prchOrdDtlDO = prchOrdDtlMapper.selectById(f.getOrderDetailId()); - BigDecimal lstQty = Optional.ofNullable(prchOrdDtlDO.getTrfQty()) + BigDecimal lstQty = Optional.ofNullable(prchOrdDtlDO.getLstQty()) .orElse(BigDecimal.ZERO); if (lstQty.equals(BigDecimal.ZERO)) { throw exception(new ErrorCode(1_008_00_609,"积累量不能等于0")); From 0a803c367d8b996a64af800942d4971a8959722f 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: Tue, 2 Dec 2025 17:14:58 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=B4=AF=E7=A7=AF=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zt/plat/module/contractorder/api/OrderApiImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java index 267bf397..4357b080 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java @@ -96,7 +96,7 @@ public class OrderApiImpl implements OrderApi { @Override @Transactional(rollbackFor = Exception.class) - public CommonResult UpdateOrderLstQty(List updateOrderLstQtyDTOS) { + public CommonResult updateOrderLstQty(List updateOrderLstQtyDTOS) { if (updateOrderLstQtyDTOS == null || updateOrderLstQtyDTOS.isEmpty()) { throw new RuntimeException("请求数据错误"); }