取消自提并取消备货任务、自提备货过滤查询已取消备货任务

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

@@ -366,8 +366,18 @@
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
         LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id
+        LEFT JOIN (
+        SELECT
+        IFNULL(COUNT( b.reservation_id ),0 )AS aaa,
+        b.stockup_id AS stockup_id
+        FROM
+        logpm_distribution_stockup AS a
+        LEFT JOIN logpm_distribution_stockup_info AS b ON a.id = b.stockup_id
+        WHERE b.stock_status != 4
+        GROUP BY b.stockup_id
+        ) AS aa ON aa.stockup_id = lds.id
         <where>
-            lds.is_deleted = 0
+            lds.is_deleted = 0 AND aa.aaa >0 AND ldsi.stock_status != 4
             <!-- lds.tenant_id = #{param.tenantId} -->
             <if test="param.typeService != null and param.typeService != '' ">and lds.type_service =
                 #{param.typeService}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

@@ -679,6 +679,19 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			case 0:
 				//进行自提单的取消
 				this.removeBatchByIds(ids);
+				//取消备货任务
+				List<DistributionStockupInfoEntity> entityList = distributionStockupInfoService.list(Wrappers.<DistributionStockupInfoEntity>query().lambda()
+					.in(DistributionStockupInfoEntity::getReservationId, ids)
+					.ne(DistributionStockupInfoEntity::getStockStatus, "4")
+					.eq(DistributionStockupInfoEntity::getStockUpType, "3")
+				);
+				if (Func.isNotEmpty(entityList)){
+					for (DistributionStockupInfoEntity distributionStockupInfoEntity : entityList) {
+						//取消备货任务
+						distributionStockupInfoEntity.setStockStatus("4");
+						distributionStockupInfoService.updateById(distributionStockupInfoEntity);
+					}
+				}
 				return R.status(true);
 			case 1:
 				return R.fail("未授权!!!");