2022年11月10日13:36:19

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/impl/TFeeServiceImpl.java

@@ -721,8 +721,10 @@ public class TFeeServiceImpl implements ITFeeService {
     public List<FeeVO> warehouseBillsFeesList(TWareHouseFees tWareHouseFees) {
         if (tWareHouseFees.getSwitchSection() == 1) {
             tWareHouseFees.setTimeExamine(tWareHouseFees.getTimeExamine());
+            tWareHouseFees.setfBstimeExamine(null);
         } else {
             tWareHouseFees.setfBstimeExamine(tWareHouseFees.getTimeExamine());
+            tWareHouseFees.setTimeExamine(null);
         }
         List<FeeVO> list = tFeeMapper.selectFinancialLedgerList(tWareHouseFees);
         for (FeeVO feeVO:list) {

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

@@ -321,13 +321,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         List<Map<String, Object>> mapList = tWarehousebillsitemsMapper.selectGoodsTransferitemsList(tWarehousebillsitems);
         if (StringUtils.isNotEmpty(mapList)) {
             for (Map<String, Object> wb : mapList) {
-                    List<TWarehousebillsfees> tWarehousebillsfees = tWarehousebillsfeesMapper.selectWarehousebillsfeesByPId(fId);
+                  /*  List<TWarehousebillsfees> tWarehousebillsfees = tWarehousebillsfeesMapper.selectWarehousebillsfeesByPId(fId);
                     if (ObjectUtils.isNotNull(tWarehousebillsfees) && tWarehousebillsfees.size()>0){
 //                        List<Date> fAccbilldate = tWarehousebillsfees.stream().map(TWarehousebillsfees::getFInvoicingDate).distinct().collect(Collectors.toList());
                         String invoiceNo = tWarehousebillsfees.stream().map(TWarehousebillsfees::getfInvnos).distinct().collect(Collectors.joining(","));
 //                        wb.put("fAccbilldate",String.join(",", (CharSequence) fAccbilldate));
                         wb.put("invoiceNo",invoiceNo);
-                    }
+                    }*/
                 /*TWhgenleg tWhgenleg = new TWhgenleg();
                 tWhgenleg.setfCorpid(tWarehousebills.getfCorpid());
                 if (StringUtils.isNotNull(wb.get("fGoodsid"))) {
@@ -890,12 +890,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             }
             warehouseBills.setUpdateBy(loginUser.getUser().getUserName());
             warehouseBills.setUpdateTime(new Date());
-            tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(fPid);
+//            tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(fPid);
             tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
-            tWarehousebillsfeesMapper.deleteByFPid(fPid);
-            tEnclosureMapper.deleteByFPid(fPid);
+//            tWarehousebillsfeesMapper.deleteByFPid(fPid);
+//            tEnclosureMapper.deleteByFPid(fPid);
             // 删除  从表中 未打印账单的数据
-            deleteBillsitems(fPid, tWarehousebillsitems);
+//            deleteBillsitems(fPid, tWarehousebillsitems);
         }
         // 库存明细添加
         if (StringUtils.isNotNull(tWarehousebillsitems) && !"[]".equals(tWarehousebillsitems)) {
@@ -1001,10 +1001,16 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             JSONArray jsonDrArray = JSONArray.parseArray(tEnclosure);
             List<TEnclosure> tEnclosureList = JSONObject.parseArray(jsonDrArray.toJSONString(), TEnclosure.class);
             for (TEnclosure enclosure : tEnclosureList) {
-                enclosure.setfPid(fPid);
-                enclosure.setCreateBy(loginUser.getUser().getUserName());
-                enclosure.setCreateTime(new Date());
-                tEnclosureMapper.insertTEnclosure(enclosure);
+                if (ObjectUtils.isNotNull(enclosure.getfId())){
+                    enclosure.setUpdateBy(loginUser.getUser().getUserName());
+                    enclosure.setUpdateTime(new Date());
+                    tEnclosureMapper.updateTEnclosure(enclosure);
+                }else{
+                    enclosure.setfPid(fPid);
+                    enclosure.setCreateBy(loginUser.getUser().getUserName());
+                    enclosure.setCreateTime(new Date());
+                    tEnclosureMapper.insertTEnclosure(enclosure);
+                }
             }
         }
         //  箱型数据
@@ -1018,13 +1024,23 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("箱型数据第" + line + "行数据缺少必填数据");
                 }
-                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 (ObjectUtils.isNotNull(cntr.getfId())){
+                    cntr.setfPid(fPid);
+                    cntr.setfGoodsid(0L);
+                    cntr.setfPackageid("0");
+                    cntr.setfCntrweight(new BigDecimal(0));
+                    cntr.setCreateBy(loginUser.getUser().getUserName());
+                    cntr.setCreateTime(new Date());
+                    tWarehousebillsCntrMapper.updateTWarehousebillsCntr(cntr);
+                }else{
+                    cntr.setfPid(fPid);
+                    cntr.setfGoodsid(0L);
+                    cntr.setfPackageid("0");
+                    cntr.setfCntrweight(new BigDecimal(0));
+                    cntr.setUpdateBy(loginUser.getUser().getUserName());
+                    cntr.setUpdateTime(new Date());
+                    tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);
+                }
             }
         }
         // 收款明细添加
@@ -1032,17 +1048,31 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             JSONArray jsonDrArray = JSONArray.parseArray(tWarehousebillsfeesDr);
             List<TWarehousebillsfees> warehousebillsfeesDrList = JSONObject.parseArray(jsonDrArray.toJSONString(), TWarehousebillsfees.class);
             for (TWarehousebillsfees wbDr : warehousebillsfeesDrList) {
-                // 检验  数量*单价=金额
-                wbDr.setfPid(fPid);
-                wbDr.setfDc("D");
-                wbDr.setfBilltype(billsType);
-                wbDr.setCreateTime(new Date());
-                wbDr.setSrcBillNo(warehouseBills.getfBillno());
-                wbDr.setCreateBy(loginUser.getUser().getUserName());
-                if (warehouseBills.getfBsdate() != null) {
-                    wbDr.setfBsdate(warehouseBills.getfBsdate());
+                if (ObjectUtils.isNotNull(wbDr.getfId())){
+                    // 检验  数量*单价=金额
+                    wbDr.setfPid(fPid);
+                    wbDr.setfDc("D");
+                    wbDr.setfBilltype(billsType);
+                    wbDr.setCreateTime(new Date());
+                    wbDr.setSrcBillNo(warehouseBills.getfBillno());
+                    wbDr.setCreateBy(loginUser.getUser().getUserName());
+                    if (warehouseBills.getfBsdate() != null) {
+                        wbDr.setfBsdate(warehouseBills.getfBsdate());
+                    }
+                    tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbDr);
+                }else{
+                    // 检验  数量*单价=金额
+                    wbDr.setfPid(fPid);
+                    wbDr.setfDc("D");
+                    wbDr.setfBilltype(billsType);
+                    wbDr.setUpdateTime(new Date());
+                    wbDr.setSrcBillNo(warehouseBills.getfBillno());
+                    wbDr.setUpdateBy(loginUser.getUser().getUserName());
+                    if (warehouseBills.getfBsdate() != null) {
+                        wbDr.setfBsdate(warehouseBills.getfBsdate());
+                    }
+                    tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
                 }
-                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
             }
         }
         // 付款明细添加
@@ -1050,16 +1080,29 @@ 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(loginUser.getUser().getUserName());
-                if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
-                    wbCr.setfBsdate(warehouseBills.getfBsdate());
-                }
-                tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
+               if (ObjectUtils.isNotNull(wbCr.getfId())){
+                   wbCr.setfPid(fPid);
+                   wbCr.setfDc("C");
+                   wbCr.setfBilltype(billsType);
+                   wbCr.setUpdateTime(new Date());
+                   wbCr.setSrcBillNo(warehouseBills.getfBillno());
+                   wbCr.setUpdateBy(loginUser.getUser().getUserName());
+                   if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
+                       wbCr.setfBsdate(warehouseBills.getfBsdate());
+                   }
+                   tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbCr);
+               }else{
+                   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);
+               }
             }
         }
         //查询删除的仓储费收费信息
@@ -7570,7 +7613,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         tWarehousebillsitem.setfPid(fid);
         List<TWarehousebillsitems> warehousebillsitemsList = tWarehousebillsitemsMapper.selectTWarehousebillsitemsList(tWarehousebillsitem);
         warehousebillsitemsList.forEach(wb ->
-                oldList.add(wb.getfId())
+//                oldList.add(wb.getfId())
+                        tWarehousebillsitemsMapper.updateTWarehousebillsitems(wb)
         );
 
         // 获取提交从表数据ID
@@ -7578,17 +7622,18 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             JSONArray warehouseJSON = JSONArray.parseArray(tWarehousebillsitems);
             List<TWarehousebillsitems> warehousebillsitemsLists = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsitems.class);
             warehousebillsitemsLists.forEach(wb ->
-                    newList.add(wb.getfId())
+//                    newList.add(wb.getfId())
+                            tWarehousebillsitemsMapper.updateTWarehousebillsitems(wb)
             );
         }
         // 删除多余的ID
-        List<Long> reduce1 = oldList.stream().filter(item -> !newList.contains(item)).collect(toList());
+      /*  List<Long> reduce1 = oldList.stream().filter(item -> !newList.contains(item)).collect(toList());
         reduce1.forEach(id ->
                 tWarehousebillsitemsMapper.deleteTWarehousebillsitemsById(id)
         );
         reduce1.forEach(id ->
                 warehousebillsitemsElabelMapper.deleteByFPid(id)
-        );
+        );*/
     }
 
     /**

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsitemsMapper.xml

@@ -247,8 +247,7 @@
             item.f_now_carton AS fNowCarton,
             item.f_cartype_id AS fCartypeId,
             item.f_dc AS fDc,
-            item.create_time AS createTime,
-            sum(tf.f_invamount) AS fApplyMoney
+            item.create_time AS createTime
         FROM
             t_warehousebills w
             LEFT JOIN t_warehousebillsitems item ON item.f_pid = w.f_id
@@ -259,7 +258,6 @@
             LEFT JOIN t_corps f ON f.f_id = item.f_fleet
             LEFT JOIN sys_dict_data l ON l.dict_value = item.f_lntype
             AND l.dict_type = 'ln_way'
-            Left join t_warehousebillsfees tf on tf.f_pid = w.f_id
         WHERE
             item.f_pid = #{fPid}
     </select>