20230427 17:49

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

@@ -4249,9 +4249,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             return AjaxResult.error("未找到入账信息");
         }
         TWarehouseBills tWarehouseBills = JSONArray.parseObject(warehouseBills, TWarehouseBills.class);
-        tEnclosureMapper.deleteByFPid(tWarehouseBills.getfId());
-        tWarehousebillsfeesMapper.deleteByFPid(tWarehouseBills.getfId());
-        tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(tWarehouseBills.getfId());
+        //tEnclosureMapper.deleteByFPid(tWarehouseBills.getfId());
+        //tWarehousebillsfeesMapper.deleteByFPid(tWarehouseBills.getfId());
+        //tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(tWarehouseBills.getfId());
         boolean businessStatus = "场地直装".equals(tWarehouseBills.getfBusinessType());
         JSONArray warehouseJSON = JSONArray.parseArray(warehousebillsitems);
         List<TWarehousebillsitems> warehousebillsitemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsitems.class);
@@ -4354,7 +4354,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 cntr.setfCntrweight(new BigDecimal(0));
                 cntr.setCreateBy(loginUser.getUser().getUserName());
                 cntr.setCreateTime(new Date());
-                tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);
+
+                if (cntr.getfId() == null){
+                    tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);
+                }else {
+                    tWarehousebillsCntrMapper.updateTWarehousebillsCntr(cntr);
+                }
             }
         }
         //  附件添加
@@ -4365,7 +4370,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 enclosure.setfPid(tWarehouseBills.getfId());
                 enclosure.setCreateBy(loginUser.getUser().getUserName());
                 enclosure.setCreateTime(new Date());
-                tEnclosureMapper.insertTEnclosure(enclosure);
+                if (enclosure.getfId() == null){
+                    tEnclosureMapper.insertTEnclosure(enclosure);
+                }else {
+                    tEnclosureMapper.updateTEnclosure(enclosure);
+                }
+
             }
         }
         // 收款明细添加
@@ -4380,7 +4390,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 if (tWarehouseBills.getfBsdate() != null && !tWarehouseBills.getfBsdate().equals("")) {
                     wbDr.setfBsdate(tWarehouseBills.getfBsdate());
                 }
-                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
+                if (wbDr.getfId() == null){
+                    tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
+                }else {
+                    tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbDr);
+                }
+
             }
         }
         // 付款明细添加
@@ -4395,7 +4410,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 if (tWarehouseBills.getfBsdate() != null && !tWarehouseBills.getfBsdate().equals("")) {
                     wbCr.setfBsdate(tWarehouseBills.getfBsdate());
                 }
-                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
+                if (wbCr.getfId() == null){
+                    tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
+                }else {
+                    tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbCr);
+                }
             }
         }
         // 根据父级 id，以及父级单据类型，获取从表数据