Merge branch 'dev' into pre-production

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=",">

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 ">