调整仓储费计算 出库计算 与其余模块的不同

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

@@ -1274,7 +1274,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             // 累计计费天数
             long accumulatedDays = DateUtils.getDateDay((Date) item.get("fChargedate"), (Date) item.get("fOriginalbilldate"));
             // 库存天数
-            long fInventoryDays = DateUtils.getDateDay(warehouseBills.getfBillingDeadline(), (Date) item.get("fOriginalbilldate"));
+            long fInventoryDays = 0L;
+            if ("SJCK".equals(fBilltype)) {
+                fInventoryDays = DateUtils.getDateDay((Date) item.get("fBsdate"), (Date) item.get("fOriginalbilldate"));
+            } else {
+                fInventoryDays = DateUtils.getDateDay(warehouseBills.getfBillingDeadline(), (Date) item.get("fOriginalbilldate"));
+            }
             /*if ("KCZZ".equals(fBilltype)) {
             } else {
                 fInventoryDays = Long.valueOf(String.valueOf(item.get("fBillingDays")));