2023年7月17日17:03:20

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseOutStockController.java

@@ -436,4 +436,13 @@ public class TWarehouseOutStockController extends BaseController {
         return itWarehouseBillsService.stockWarning(tWarehousebillsitems);
     }
 
+    /**
+     * 更新仓储计费日期
+     */
+    @GetMapping(value = "/updateBillingDate/{fId}")
+    @RepeatSubmit
+    public AjaxResult updateBillingDate(@PathVariable("fId") Long fId) {
+        return AjaxResult.success(itWarehouseBillsService.updateBillingDate(fId));
+    }
+
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseBillsService.java

@@ -930,4 +930,6 @@ public interface ITWarehouseBillsService {
      * @return
      */
     TWarehouseBills selectBYOriginalBillNo(String originalBillNo);
+
+    String updateBillingDate(Long fId);
 }

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

@@ -737,8 +737,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             }
         }
         if (WarehouseTypeEnum.HQZY.getType().equals(warehouseBills.getfBilltype()) || WarehouseTypeEnum.CKDB.getType().equals(warehouseBills.getfBilltype()) ||
-                WarehouseTypeEnum.HWTG.getType().equals(warehouseBills.getfBilltype()))
-        {
+                WarehouseTypeEnum.HWTG.getType().equals(warehouseBills.getfBilltype())) {
             tWhgenleg.setfOriginalbilldate(warehousebillsitems.getfOriginalbilldate());
             if (WarehouseTypeEnum.CKDB.getType().equals(warehouseBills.getfBilltype()) || WarehouseTypeEnum.HWTG.getType().equals(warehouseBills.getfBilltype())) {
                 tWhgenleg.setfCorpid(warehouseBills.getfCorpid());
@@ -765,7 +764,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         if (WarehouseTypeEnum.HQZY.getType().equals(warehouseBills.getfBilltype()) || WarehouseTypeEnum.HWTG.getType().equals(warehouseBills.getfBilltype())) {
             // 仓储计费日期
             tWhgenleg.setfChargedate(warehousebillsitems.getfBsdate());
-        }else {
+        } else {
             // 仓储计费日期
             tWhgenleg.setfChargedate(warehousebillsitems.getfChargedate());
         }
@@ -2225,9 +2224,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 cr.setCreateTime(new Date());
                 cr.setfPid(warehouseBills.getfId());
                 cr.setCreateBy(SecurityUtils.getUsername());
-                if (ObjectUtils.isEmpty(cr.getfId())){
+                if (ObjectUtils.isEmpty(cr.getfId())) {
                     tWarehousebillsfeesMapper.insertTWarehousebillsfees(cr);
-                }else {
+                } else {
                     tWarehousebillsfeesMapper.updateTWarehousebillsfees(cr);
                 }
                 //tWarehousebillsfeesMapper.insertTWarehousebillsfees(cr);
@@ -2252,9 +2251,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 dr.setCreateTime(new Date());
                 dr.setfPid(warehouseBills.getfId());
                 dr.setCreateBy(SecurityUtils.getUsername());
-                if (ObjectUtils.isEmpty(dr.getfId())){
+                if (ObjectUtils.isEmpty(dr.getfId())) {
                     tWarehousebillsfeesMapper.insertTWarehousebillsfees(dr);
-                }else {
+                } else {
                     tWarehousebillsfeesMapper.updateTWarehousebillsfees(dr);
                 }
                 //tWarehousebillsfeesMapper.insertTWarehousebillsfees(dr);
@@ -2452,9 +2451,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 cr.setCreateTime(new Date());
                 cr.setfPid(warehouseBills.getfId());
                 cr.setCreateBy(SecurityUtils.getUsername());
-                if (ObjectUtils.isEmpty(cr.getfId())){
+                if (ObjectUtils.isEmpty(cr.getfId())) {
                     tWarehousebillsfeesMapper.insertTWarehousebillsfees(cr);
-                }else {
+                } else {
                     tWarehousebillsfeesMapper.updateTWarehousebillsfees(cr);
                 }
                 //tWarehousebillsfeesMapper.insertTWarehousebillsfees(cr);
@@ -2481,9 +2480,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 dr.setCreateTime(new Date());
                 dr.setfPid(warehouseBills.getfId());
                 dr.setCreateBy(SecurityUtils.getUsername());
-                if (ObjectUtils.isEmpty(dr.getfId())){
+                if (ObjectUtils.isEmpty(dr.getfId())) {
                     tWarehousebillsfeesMapper.insertTWarehousebillsfees(dr);
-                }else {
+                } else {
                     tWarehousebillsfeesMapper.updateTWarehousebillsfees(dr);
                 }
                 //tWarehousebillsfeesMapper.insertTWarehousebillsfees(dr);
@@ -3548,9 +3547,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
                     wbCr.setfBsdate(warehouseBills.getfBsdate());
                 }
-                if (ObjectUtils.isEmpty(wbCr.getfId())){
+                if (ObjectUtils.isEmpty(wbCr.getfId())) {
                     tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
-                }else {
+                } else {
                     tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbCr);
                 }
 
@@ -3571,9 +3570,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
                     wbDr.setfBsdate(warehouseBills.getfBsdate());
                 }
-                if (ObjectUtils.isEmpty(wbDr.getfId())){
+                if (ObjectUtils.isEmpty(wbDr.getfId())) {
                     tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
-                }else {
+                } else {
                     tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbDr);
                 }
 
@@ -3699,9 +3698,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
                     wbCr.setfBsdate(warehouseBills.getfBsdate());
                 }
-                if (ObjectUtils.isEmpty(wbCr.getfId())){
+                if (ObjectUtils.isEmpty(wbCr.getfId())) {
                     tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
-                }else {
+                } else {
                     tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbCr);
                 }
             }
@@ -3722,9 +3721,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
                     wbDr.setfBsdate(warehouseBills.getfBsdate());
                 }
-                if (ObjectUtils.isEmpty(wbDr.getfId())){
+                if (ObjectUtils.isEmpty(wbDr.getfId())) {
                     tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
-                }else {
+                } else {
                     tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbDr);
                 }
             }
@@ -4393,9 +4392,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 cntr.setCreateBy(loginUser.getUser().getUserName());
                 cntr.setCreateTime(new Date());
 
-                if (cntr.getfId() == null){
+                if (cntr.getfId() == null) {
                     tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);
-                }else {
+                } else {
                     tWarehousebillsCntrMapper.updateTWarehousebillsCntr(cntr);
                 }
             }
@@ -4408,9 +4407,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 enclosure.setfPid(tWarehouseBills.getfId());
                 enclosure.setCreateBy(loginUser.getUser().getUserName());
                 enclosure.setCreateTime(new Date());
-                if (enclosure.getfId() == null){
+                if (enclosure.getfId() == null) {
                     tEnclosureMapper.insertTEnclosure(enclosure);
-                }else {
+                } else {
                     tEnclosureMapper.updateTEnclosure(enclosure);
                 }
 
@@ -4428,9 +4427,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 if (tWarehouseBills.getfBsdate() != null && !tWarehouseBills.getfBsdate().equals("")) {
                     wbDr.setfBsdate(tWarehouseBills.getfBsdate());
                 }
-                if (wbDr.getfId() == null){
+                if (wbDr.getfId() == null) {
                     tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
-                }else {
+                } else {
                     tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbDr);
                 }
 
@@ -4448,9 +4447,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 if (tWarehouseBills.getfBsdate() != null && !tWarehouseBills.getfBsdate().equals("")) {
                     wbCr.setfBsdate(tWarehouseBills.getfBsdate());
                 }
-                if (wbCr.getfId() == null){
+                if (wbCr.getfId() == null) {
                     tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
-                }else {
+                } else {
                     tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbCr);
                 }
             }
@@ -4718,6 +4717,15 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         if (Objects.equals(tWarehouseBills.getfTrademodeid(), tWarehouseBills.getfNewTrademodeid())) {
             throw new WarehouseException("贸易方式不得与原贸易方式一致");
         }
+        Long fCharg = 0L;
+        if (ObjectUtils.isNotNull(tWarehouseBills.getfInwarehouseid())) {
+            //todo
+            TWarehouse tWarehouse = tWarehouseMapper.selectTWarehouseById(tWarehouseBills.getfInwarehouseid());
+            if (ObjectUtils.isNotNull(tWarehouse)) {
+                fCharg = tWarehouse.getfCharg();
+            }
+        }
+
         for (TWarehousebillsitems wbItem : warehousebillsitemsList) {
             // 如果业务时间超出当前时间则不允许
             if (wbItem.getfBsdate().after(new Date())) {
@@ -4801,6 +4809,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             } else if (WarehouseTypeEnum.CKDB.getType().equals(billsType) || WarehouseTypeEnum.HWTG.getType().equals(billsType)) { // 调拨查询
                 //校验计费日期是等于库存总帐计费日，如果不相等则报错
                 checkWhgenleg(wbItem, tWhgenle);
+                if (fCharg != 0) {
+                    wbItem.setfBsdate(tWarehouseBills.getfBsdate());
+                }
                 if (!Objects.equals(wbItem.getfWarehouselocid(), wbItem.getfTransferWarehouselocid())) {
                     //  1、  库存 <  调拨件数  提示库存不足
                     judgeItemQty(tWhgenle, wbItem, i);
@@ -4990,11 +5001,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             JSONArray jsonDrArray = JSONArray.parseArray(warehousebillsfeesDr);
             List<TWarehousebillsfees> warehousebillsfeesDrList = JSONObject.parseArray(jsonDrArray.toJSONString(), TWarehousebillsfees.class);
             for (TWarehousebillsfees wbDr : warehousebillsfeesDrList) {
-                if (StringUtils.isNotNull(wbDr.getfId())){
+                if (StringUtils.isNotNull(wbDr.getfId())) {
                     wbDr.setUpdateBy(loginUser.getUser().getUserName());
                     wbDr.setUpdateTime(new Date());
                     tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbDr);
-                }else {
+                } else {
                     wbDr.setfPid(tWarehouseBills.getfId());
                     wbDr.setfDc("D");
                     wbDr.setCreateBy(loginUser.getUser().getUserName());
@@ -5008,11 +5019,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             JSONArray jsonCrArray = JSONArray.parseArray(warehousebillsfeesCr);
             List<TWarehousebillsfees> warehousebillsfeesCrList = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsfees.class);
             for (TWarehousebillsfees wbCr : warehousebillsfeesCrList) {
-                if (StringUtils.isNotNull(wbCr.getfId())){
+                if (StringUtils.isNotNull(wbCr.getfId())) {
                     wbCr.setUpdateBy(loginUser.getUser().getUserName());
                     wbCr.setUpdateTime(new Date());
                     tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbCr);
-                }else {
+                } else {
                     wbCr.setfPid(tWarehouseBills.getfId());
                     wbCr.setfDc("C");
                     wbCr.setCreateBy(loginUser.getUser().getUserName());
@@ -5224,9 +5235,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 if (tWarehouseBills.getfBsdate() != null && !tWarehouseBills.getfBsdate().equals("")) {
                     wbDr.setfBsdate(tWarehouseBills.getfBsdate());
                 }
-                if (wbDr.getfId() == null){
+                if (wbDr.getfId() == null) {
                     tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
-                }else {
+                } else {
                     tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbDr);
                 }
             }
@@ -5243,9 +5254,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 if (tWarehouseBills.getfBsdate() != null && !tWarehouseBills.getfBsdate().equals("")) {
                     wbCr.setfBsdate(tWarehouseBills.getfBsdate());
                 }
-                if (wbCr.getfId() == null){
+                if (wbCr.getfId() == null) {
                     tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
-                }else {
+                } else {
                     tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbCr);
                 }
             }
@@ -5971,9 +5982,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 return AjaxResult.error("仓储费截止日期不能为空");
             }*/
 
-            if (ObjectUtils.isNull(item.getfId())){
+            if (ObjectUtils.isNull(item.getfId())) {
                 tWarehousebillsfeesMapper.insertTWarehousebillsfees(item);
-            }else {
+            } else {
                 tWarehousebillsfeesMapper.updateTWarehousebillsfees(item);
             }
 
@@ -6632,10 +6643,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 if (rows.getRowNum() == 0) {
                     continue;
                 }
-                System.out.println("*****"+rows.getPhysicalNumberOfCells());
+                System.out.println("*****" + rows.getPhysicalNumberOfCells());
                 TWarehousebillsitems warehousebillsitems = new TWarehousebillsitems();
                 for (int a = 0; a <= rows.getPhysicalNumberOfCells(); a++) {
-                    System.out.println("============"+rows.getCell(a));
+                    System.out.println("============" + rows.getCell(a));
                     if (StringUtils.isNull(rows.getCell(a))) {
                         continue;
                     }
@@ -6765,7 +6776,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         String errinfo = "";
         int line = 1;
         for (TWarehousebillsitems li : itemList) {
-            if (ObjectUtil.isEmpty(li.getfBusinessType())){
+            if (ObjectUtil.isEmpty(li.getfBusinessType())) {
                 errinfo = errinfo + "第" + line + "行货物属性为空，";
             }
             if (StringUtils.isEmpty(li.getfCntrno())) {
@@ -7658,9 +7669,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 cntr.setfCntrweight(new BigDecimal(0));
                 cntr.setCreateBy(loginUser.getUser().getUserName());
                 cntr.setCreateTime(new Date());
-                if (ObjectUtils.isEmpty(cntr.getfId())){
+                if (ObjectUtils.isEmpty(cntr.getfId())) {
                     tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);
-                }else {
+                } else {
                     tWarehousebillsCntrMapper.updateTWarehousebillsCntr(cntr);
                 }
 
@@ -7674,9 +7685,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 enclosure.setfPid(tWarehousebills.getfId());
                 enclosure.setCreateBy(loginUser.getUser().getUserName());
                 enclosure.setCreateTime(new Date());
-                if (ObjectUtils.isEmpty(enclosure.getfId())){
+                if (ObjectUtils.isEmpty(enclosure.getfId())) {
                     tEnclosureMapper.insertTEnclosure(enclosure);
-                }else {
+                } else {
                     tEnclosureMapper.updateTEnclosure(enclosure);
                 }
 
@@ -7694,9 +7705,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 if (tWarehousebills.getfBsdate() != null && !"".equals(tWarehousebills.getfBsdate())) {
                     wbDr.setfBsdate(tWarehousebills.getfBsdate());
                 }
-                if (wbDr.getfId() == null){
+                if (wbDr.getfId() == null) {
                     tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
-                }else {
+                } else {
                     tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbDr);
                 }
             }
@@ -7713,9 +7724,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 if (tWarehousebills.getfBsdate() != null && !"".equals(tWarehousebills.getfBsdate())) {
                     wbCr.setfBsdate(tWarehousebills.getfBsdate());
                 }
-                if (wbCr.getfId() == null){
+                if (wbCr.getfId() == null) {
                     tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
-                }else {
+                } else {
                     tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbCr);
                 }
             }
@@ -10298,6 +10309,29 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         return tWarehouseBillsMapper.selectBYOriginalBillNo(originalBillNo);
     }
 
+    @Override
+    public String updateBillingDate(Long fId) {
+        // 查询仓库主表数据
+        TWarehouseBills tWarehousebills = tWarehouseBillsMapper.selectTWarehousebillsById(fId);
+        if (tWarehousebills == null) {
+            throw new RuntimeException("未查到单据信息");
+        }
+        // 查询仓库明细从表数据
+        List<TWarehousebillsitems> tWarehousebillsitems = tWarehousebillsitemsMapper.selectTWarehousebillsitemsListByPidToType(fId, "SJCK");
+        for (TWarehousebillsitems item : tWarehousebillsitems) {
+            TGoods goods = tGoodsMapper.selectTGoodsById(item.getfGoodsid());
+            // 查询总账是否存在
+            TWhgenleg tWhgenle = queryWhgenlegService.stockWhgenleg(tWarehousebills, item, goods.getIfCntrno(), WarehouseTypeEnum.CONFIRM_OPERATION.getType());
+            if (tWhgenle != null) {
+                item.setfChargedate(tWhgenle.getfChargedate());
+                tWarehousebillsitemsMapper.updateTWarehousebillsitems(item);
+            } else {
+                throw new RuntimeException("为找到库存账，操作失败");
+            }
+        }
+        return "操作成功";
+    }
+
     /**
      * RSA 签名
      *