From bd873339eed02b59826adab89ae1bbaf6dc9ccf9 Mon Sep 17 00:00:00 2001 From: qianshijiang <1965297290@qq.com> Date: Thu, 27 Nov 2025 17:12:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zt/plat/module/contractorder/api/OrderApiImpl.java | 2 +- .../dal/dataobject/salesorder/SalesOrderDetailDO.java | 3 +++ 2 files changed, 4 insertions(+), 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 adc78767..7374808a 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 @@ -108,7 +108,7 @@ public class OrderApiImpl implements OrderApi { .orElse(BigDecimal.ZERO); SalesOrderDetailDO updateDO = new SalesOrderDetailDO(); updateDO.setId(f.getOrderDetailId()); // 给更新对象设 ID - updateDO.setTrfQty(lstQty.add(f.getLstQty())); // 累加(trfQty ) + updateDO.setTrfQty(lstQty.add(f.getLstQty())); // 累加(trfQty ) 对应采购的lstQty(已收货量)字段 log.info("更新销售订单明细:{}", updateDO); salesOrderDetailMapper.updateById(updateDO); } else if ("PUR".equals(f.getSplyBsnTp())) { diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDetailDO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDetailDO.java index 05c2753c..fc403c60 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDetailDO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDetailDO.java @@ -155,6 +155,9 @@ public class SalesOrderDetailDO extends BusinessBaseDO { @TableField("TAX_RTE") private BigDecimal taxRte; + /** + * 已收货量 + */ @TableField("TRF_QTY") private BigDecimal trfQty; From 64e93cc0090663b05416d7652858dfcc3ccc65db 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: Fri, 28 Nov 2025 09:41:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=89=A9=E6=96=99=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zt/plat/module/contractorder/api/OrderApiImpl.java | 4 ++++ 1 file changed, 4 insertions(+) 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 adc78767..5b6c55e4 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 @@ -210,6 +210,10 @@ public class OrderApiImpl implements OrderApi { ordDtlDTO.setTrfWrhNum(p.getTrfWrhNum()); ordDtlDTO.setRmk(p.getRmk()); ordDtlDTO.setLstQty(p.getLstQty()); + if("PO04".equals(orderDTO.getType())){ + ordDtlDTO.setMtrlName(p.getMtrlName()); + ordDtlDTO.setMtrlNum(p.getMtrlNum()); // 没单位了 + } } else if ( t instanceof SalesOrderDetailDO s