Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml

@@ -79,10 +79,10 @@
         left join logpm_distribution_stockup_info ldsi on ldsi.reservation_id = ldr.id
         left join logpm_distribution_stockup lds on ldsi.stockup_id = lds.id
         <where>
-            <if test="param.stockupDateStart != null and param.stockupDateStart != '' "> and lds.stockup_date &lt;= #{param.stockupDateStart}</if>
-            <if test="param.stockupDateEnd != null and param.stockupDateEnd != '' "> and lds.stockup_date &gt;= #{param.stockupDateEnd}</if>
-            <if test="param.status != null and param.status == 0 "> and  lds.stockup_status in (1,2,3) </if>
-            <if test="param.status != null and param.status == 1 "> and  lds.stockup_status = 4 </if>
+            <if test="param.stockupDateStart != null and param.stockupDateStart != '' "> and lds.stockup_date &gt;= #{param.stockupDateStart}</if>
+            <if test="param.stockupDateEnd != null and param.stockupDateEnd != '' "> and lds.stockup_date &lt;= #{param.stockupDateEnd}</if>
+            <if test="param.status != null and param.status == 0 "> and  lds.stockup_status in (10,20,30) </if>
+            <if test="param.status != null and param.status == 1 "> and  lds.stockup_status = 40 </if>
             and lds.is_deleted = 0
             and lds.forklift_id = #{param.userId}
         </where>