增加备货任务的取消字段

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

@@ -1055,7 +1055,7 @@
         logpm_distribution_stockup_info AS ldsi
         INNER JOIN logpm_distribution_stockup AS lds ON ldsi.stockup_id = lds.id
         WHERE
-        ldsi.reservation_id = #{reservationId}
+        ldsi.stock_status!=4 and ldsi.reservation_id = #{reservationId}
     </select>
     <select id="selectStockupList" resultType="com.logpm.distribution.entity.DistributionStockupEntity">
         SELECT
@@ -1098,6 +1098,7 @@
         logpm_distribution_stockup_info AS ldsi
         INNER JOIN logpm_distribution_stockup AS lds ON ldsi.stockup_id = lds.id
         WHERE
+        ldsi.stock_status!=4 and
         ldsi.reservation_id in
         <foreach item="item" collection="ids" separator="," open="(" close=")" index="">
             #{item.id}

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

@@ -702,7 +702,7 @@
                  LEFT JOIN logpm_distribution_stockup lds on ldsi.stockup_id = lds.id
                  LEFT JOIN logpm_distribution_reservation_zero_package ldrzp
                            on ldrzp.reservation_id = ldsi.reservation_id
-        where ldsi.reservation_id = #{reservationId}
+        where ldsi.stock_status!=4 and ldsi.reservation_id = #{reservationId}
         GROUP BY lds.stockup_area
     </select>
 
@@ -735,7 +735,7 @@
         from logpm_distribution_stockup_info ldsi
                  LEFT JOIN logpm_distribution_stockup lds on ldsi.stockup_id = lds.id
 
-        where ldsi.reservation_id = #{reservationId}
+        where ldsi.stock_status!=4 and ldsi.reservation_id = #{reservationId}
     </select>
     <select id="selectStockupStockListDetails" resultType="com.logpm.distribution.vo.DistributionStockupSelfVO">
         select lds.stockup_area goodsAreaName,
@@ -763,7 +763,7 @@
                )                scanNum
         from logpm_distribution_stockup_info ldsi
                  LEFT JOIN logpm_distribution_stockup lds on ldsi.stockup_id = lds.id
-        where ldsi.reservation_id = #{reservationId}
+        where  ldsi.stock_status!=4 and ldsi.reservation_id = #{reservationId}
     </select>