财务应收报表卸柜到仓时间查询bug修复

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/dal/mysql/BoxMapper.java

@@ -657,9 +657,9 @@ public interface BoxMapper extends AbstractMapper<BoxDO> {
             ", ecw_box_settlement settlement ",
             "</when>",
 
-            "<when test = 'beginUlWarehouseTime != null or endUlWarehouseTime != null'>",
-            ", ecw_box_cabinet_unload unload ",
-            "</when>",
+//            "<when test = 'beginUlWarehouseTime != null or endUlWarehouseTime != null'>",
+//            ", ecw_box_cabinet_unload unload ",
+//            "</when>",
 
             "WHERE",
             "box.deleted = 0 and box.pr_status &gt; 21",
@@ -667,10 +667,10 @@ public interface BoxMapper extends AbstractMapper<BoxDO> {
             "<when test = 'beginJsDate != null or endJsDate != null'>",
             "and box.id = settlement.shipment_id and settlement.deleted = 0",
             "</when>",
-
-            "<when test = 'beginUlWarehouseTime != null or endUlWarehouseTime != null'>",
-            "and box.id = unload.shipment_id and unload.deleted = 0",
-            "</when>",
+//
+//            "<when test = 'beginUlWarehouseTime != null or endUlWarehouseTime != null'>",
+//            "and box.id = unload.shipment_id and unload.deleted = 0",
+//            "</when>",
 
             "<when test = 'beginJsDate != null'>",
             "and settlement.sl_settled_time &gt;= #{beginJsDate}",
@@ -698,11 +698,11 @@ public interface BoxMapper extends AbstractMapper<BoxDO> {
             "</when>",
 
             "<when test = 'beginUlWarehouseTime != null'>",
-            "and unload.ul_warehouse_time &gt;= #{beginUlWarehouseTime}",
+            "and box.th_date &gt;= #{beginUlWarehouseTime}",
             "</when>",
 
             "<when test = 'endUlWarehouseTime != null'>",
-            "and unload.ul_warehouse_time &lt;= #{endUlWarehouseTime}",
+            "and box.th_date &lt;= #{endUlWarehouseTime}",
             "</when>",
 
             "<when test = 'selfNo != null and selfNo != \"\" '>",