diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml
index 637f29826..a710bdf78 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml
@@ -121,6 +121,9 @@
AND goods_allocation.goods_area_id=#{po.goodsAreaId}
+
+ AND goods_allocation.goods_shelf_id=#{po.goodsShelfId}
+
and goods_allocation.warehouse_id in
diff --git a/blade-service/logpm-business/src/main/java/com/logpm/business/mapper/BusinessPreOrderMapper.xml b/blade-service/logpm-business/src/main/java/com/logpm/business/mapper/BusinessPreOrderMapper.xml
index a612d06cf..deac34f67 100644
--- a/blade-service/logpm-business/src/main/java/com/logpm/business/mapper/BusinessPreOrderMapper.xml
+++ b/blade-service/logpm-business/src/main/java/com/logpm/business/mapper/BusinessPreOrderMapper.xml
@@ -221,7 +221,7 @@
- and task_time < #{distributionBusinessPreCarNumerPageQueryVO.taskTimeEnd}
+ and task_time <= #{distributionBusinessPreCarNumerPageQueryVO.taskTimeEnd}