2022年11月3日16:36:07

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

@@ -1639,13 +1639,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             }
             warehouseBills.setUpdateBy(loginUser.getUser().getUserName());
 
-            tEnclosureMapper.deleteByFPid(fPid);
+        /*    tEnclosureMapper.deleteByFPid(fPid);
             tWarehousebillsfeesMapper.deleteByFPid(fPid);
             if (!"CDZZ".equals(billsType)) {
                 tWarehousebillsitemsMapper.deleteByFPid(fPid);
-            }
+            }*/
             tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
-            tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(fPid);
+//            tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(fPid);
         }
         JSONArray warehouseJSON = JSONArray.parseArray(tWarehousebillsitems);
         List<TWarehousebillsitems> warehousebillsitemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsitems.class);
@@ -1713,49 +1713,68 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("箱型数据第" + cntrLine + "行数据缺少必填数据");
                 }
-                cntr.setfPid(fPid);
-                cntr.setfGoodsid(0L);
-                cntr.setfPackageid("0");
-                cntr.setfCntrweight(new BigDecimal(0));
-                cntr.setCreateBy(loginUser.getUser().getUserName());
-                cntr.setCreateTime(new Date());
-                tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);
+                if (cntr.getfId() == null ){
+                    cntr.setfPid(fPid);
+                    cntr.setfGoodsid(0L);
+                    cntr.setfPackageid("0");
+                    cntr.setfCntrweight(new BigDecimal(0));
+                    cntr.setCreateBy(loginUser.getUser().getUserName());
+                    cntr.setCreateTime(new Date());
+                    tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);
+                }else{
+                    cntr.setUpdateBy(loginUser.getUser().getUserName());
+                    cntr.setUpdateTime(new Date());
+                    tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);
+                }
+
             }
         }
         if (StringUtils.isNotNull(tWarehousebillsfeesCr) && !"[]".equals(tWarehousebillsfeesCr)) {
             JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsfeesCr);
             List<TWarehousebillsfees> warehousebillsfeesCrList = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsfees.class);
             for (TWarehousebillsfees wbCr : warehousebillsfeesCrList) {
-                wbCr.setfPid(fPid);
-                wbCr.setfDc("C");
-                wbCr.setfBilltype(billsType);
-                wbCr.setCreateTime(new Date());
-                wbCr.setSrcBillNo(warehouseBills.getfBillno());
-                wbCr.setCreateBy(loginUser.getUser().getUserName());
-                if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
-                    wbCr.setfBsdate(warehouseBills.getfBsdate());
+                if (wbCr.getfId() == null ){
+                    wbCr.setfPid(fPid);
+                    wbCr.setfDc("C");
+                    wbCr.setfBilltype(billsType);
+                    wbCr.setCreateTime(new Date());
+                    wbCr.setSrcBillNo(warehouseBills.getfBillno());
+                    wbCr.setCreateBy(loginUser.getUser().getUserName());
+                    if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
+                        wbCr.setfBsdate(warehouseBills.getfBsdate());
+                    }
+                    tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
+                }else{
+                    wbCr.setUpdateBy(loginUser.getUser().getUserName());
+                    wbCr.setUpdateTime(new Date());
+                    tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbCr);
                 }
-                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
             }
         }
         if (StringUtils.isNotNull(tWarehousebillsfeesDr) && !"[]".equals(tWarehousebillsfeesDr)) {
             JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsfeesDr);
             List<TWarehousebillsfees> warehousebillsfeesDrList = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsfees.class);
             for (TWarehousebillsfees wbDr : warehousebillsfeesDrList) {
-                wbDr.setfPid(fPid);
-                wbDr.setfDc("D");
-                // 防止二次发起请核后费用明细数据请核状态被修改
+                if (wbDr.getfId() == null ){
+                    wbDr.setfPid(fPid);
+                    wbDr.setfDc("D");
+                    // 防止二次发起请核后费用明细数据请核状态被修改
                 /*if (Objects.isNull(wbDr.getfReviewDate())) {
                     wbDr.setfBillstatus(4L);
                 }*/
-                wbDr.setfBilltype(billsType);
-                wbDr.setCreateTime(new Date());
-                wbDr.setSrcBillNo(warehouseBills.getfBillno());
-                wbDr.setCreateBy(loginUser.getUser().getUserName());
-                if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
-                    wbDr.setfBsdate(warehouseBills.getfBsdate());
+                    wbDr.setfBilltype(billsType);
+                    wbDr.setCreateTime(new Date());
+                    wbDr.setSrcBillNo(warehouseBills.getfBillno());
+                    wbDr.setCreateBy(loginUser.getUser().getUserName());
+                    if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
+                        wbDr.setfBsdate(warehouseBills.getfBsdate());
+                    }
+                    tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
+                }else{
+                    wbDr.setUpdateBy(loginUser.getUser().getUserName());
+                    wbDr.setUpdateTime(new Date());
+                    tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbDr);
                 }
-                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
             }
         }
         if (StringUtils.isNotNull(tEnclosure) && !"[]".equals(tEnclosure)) {
@@ -1764,11 +1783,17 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             long lineNo = 0L;
             for (TEnclosure enclosure : enclosuresList) {
                 lineNo++;
-                enclosure.setfPid(fPid);
-                enclosure.setfLineno(lineNo);
-                enclosure.setCreateTime(new Date());
-                enclosure.setCreateBy(loginUser.getUser().getUserName());
-                tEnclosureMapper.insertTEnclosure(enclosure);
+                if (enclosure.getfId() == null ){
+                    enclosure.setfPid(fPid);
+                    enclosure.setfLineno(lineNo);
+                    enclosure.setCreateTime(new Date());
+                    enclosure.setCreateBy(loginUser.getUser().getUserName());
+                    tEnclosureMapper.insertTEnclosure(enclosure);
+                }else{
+                    enclosure.setUpdateBy(loginUser.getUser().getUserName());
+                    enclosure.setUpdateTime(new Date());
+                    tEnclosureMapper.updateTEnclosure(enclosure);
+                }
             }
         }
         // 声明业务编号 list
@@ -2805,12 +2830,18 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("库存明细第" + line + "行未找到原始入库日期，请确认");
                 }
-                wbItem.setfPid(fPid);
-                wbItem.setfBilltype(billsType);
-                wbItem.setCreateTime(new Date());
-                wbItem.setfBillno(warehouseBills.getfBillno());
-                wbItem.setCreateBy(user.getUserName());
-                tWarehousebillsitemsMapper.updateTWarehousebillsitems(wbItem);
+                if (wbItem.getfId() == null){
+                    wbItem.setfPid(fPid);
+                    wbItem.setfBilltype(billsType);
+                    wbItem.setCreateTime(new Date());
+                    wbItem.setfBillno(warehouseBills.getfBillno());
+                    wbItem.setCreateBy(user.getUserName());
+                    tWarehousebillsitemsMapper.insertTWarehousebillsitems(wbItem);
+                }else{
+                    wbItem.setUpdateTime(new Date());
+                    wbItem.setUpdateBy(user.getUserName());
+                    tWarehousebillsitemsMapper.updateTWarehousebillsitems(wbItem);
+                }
 //                tWarehousebillsitemsMapper.insertTWarehousebillsitems(wbItem);
             }
         }
@@ -2825,13 +2856,20 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("箱型数据第" + cntrLine + "行数据缺少必填数据");
                 }
-                cntr.setfPid(fPid);
-                cntr.setfGoodsid(0L);
-                cntr.setfPackageid("0");
-                cntr.setCreateTime(new Date());
-                cntr.setCreateBy(user.getUserName());
-                cntr.setfCntrweight(new BigDecimal(0));
-                tWarehousebillsCntrMapper.updateTWarehousebillsCntr(cntr);
+
+                if (cntr.getfId() == null){
+                    cntr.setfPid(fPid);
+                    cntr.setfGoodsid(0L);
+                    cntr.setfPackageid("0");
+                    cntr.setCreateTime(new Date());
+                    cntr.setCreateBy(user.getUserName());
+                    cntr.setfCntrweight(new BigDecimal(0));
+                    tWarehousebillsCntrMapper.updateTWarehousebillsCntr(cntr);
+                }else{
+                    cntr.setUpdateTime(new Date());
+                    cntr.setUpdateBy(user.getUserName());
+                    tWarehousebillsCntrMapper.updateTWarehousebillsCntr(cntr);
+                }
 //                tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);
             }
         }
@@ -2839,35 +2877,42 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsfeesCr);
             List<TWarehousebillsfees> warehousebillsfeesCrList = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsfees.class);
             for (TWarehousebillsfees wbCr : warehousebillsfeesCrList) {
-                wbCr.setfPid(fPid);
-                wbCr.setfDc("C");
-                wbCr.setfBilltype(billsType);
-                wbCr.setCreateTime(new Date());
-                wbCr.setSrcBillNo(warehouseBills.getfBillno());
-                wbCr.setCreateBy(user.getUserName());
-                if (StringUtils.isNotNull(warehouseBills.getfBsdate())) {
-                    wbCr.setfBsdate(warehouseBills.getfBsdate());
+
+                if (wbCr.getfId() == null){
+                    wbCr.setfPid(fPid);
+                    wbCr.setfDc("C");
+                    wbCr.setfBilltype(billsType);
+                    wbCr.setCreateTime(new Date());
+                    wbCr.setSrcBillNo(warehouseBills.getfBillno());
+                    wbCr.setCreateBy(user.getUserName());
+                    tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
+                }else{
+                    wbCr.setUpdateTime(new Date());
+                    wbCr.setUpdateBy(user.getUserName());
+                    tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbCr);
                 }
 //                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
-                tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbCr);
             }
         }
         if (StringUtils.isNotNull(tWarehousebillsfeesDr) && !"[]".equals(tWarehousebillsfeesDr)) {
             JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsfeesDr);
             List<TWarehousebillsfees> warehousebillsfeesDrList = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsfees.class);
             for (TWarehousebillsfees wbDr : warehousebillsfeesDrList) {
-                wbDr.setfPid(fPid);
-                wbDr.setfDc("D");
-                wbDr.setfBillstatus(4L);
-                wbDr.setfBilltype(billsType);
-                wbDr.setCreateTime(new Date());
-                wbDr.setSrcBillNo(warehouseBills.getfBillno());
-                wbDr.setCreateBy(user.getUserName());
-                if (StringUtils.isNotNull(warehouseBills.getfBsdate())) {
-                    wbDr.setfBsdate(warehouseBills.getfBsdate());
+                if (wbDr.getfId() == null){
+                    wbDr.setfPid(fPid);
+                    wbDr.setfDc("D");
+                    wbDr.setfBillstatus(4L);
+                    wbDr.setfBilltype(billsType);
+                    wbDr.setCreateTime(new Date());
+                    wbDr.setSrcBillNo(warehouseBills.getfBillno());
+                    wbDr.setCreateBy(user.getUserName());
+                    tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
+                }else{
+                    wbDr.setUpdateTime(new Date());
+                    wbDr.setUpdateBy(user.getUserName());
+                    tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbDr);
                 }
 //                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
-                tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbDr);
             }
         }
         if (StringUtils.isNotNull(tEnclosure) && !"[]".equals(tEnclosure)) {
@@ -2876,12 +2921,18 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             long lineNo = 0L;
             for (TEnclosure enclosure : enclosuresList) {
                 lineNo++;
-                enclosure.setfPid(fPid);
-                enclosure.setfLineno(lineNo);
-                enclosure.setCreateTime(new Date());
-                enclosure.setCreateBy(user.getUserName());
+                if (enclosure.getfId() == null){
+                    enclosure.setfPid(fPid);
+                    enclosure.setfLineno(lineNo);
+                    enclosure.setCreateTime(new Date());
+                    enclosure.setCreateBy(user.getUserName());
+                    tEnclosureMapper.insertTEnclosure(enclosure);
+                }else{
+                    enclosure.setUpdateTime(new Date());
+                    enclosure.setUpdateBy(user.getUserName());
+                    tEnclosureMapper.updateTEnclosure(enclosure);
+                }
 //                tEnclosureMapper.insertTEnclosure(enclosure);
-                tEnclosureMapper.updateTEnclosure(enclosure);
             }
         }
         // 创建业务编号 list