20230428 09:15

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

@@ -3528,7 +3528,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
                     wbCr.setfBsdate(warehouseBills.getfBsdate());
                 }
-                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
+                if (ObjectUtils.isEmpty(wbCr.getfId())){
+                    tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
+                }else {
+                    tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbCr);
+                }
+
             }
             map.put("warehousebillsfeesCrList", warehousebillsfeesCrList);
         }
@@ -3546,7 +3551,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
                     wbDr.setfBsdate(warehouseBills.getfBsdate());
                 }
-                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
+                if (ObjectUtils.isEmpty(wbDr.getfId())){
+                    tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
+                }else {
+                    tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbDr);
+                }
+
             }
             map.put("warehousebillsfeesDrList", warehousebillsfeesDrList);
         }
@@ -3669,7 +3679,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
                     wbCr.setfBsdate(warehouseBills.getfBsdate());
                 }
-                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
+                if (ObjectUtils.isEmpty(wbCr.getfId())){
+                    tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
+                }else {
+                    tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbCr);
+                }
             }
             map.put("warehousebillsfeesCrList", warehousebillsfeesCrList);
         }
@@ -3688,7 +3702,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
                     wbDr.setfBsdate(warehouseBills.getfBsdate());
                 }
-                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
+                if (ObjectUtils.isEmpty(wbDr.getfId())){
+                    tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
+                }else {
+                    tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbDr);
+                }
             }
             map.put("warehousebillsfeesDrList", warehousebillsfeesDrList);
         }
@@ -7468,9 +7486,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         tWarehousebills.setUpdateBy(loginUser.getUsername());
         Long timestamp = DateUtils.getTimestamp(new Date());
         tWarehousebills.setfDateChanged(timestamp.toString() + (int) (Math.random() * 900) + 100);
-        tEnclosureMapper.deleteByFPid(tWarehousebills.getfId());
-        tWarehousebillsfeesMapper.deleteByFPid(tWarehousebills.getfId());
-        tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(tWarehousebills.getfId());
+        //tEnclosureMapper.deleteByFPid(tWarehousebills.getfId());
+        //tWarehousebillsfeesMapper.deleteByFPid(tWarehousebills.getfId());
+        //tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(tWarehousebills.getfId());
         JSONArray warehouseJSON = JSONArray.parseArray(warehousebillsitems);
         List<TWarehousebillsitems> warehousebillsitemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsitems.class);
 
@@ -7613,7 +7631,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 cntr.setfCntrweight(new BigDecimal(0));
                 cntr.setCreateBy(loginUser.getUser().getUserName());
                 cntr.setCreateTime(new Date());
-                tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);
+                if (ObjectUtils.isEmpty(cntr.getfId())){
+                    tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);
+                }else {
+                    tWarehousebillsCntrMapper.updateTWarehousebillsCntr(cntr);
+                }
+
             }
         }
         //  附件添加
@@ -7624,7 +7647,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 enclosure.setfPid(tWarehousebills.getfId());
                 enclosure.setCreateBy(loginUser.getUser().getUserName());
                 enclosure.setCreateTime(new Date());
-                tEnclosureMapper.insertTEnclosure(enclosure);
+                if (ObjectUtils.isEmpty(enclosure.getfId())){
+                    tEnclosureMapper.insertTEnclosure(enclosure);
+                }else {
+                    tEnclosureMapper.updateTEnclosure(enclosure);
+                }
+
             }
         }
         // 收款明细添加
@@ -7639,7 +7667,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 if (tWarehousebills.getfBsdate() != null && !"".equals(tWarehousebills.getfBsdate())) {
                     wbDr.setfBsdate(tWarehousebills.getfBsdate());
                 }
-                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
+                if (wbDr.getfId() == null){
+                    tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
+                }else {
+                    tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbDr);
+                }
             }
         }
         // 付款明细添加
@@ -7654,7 +7686,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 if (tWarehousebills.getfBsdate() != null && !"".equals(tWarehousebills.getfBsdate())) {
                     wbCr.setfBsdate(tWarehousebills.getfBsdate());
                 }
-                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
+                if (wbCr.getfId() == null){
+                    tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
+                }else {
+                    tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbCr);
+                }
             }
         }
         // 根据父级 id，以及父级单据类型，获取从表数据