From ab33b171f4f683ef7bd46b95c64650cda16de526 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sun, 13 Oct 2024 00:11:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BA=93=E4=BD=8DBUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml  | 3 +++
 1 file changed, 3 insertions(+)

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 @@
             <if test="po.goodsAreaId!=null and po.goodsAreaId!=''">
                 AND  goods_allocation.goods_area_id=#{po.goodsAreaId}
             </if>
+            <if test="po.goodsShelfId!=null and po.goodsShelfId!=''">
+                AND  goods_allocation.goods_shelf_id=#{po.goodsShelfId}
+            </if>
             <if test="po.warehouseList != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(po.warehouseList)">
                 and goods_allocation.warehouse_id in
                 <foreach collection="po.warehouseList" item="item" open="(" close=")" separator=",">

From c58eec2dbd4bffa4b4b50d86b9dcc3ce03845db4 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Sun, 13 Oct 2024 00:35:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E5=A2=9E=E5=8A=A0=20=E4=B8=8E?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/logpm/business/mapper/BusinessPreOrderMapper.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 @@
             </if>
 
             <if test="distributionBusinessPreCarNumerPageQueryVO.taskTimeEnd!=null ">
-                and task_time &lt; #{distributionBusinessPreCarNumerPageQueryVO.taskTimeEnd}
+                and task_time &lt;= #{distributionBusinessPreCarNumerPageQueryVO.taskTimeEnd}
             </if>
 
             <if test="distributionBusinessPreCarNumerPageQueryVO.distrCarNumber!=null ">