入库出库作业单调整

mhd_wms/src/main/resources/mapper/reviewOrder/ReviewOrderMapper.xml

@@ -150,6 +150,9 @@
         <if test="customerName != null and customerName != ''">
             and a.customer_name like concat('%', #{customerName}, '%')
         </if>
+        <if test="shipperName != null and shipperName != ''">
+            and a.shipper_name like concat('%', #{shipperName}, '%')
+        </if>
         <if test="createTimeStart != null and createTimeStart != ''">
             and date_format(a.create_time, '%Y-%m-%d') &gt;= #{createTimeStart}
         </if>

mhd_wms/src/main/resources/mapper/stockInTaskOrder/StockInTaskOrderMapper.xml

@@ -93,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <include refid="selectStockInTaskOrderPo1"/>
         </where>
-        order by a.operators_end_time desc, a.create_time desc
+--         创建时间为空的排最后
+        order by a.create_time is null, a.create_time desc
     </select>
 </mapper>