2024年10月10日10:16:30

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/check/TWarehouseCheckItemsController.java

@@ -110,7 +110,7 @@ public class TWarehouseCheckItemsController extends BaseController {
     @DeleteMapping("/{fIds}")
     public AjaxResult remove(@PathVariable String fIds) {
         String[] ids = fIds.split(",");
-        for (String itemId : ids) {
+       /* for (String itemId : ids) {
             TWarehouseCheckItemsDetails tWarehouseCheckItemsDetailsQuery = new TWarehouseCheckItemsDetails();
             tWarehouseCheckItemsDetailsQuery.setfItemFid(Long.parseLong(itemId));
             List<TWarehouseCheckItemsDetails> tWarehouseCheckItemsDetailsList = tWarehouseCheckItemsDetailsService.selectTWarehouseCheckItemsDetailsList(tWarehouseCheckItemsDetailsQuery);
@@ -120,7 +120,7 @@ public class TWarehouseCheckItemsController extends BaseController {
                     return AjaxResult.error("单据存在图片详情，不允许删除");
                 }
             }
-        }
+        }*/
         Long[] idArr = new Long[ids.length];
         for (int i = 0; i < ids.length; i++) {
             idArr[i] = Long.parseLong(ids[i]);

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

@@ -5383,9 +5383,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             } else {
                 // 库存总帐在库天数：计费截止日期-原始入库日期
                 // 库存总帐计费天数：计费截止日期-计费日期
-                if (item.getFOriginalbilldate().compareTo(warehouseBills.getfBillingDeadline()) < 0) {
+                fInventoryDays = DateUtils.getDateDay(warehouseBills.getfBillingDeadline(), item.getFOriginalbilldate());
+                fBillingDays = DateUtils.getDateDay(warehouseBills.getfBillingDeadline(), item.getFChargedate());
+                storageFeesDto.setStartTime(item.getFChargedate());
+                storageFeesDto.setEndTime(warehouseBills.getfBillingDeadline());
+              /*  if (item.getFOriginalbilldate().compareTo(warehouseBills.getfBillingDeadline()) < 0) {
                     fInventoryDays = DateUtils.getDateDay(item.getFBsdate(), item.getFOriginalbilldate());
-                    fBillingDays = DateUtils.getDateDay(item.getFOriginalbilldate(), item.getFChargedate());
+                    fBillingDays = DateUtils.getDateDay(item.getFChargedate(), item.getFOriginalbilldate());
                     storageFeesDto.setStartTime(item.getFChargedate());
                     storageFeesDto.setEndTime(item.getFOriginalbilldate());
                 } else {
@@ -5393,7 +5397,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     fBillingDays = DateUtils.getDateDay(warehouseBills.getfBillingDeadline(), item.getFChargedate());
                     storageFeesDto.setStartTime(item.getFChargedate());
                     storageFeesDto.setEndTime(warehouseBills.getfBillingDeadline());
-                }
+                }*/
             }
             if (fBillingDays <= 0) {
                 continue;

ruoyi-warehouse/src/main/resources/mapper/reportManagement/TWhgenlegMapper.xml

@@ -678,7 +678,7 @@
             wh.f_id,
             wh.f_originalbillno AS f_billno,
             wh.f_goodsid,
-            wh.f_bsdate AS f_bsdate,
+            wh.f_originalbilldate  AS f_bsdate,
             wh.f_billingway,
             wh.f_mblno,
             wh.f_chargedate,