20230419 10:31

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -4933,11 +4933,17 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             JSONArray jsonDrArray = JSONArray.parseArray(warehousebillsfeesDr);
             List<TWarehousebillsfees> warehousebillsfeesDrList = JSONObject.parseArray(jsonDrArray.toJSONString(), TWarehousebillsfees.class);
             for (TWarehousebillsfees wbDr : warehousebillsfeesDrList) {
-                wbDr.setfPid(tWarehouseBills.getfId());
-                wbDr.setfDc("D");
-                wbDr.setCreateBy(loginUser.getUser().getUserName());
-                wbDr.setCreateTime(new Date());
-                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
+                if (StringUtils.isNotNull(wbDr.getfId())){
+                    wbDr.setUpdateBy(loginUser.getUser().getUserName());
+                    wbDr.setUpdateTime(new Date());
+                    tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbDr);
+                }else {
+                    wbDr.setfPid(tWarehouseBills.getfId());
+                    wbDr.setfDc("D");
+                    wbDr.setCreateBy(loginUser.getUser().getUserName());
+                    wbDr.setCreateTime(new Date());
+                    tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
+                }
             }
         }
         // 付款明细添加
@@ -4945,11 +4951,17 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             JSONArray jsonCrArray = JSONArray.parseArray(warehousebillsfeesCr);
             List<TWarehousebillsfees> warehousebillsfeesCrList = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsfees.class);
             for (TWarehousebillsfees wbCr : warehousebillsfeesCrList) {
-                wbCr.setfPid(tWarehouseBills.getfId());
-                wbCr.setfDc("C");
-                wbCr.setCreateBy(loginUser.getUser().getUserName());
-                wbCr.setCreateTime(new Date());
-                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
+                if (StringUtils.isNotNull(wbCr.getfId())){
+                    wbCr.setUpdateBy(loginUser.getUser().getUserName());
+                    wbCr.setUpdateTime(new Date());
+                    tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbCr);
+                }else {
+                    wbCr.setfPid(tWarehouseBills.getfId());
+                    wbCr.setfDc("C");
+                    wbCr.setCreateBy(loginUser.getUser().getUserName());
+                    wbCr.setCreateTime(new Date());
+                    tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
+                }
             }
         }
         // 根据父级 id，以及父级单据类型，获取从表数据