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

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())) {
@@ -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

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;