20230504 15:03

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

@@ -2206,7 +2206,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             warehouseBills.setUpdateBy(SecurityUtils.getUsername());
             tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
         }
-        tWarehousebillsfeesMapper.deleteByFPid(warehouseBills.getfId());
+        //tWarehousebillsfeesMapper.deleteByFPid(warehouseBills.getfId());
         if (StringUtils.isNotEmpty(feesCr) && !"[]".equals(feesCr)) {
             JSONArray jsonDrArray = JSONArray.parseArray(feesCr);
             List<TWarehousebillsfees> warehousebillsfeesCr = JSONObject.parseArray(jsonDrArray.toJSONString(), TWarehousebillsfees.class);
@@ -2225,7 +2225,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 cr.setCreateTime(new Date());
                 cr.setfPid(warehouseBills.getfId());
                 cr.setCreateBy(SecurityUtils.getUsername());
-                tWarehousebillsfeesMapper.insertTWarehousebillsfees(cr);
+                if (ObjectUtils.isEmpty(cr.getfId())){
+                    tWarehousebillsfeesMapper.insertTWarehousebillsfees(cr);
+                }else {
+                    tWarehousebillsfeesMapper.updateTWarehousebillsfees(cr);
+                }
+                //tWarehousebillsfeesMapper.insertTWarehousebillsfees(cr);
                 line++;
             }
         }
@@ -2247,7 +2252,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 dr.setCreateTime(new Date());
                 dr.setfPid(warehouseBills.getfId());
                 dr.setCreateBy(SecurityUtils.getUsername());
-                tWarehousebillsfeesMapper.insertTWarehousebillsfees(dr);
+                if (ObjectUtils.isEmpty(dr.getfId())){
+                    tWarehousebillsfeesMapper.insertTWarehousebillsfees(dr);
+                }else {
+                    tWarehousebillsfeesMapper.updateTWarehousebillsfees(dr);
+                }
+                //tWarehousebillsfeesMapper.insertTWarehousebillsfees(dr);
                 line++;
             }
         }
@@ -2421,7 +2431,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
         }
 
-        tWarehousebillsfeesMapper.deleteByFPid(warehouseBills.getfId());
+        //tWarehousebillsfeesMapper.deleteByFPid(warehouseBills.getfId());
         if (StringUtils.isNotEmpty(feesCr) && !"[]".equals(feesCr)) {
             JSONArray jsonDrArray = JSONArray.parseArray(feesCr);
             List<TWarehousebillsfees> crs = JSONObject.parseArray(jsonDrArray.toJSONString(), TWarehousebillsfees.class);
@@ -2442,7 +2452,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 cr.setCreateTime(new Date());
                 cr.setfPid(warehouseBills.getfId());
                 cr.setCreateBy(SecurityUtils.getUsername());
-                tWarehousebillsfeesMapper.insertTWarehousebillsfees(cr);
+                if (ObjectUtils.isEmpty(cr.getfId())){
+                    tWarehousebillsfeesMapper.insertTWarehousebillsfees(cr);
+                }else {
+                    tWarehousebillsfeesMapper.updateTWarehousebillsfees(cr);
+                }
+                //tWarehousebillsfeesMapper.insertTWarehousebillsfees(cr);
                 line++;
             }
         }
@@ -2466,7 +2481,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 dr.setCreateTime(new Date());
                 dr.setfPid(warehouseBills.getfId());
                 dr.setCreateBy(SecurityUtils.getUsername());
-                tWarehousebillsfeesMapper.insertTWarehousebillsfees(dr);
+                if (ObjectUtils.isEmpty(dr.getfId())){
+                    tWarehousebillsfeesMapper.insertTWarehousebillsfees(dr);
+                }else {
+                    tWarehousebillsfeesMapper.updateTWarehousebillsfees(dr);
+                }
+                //tWarehousebillsfeesMapper.insertTWarehousebillsfees(dr);
                 line++;
             }
         }
@@ -5115,7 +5135,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         tWarehouseBills.setfGrossweight(itemInFo.getfGrossweight());
         tWarehouseBillsMapper.updateTWarehousebills(tWarehouseBills);
         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);
@@ -5205,7 +5224,11 @@ 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);
+                }
             }
         }
         // 付款明细添加
@@ -5220,7 +5243,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);
+                }
             }
         }
         // 添加成功 返回 前台