入库，收货，上架，出库。拣货作业单，拣货单管理，查询BUG修改

mhd_wms/src/main/resources/mapper/stockReceiptOrder/StockReceiptOrderMapper.xml

@@ -60,11 +60,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and a.top_organization_id = #{topOrganizationId}
         </if>
         <if test="inOrderNumber != null and inOrderNumber != '' ">
-            and a.in_order_number = #{inOrderNumber}
+            and a.in_order_number like concat('%', #{inOrderNumber}, '%')
         </if>
         <if test="receiptOrderNumber != null  and receiptOrderNumber != ''">
             and a.receipt_order_number like concat('%', #{receiptOrderNumber}, '%')
         </if>
+--         taskDistributionMerge
+        <if test="taskDistributionMerge != null ">
+            and a.task_distribution_merge = #{taskDistributionMerge}
+        </if>
         <if test="status != null ">
             and a.status = #{status}
         </if>
@@ -119,6 +123,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
+        <if test="createTimeStart != null and createTimeStart != ''">
+            and date_format(a.create_time,'%Y-%m-%d') &gt;= #{createTimeStart}
+        </if>
+        <if test="createTimeEnd != null and createTimeEnd != ''">
+            and date_format(a.create_time,'%Y-%m-%d') &lt;= #{createTimeEnd}
+        </if>
         <choose>
             <when test="delFlag != null"> and a.del_flag = #{delFlag} </when>
             <otherwise> and a.del_flag = 1 </otherwise>