完善仓储费计算

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

@@ -4441,7 +4441,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         bills.setfBillstatus(4L);
         List<Map<String, Object>> list = tWarehouseBillsMapper.selecStorageFeeList(bills);
         if (list != null && list.size() > 0) {
-            return AjaxResult.error("当前选择客户存在未审批的仓储费信息，请先审批完成后再计算");
+            return AjaxResult.error("当前选择客户存在未审批的仓储费信息，请等待审批完成后再计算");
         }
 
         tWarehouseBills.setfBillingDeadline(DateUtils.dateConversionMax(tWarehouseBills.getfBillingDeadline()));
@@ -5084,7 +5084,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 // 查询时间区间内的仓储业务明细信息
                 List<String> timeList = new ArrayList<>();
                 timeList.add(DateUtils.dateToString(DateUtils.dateConversionMin(fees.getfBillingDeadline())));
-                timeList.add(DateUtils.dateToString(DateUtils.dateConversionMax(warehouseBills.getUpdateTime())));
+                // timeList.add(DateUtils.dateToString(DateUtils.dateConversionMax(warehouseBills.getUpdateTime())));
+                timeList.add(DateUtils.dateToString(DateUtils.dateConversionMax(new Date())));
                 warehouseBills.setItemBsDateList(timeList);
                 List<TWarehousebillsitems> warehousebillsitemsList = tWarehousebillsitemsMapper.selectListByCorpId(warehouseBills);
                 // 过滤出出库、货转，更新对应仓储费计费日期

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeMapper.xml

@@ -2573,10 +2573,10 @@
                 and tf.f_review_date <= #{timeExamine[1]}
             </if>
             <if test='timeInterval != null and timeInterval[0] != null and timeInterval[0]!= ""'>
-                and tw.f_bsdate &gt;= #{timeInterval[0]}
+                and ty.f_ATD &gt;= #{timeInterval[0]}
             </if>
             <if test='timeInterval != null and timeInterval[1] != null and timeInterval[1]!= ""'>
-                and tw.f_bsdate &lt;= #{timeInterval[1]}
+                and ty.f_ATD &lt;= #{timeInterval[1]}
             </if>
             GROUP BY tw.f_vslid,tw.f_voyid
             ORDER BY tw.f_bsdate DESC