商配订单预约池增加包件数量限制

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java

@@ -120,6 +120,13 @@ public interface IDistributionDeliveryListClient {
 	@GetMapping(TOP+"/maintenanceDeliveryInfo")
 	void maintenanceDeliveryInfo(@RequestParam("deliveryId")String deliveryId);
 
+	/**
+	 * 维护指定仓库配送车次任务信息
+	 * @param params
+	 * @return
+	 */
+	@GetMapping(TOP+"/maintenanceDeliveryInfoByWarehouseId")
+	void maintenanceDeliveryInfoByWarehouseId(@RequestParam("warehouseId")String params);
 
 
 //    /**

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java

@@ -17,6 +17,7 @@
 package com.logpm.distribution.feign;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
 import com.logpm.distribution.entity.DistributionDeliveryListEntity;
 import com.logpm.distribution.service.IDistributionDeliveryListService;
@@ -27,11 +28,13 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 配送管理 Feign实现类
@@ -98,5 +101,18 @@ public class DistributionDeliveryListClient implements IDistributionDeliveryList
 		distributionDeliveryListService.maintenanceDeliveryInfoAndDeliveryStatus(deliveryIds);
 	}
 
+	/**
+	 * @param params
+	 */
+	@Override
+	public void maintenanceDeliveryInfoByWarehouseId(String params) {
+		List<DistributionDeliveryListEntity> entityList = distributionDeliveryListService.list(Wrappers.<DistributionDeliveryListEntity>query().lambda().in(DistributionDeliveryListEntity::getWarehouseId, Func.toLongList(params)));
+		if (Func.isNotEmpty(entityList)){
+			String deliveryIds = entityList.stream().map(DistributionDeliveryListEntity::getId).map(String::valueOf).collect(Collectors.joining(","));
+			distributionDeliveryListService.maintenanceDeliveryInfoAndDeliveryStatus(deliveryIds);
+		}
+
+	}
+
 
 }

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

@@ -609,9 +609,19 @@
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.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 ldsaa.id,SUM(ldpll.quantity) AS num
+        FROM logpm_distribution_stock_article ldsaa
+            LEFT JOIN logpm_distribution_parcel_list ldpll ON ldsaa.id = ldpll.stock_article_id
+        WHERE ldpll.order_package_loading_status != '20'
+            AND ldpll.order_package_reservation_status !='20'
+            AND ldpll.order_package_status != '70'
+            GROUP BY ldsaa.id)
+        AS t ON t.id = ldsa.id
         <where>
             ldsa.order_status in ('10','20','30','70')
             and ldsa.reservation_status in ('10','20')
+            and t.num > 0
 <!--            AND (ldsa.incoming_num - ldsa.delivery_quantity) > 0 -->
             AND  ldsa.hand_quantity > 0
             <if test="par.warehouseId != null and par.warehouseId != '' ">

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java

@@ -140,6 +140,22 @@ public class DistributionDatarepair {
 
 
 
+	/**
+	 * 维护指定取消预约信息
+	 * @return
+	 */
+	@XxlJob("maintenanceDeliveryInfo")
+	public ReturnT<String> maintenanceDeliveryInfo(String params) {
+		//维护配送的状态
+		String method = "######################DistributionDatarepair.maintenanceDeliveryStatus";
+		log.info(method+"维护配送订单id:{}",params);
+		deliveryListClient.maintenanceDeliveryInfoByWarehouseId(params);
+		log.info(method+"维护配送订单结束");
+		return ReturnT.SUCCESS;
+	}
+
+
+