解决仓储费计算问题

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

@@ -438,9 +438,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             for (TWarehousebillsitems wbItem : warehousebillsitemsList) {
                 boolean warehouseStatus = "SJRK".equals(billsType) || "SJCK".equals(billsType) || "CKDB".equals(billsType);
                 // 仓储计费日期
-                wbItem.setfChargedate(warehouseBills.getfChargedate());
                 wbItem.setfBilltype(billsType);
                 if ("SJRK".equals(billsType)) {
+                    wbItem.setfChargedate(warehouseBills.getfChargedate());
                     wbItem.setfBillingway(warehouseBills.getfBillingway());
                 }
                 if (null != wbItem.getfId()) {
@@ -1300,18 +1300,19 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             String fBilltype = (String) item.get("fBilltype");
             long fGoodsid = Long.parseLong((String) item.get("fTypeid"));
             long fId = Long.valueOf(String.valueOf(item.get("fId"))).longValue();
-            // 要计费天数
-            long fBillingDays = DateUtils.getDateDay(warehouseBills.getfBillingDeadline(), (Date) item.get("fChargedate"));
             // 累计计费天数
             long accumulatedDays = DateUtils.getDateDay((Date) item.get("fChargedate"), (Date) item.get("fOriginalbilldate"));
             // 库存天数
             long fInventoryDays = 0L;
+            // 要计费天数
+            long fBillingDays = DateUtils.getDateDay(warehouseBills.getfBillingDeadline(), (Date) item.get("fOriginalbilldate"));
             if ("SJCK".equals(fBilltype)) {
                 fInventoryDays = DateUtils.getDateDay((Date) item.get("fBsdate"), (Date) item.get("fOriginalbilldate"));
+                fBillingDays = DateUtils.getDateDay((Date) item.get("fChargedate"), (Date) item.get("fChargedate"));
             } else if ("HQZY".equals(fBilltype)) {
                 fInventoryDays = DateUtils.getDateDay(warehouseBills.getfBillingDeadline(), (Date) item.get("fBsdate"));
             } else {
-                fInventoryDays = DateUtils.getDateDay(warehouseBills.getfBillingDeadline(), (Date) item.get("fOriginalbilldate"));
+                fBillingDays = DateUtils.getDateDay(warehouseBills.getfBillingDeadline(), (Date) item.get("fChargedate"));
             }
             /*if ("KCZZ".equals(fBilltype)) {
             } else {