提货箱数、提货率、提货状态回填

sql/v2.1/20240904.sql

@@ -18,6 +18,5 @@ alter table `ecw_order`
 
 -- 批量刷新订单提货数量、提货率、提货状态
 update ecw_order t LEFT JOIN (select a.order_id,sum(a.pick_num) as pickNum from ecw_order_pickup a where a.deleted=0 GROUP BY a.order_id) t1 on t.order_no=t1.order_id set t.pick_num=t1.pickNum,t.pick_ratio=ROUND(t1.pickNum/t.sum_num,2)*100,t.pick_state=(case when t1.pickNum is null then 0 when t1.pickNum=t.sum_num then 2 else 1 end);
-update ecw_order t LEFT JOIN (select a.order_id,sum(a.pick_num) as pickNum from ecw_order_pickup a where a.deleted=0 GROUP BY a.order_id) t1 on t.order_no=t1.order_id set t.pick_num=t1.pickNum,t.pick_ratio=ROUND(t1.pickNum/t.sum_num,2)*100,t.pick_state=(case when t1.pickNum is null then 0 when t1.pickNum=t.sum_num then 3 else 2 end);
 -- 已提货和部分提货的订单批量刷新订单主状态
 update ecw_order t set t.`status`=16 where t.`status` in (20,21);
\ No newline at end of file

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxServiceImpl.java

@@ -1575,6 +1575,12 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
             warehouseIdList = warehouseList.stream().map(WarehouseDO::getId).collect(Collectors.toList());
             query.setWarehouseIdList(warehouseIdList);
         }
+        if (CollectionUtil.isNotEmpty(query.getCountryIdList())) {
+            List<WarehouseDO> warehouseList =
+                    warehouseService.findByCountryIdList(query.getCountryIdList());
+            warehouseIdList = warehouseList.stream().map(WarehouseDO::getId).collect(Collectors.toList());
+            query.setWarehouseIdList(warehouseIdList);
+        }
         //上面都是处理查询条件相关逻辑
         return boxInfoQuery1(boxMapper.selectPage2(page, query), false);
     }