修改仓储费计算截止日期 问题

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/service/impl/AuditPathsServiceImpl.java

@@ -12,6 +12,7 @@ import com.ruoyi.approvalFlow.service.IAuditPathsService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.finance.domain.TFee;
 import com.ruoyi.finance.mapper.TFeeMapper;
@@ -345,15 +346,14 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                                     if ("KCZZ".equals(f.getfBilltype())) {
                                         TWhgenleg whgenleg = new TWhgenleg();
                                         whgenleg.setfId(f.getSrcId());
-                                        whgenleg.setfChargedate(f.getfBillingDeadline());
+                                        whgenleg.setfChargedate(DateUtils.dateAdd(f.getfBillingDeadline(), 1));
                                         tWhgenlegMapper.updateTWhgenleg(whgenleg);
                                     } else {
                                         TWarehousebillsitems billsItem = new TWarehousebillsitems();
                                         billsItem.setfId(f.getSrcId());
+                                        billsItem.setfChargedate(DateUtils.dateAdd(f.getfBillingDeadline(), 1));
                                         if ("SJCK".equals(f.getfBilltype())) {
                                             billsItem.setfStorageFeeDeadline(f.getfBillingDeadline());
-                                        } else {
-                                            billsItem.setfChargedate(f.getfBillingDeadline());
                                         }
                                         tWarehousebillsitemsMapper.updateTWarehousebillsitems(billsItem);
                                     }

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

@@ -803,7 +803,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             }
             if ("KCZZ".equals(wareItem.getfBilltype())) {
                 TWhgenleg tWhgenleg = tWhgenlegMapper.selectTWhgenlegById(wareItem.getSrcId());
-                tWhgenleg.setfChargedate(wareItem.getfBillingDeadline());
+                tWhgenleg.setfChargedate(DateUtils.dateAdd(wareItem.getfBillingDeadline(), 1));
                 int i = tWhgenlegMapper.updateTWhgenleg(tWhgenleg);
                 if (i <= 0) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -811,7 +811,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 }
             } else {
                 TWarehousebillsitems tWarehousebillsitems = tWarehousebillsitemsMapper.selectTWarehousebillsitemsById(wareItem.getSrcId());
-                tWarehousebillsitems.setfChargedate(wareItem.getfBillingDeadline());
+                tWarehousebillsitems.setfChargedate(DateUtils.dateAdd(wareItem.getfBillingDeadline(), 1));
                 if ("SJCK".equals(wareItem.getfBilltype())) {
                     tWarehousebillsitems.setfStorageFeeDeadline(wareItem.getfBillingDeadline());
                 }
@@ -1376,9 +1376,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             fees.setCreateBy(loginUser.getUser().getUserName());
             fees.setfProductName(item.get("fGoodsids").toString());
             if ("SJCK".equals(fBilltype)) {
-                fees.setfBillingDeadline(DateUtils.dateAdd(fBsdate, 1));
+                fees.setfBillingDeadline(fBsdate);
             } else {
-                fees.setfBillingDeadline(DateUtils.dateAdd(warehouseBills.getfBillingDeadline(), 1));
+                fees.setfBillingDeadline(warehouseBills.getfBillingDeadline());
             }
             fees.setfTaxrate(new BigDecimal(taxRate.get(0).getDictValue()));
             fees.setfOriginalbilldate((Date) item.get("fOriginalbilldate"));