zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into test

Browse Source
This commit is contained in:
qianshijiang
2025-11-28 09:52:12 +08:00
parent b82e7f127f 49fcf1086d
commit 240ad85a60
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java
View File

@@ -108,7 +108,7 @@ public class OrderApiImpl implements OrderApi {
.orElse(BigDecimal.ZERO); .orElse(BigDecimal.ZERO);
SalesOrderDetailDO updateDO = new SalesOrderDetailDO(); SalesOrderDetailDO updateDO = new SalesOrderDetailDO();
updateDO.setId(f.getOrderDetailId()); // 给更新对象设 ID updateDO.setId(f.getOrderDetailId()); // 给更新对象设 ID
updateDO.setTrfQty(lstQty.add(f.getLstQty())); // 累加（trfQty ） updateDO.setTrfQty(lstQty.add(f.getLstQty())); // 累加（trfQty ） 对应采购的lstQty(已收货量)字段
log.info("更新销售订单明细：{}", updateDO); log.info("更新销售订单明细：{}", updateDO);
salesOrderDetailMapper.updateById(updateDO); salesOrderDetailMapper.updateById(updateDO);
} else if ("PUR".equals(f.getSplyBsnTp())) { } else if ("PUR".equals(f.getSplyBsnTp())) {
@@ -210,6 +210,10 @@ public class OrderApiImpl implements OrderApi {
ordDtlDTO.setTrfWrhNum(p.getTrfWrhNum()); ordDtlDTO.setTrfWrhNum(p.getTrfWrhNum());
ordDtlDTO.setRmk(p.getRmk()); ordDtlDTO.setRmk(p.getRmk());
ordDtlDTO.setLstQty(p.getLstQty()); ordDtlDTO.setLstQty(p.getLstQty());
if("PO04".equals(orderDTO.getType())){
ordDtlDTO.setMtrlName(p.getMtrlName());
ordDtlDTO.setMtrlNum(p.getMtrlNum()); // 没单位了
}
} else if ( } else if (
t instanceof SalesOrderDetailDO s t instanceof SalesOrderDetailDO s

3
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDetailDO.java
View File

@@ -155,6 +155,9 @@ public class SalesOrderDetailDO extends BusinessBaseDO {
@TableField("TAX_RTE") @TableField("TAX_RTE")
private BigDecimal taxRte; private BigDecimal taxRte;
/**
* 已收货量
*/
@TableField("TRF_QTY") @TableField("TRF_QTY")
private BigDecimal trfQty; private BigDecimal trfQty;