预约库存品数量限制；预约装车、签收；配送任务装车、签收状态维护

blade-gateway/src/main/resources/bootstrap.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8888
+  port: 13000
 spring:
   cloud:
     gateway:

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionLoadingNumDTO.java

@@ -0,0 +1,13 @@
+package com.logpm.distribution.dto;
+
+
+import lombok.Data;
+
+@Data
+public class DistributionLoadingNumDTO {
+
+	private Integer packageLoadingQuantity;
+	private Integer inventoryLoadingQuantity;
+	private Integer packageSigningQuantity;
+	private Integer inventorySigningQuantity;
+}

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

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.distribution.dto.DistributionDeliveryListDTO;
+import com.logpm.distribution.dto.DistributionLoadingNumDTO;
 import com.logpm.distribution.dto.app.DistributionAppDeliveryListDTO;
 import com.logpm.distribution.entity.*;
 import com.logpm.distribution.excel.DistributionDeliveryListExcel;
@@ -428,4 +429,13 @@ public interface DistributionDeliveryListMapper extends BaseMapper<DistributionD
 	DistributionRetentionScanVo selectRetentionPackage(@Param("orderPackageCode")String orderPackageCode,@Param("deliveryId") Long deliveryId);
 
 	List<DistributionRetentionScanVo> selectRetentionZeroPackage(@Param("deliveryId")Long deliveryId, @Param("orderCode")String barcode);
+
+	/**
+	 * 查询配送任务装车数
+	 * @param id
+	 * @return
+	 */
+	DistributionLoadingNumDTO selectDeliveryLoadingNum(@Param("deliveryId") Long id);
+
+	DistributionLoadingNumDTO selectDeliverySigningNum(@Param("deliveryId") Long id);
 }

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

@@ -1683,5 +1683,29 @@
 			AND ldrs.stock_article_status in ('1','3')
 			AND ldrzp.zero_package_status IN ('1','3')
     </select>
+    <select id="selectDeliveryLoadingNum" resultType="com.logpm.distribution.dto.DistributionLoadingNumDTO">
+        SELECT
+        IF
+        ( inventoryLoadingNum IS NULL, 0, inventoryLoadingNum ) AS inventoryLoadingQuantity,
+        IF
+        ( packageLoadingNum IS NULL, 0, packageLoadingNum ) AS packageLoadingQuantity
+        FROM
+        (
+        ( SELECT sum( loaded_nub ) AS packageLoadingNum FROM logpm_distribution_loadscan WHERE delivery_id = #{deliveryId} and scan_status != 1 AND is_abnormal_loading = 1) AS a
+        INNER JOIN ( SELECT sum( loaded_nub ) AS inventoryLoadingNum FROM logpm_distribution_loadscaninvn WHERE delivery_id = #{deliveryId} and scan_status != 1) AS b
+        )
+    </select>
+    <select id="selectDeliverySigningNum" resultType="com.logpm.distribution.dto.DistributionLoadingNumDTO">
+        SELECT
+        IF
+        ( packageSigningNum IS NULL, 0, packageSigningNum ) AS packageSigningQuantity,
+        IF
+        ( inventorySigningNum IS NULL, 0, inventorySigningNum ) AS inventorySigningQuantity
+        FROM
+        (
+        ( SELECT sum( received_quantity ) AS packageSigningNum FROM logpm_distribution_loadscan WHERE delivery_id = #{deliveryId} and scan_status != 1 AND signfor_state =2 AND is_abnormal_signing = 1) AS a
+        INNER JOIN ( SELECT sum( received_quantity ) AS inventorySigningNum FROM logpm_distribution_loadscaninvn WHERE delivery_id = #{deliveryId} and scan_status != 1 AND signfor_state =2 ) AS b
+        )
+    </select>
 
 </mapper>

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

@@ -97,4 +97,8 @@ public interface DistributionLoadscanMapper extends BaseMapper<DistributionLoads
 	 * @return
 	 */
 	Integer statisticsAbnormalLoadingNum(@Param("deliveryListId")Long deliveryId);
+
+    Integer selectOrderLoadingNum(@Param("orderId") Long id);
+
+    Integer selectOrderSignNum(@Param("orderId") Long id);
 }

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

@@ -232,6 +232,12 @@
     <select id="statisticsAbnormalLoadingNum" resultType="java.lang.Integer">
                 SELECT COUNT(ldl.loaded_nub) FROM logpm_distribution_loadscan AS ldl Where ldl.delivery_id = #{deliveryListId} and ldl.is_abnormal_loading = 2
     </select>
+    <select id="selectOrderLoadingNum" resultType="java.lang.Integer">
+        SELECT sum(loaded_nub) FROM logpm_distribution_loadscan WHERE order_id = #{orderId} and is_deleted = 0 and scan_status != 1
+    </select>
+    <select id="selectOrderSignNum" resultType="java.lang.Integer">
+         SELECT SUM(received_quantity) FROM logpm_distribution_loadscan WHERE  scan_status != 1 AND signfor_state =2 And order_id =#{orderId}
+    </select>
 
 
 </mapper>

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

@@ -19,6 +19,7 @@ package com.logpm.distribution.mapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.dto.DistributionLoadingNumDTO;
 import com.logpm.distribution.dto.DistributionParcelNumberDTO;
 import com.logpm.distribution.dto.DistributionReservationDTO;
 import com.logpm.distribution.entity.*;
@@ -247,4 +248,13 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 
 	//查询零担品类包件信息
 	List<DistributionAddvaluePackageVO> selectAppZeroPackageListByReservationId(@Param("reservationId")Long reservationId);
+
+	/**
+	 * 查询客户包件、库存品装车数
+	 * @param id
+	 * @return
+	 */
+    DistributionLoadingNumDTO selectReservationLoadingNum(@Param("reservationId")Long id);
+
+	DistributionLoadingNumDTO selectReservationSigningNum(@Param("reservationId") Long id);
 }

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

@@ -1077,5 +1077,29 @@
             INNER JOIN logpm_distribution_parcel_list As ldpl ON ldrzp.parcel_list_id = ldpl.id
         WHERE ldrs.reservation_id =#{reservationId}
     </select>
+    <select id="selectReservationLoadingNum" resultType="com.logpm.distribution.dto.DistributionLoadingNumDTO">
+        SELECT
+        IF
+        ( inventoryLoadingNum IS NULL, 0, inventoryLoadingNum ) AS inventoryLoadingQuantity,
+        IF
+        ( packageLoadingNum IS NULL, 0, packageLoadingNum ) AS packageLoadingQuantity
+        FROM
+        (
+        ( SELECT sum( loaded_nub ) AS packageLoadingNum FROM logpm_distribution_loadscan WHERE reservation_id = #{reservationId} and scan_status != 1 AND is_abnormal_loading = 1) AS a
+        INNER JOIN ( SELECT sum( loaded_nub ) AS inventoryLoadingNum FROM logpm_distribution_loadscaninvn WHERE reservation_id = #{reservationId} and scan_status != 1) AS b
+        )
+    </select>
+    <select id="selectReservationSigningNum" resultType="com.logpm.distribution.dto.DistributionLoadingNumDTO">
+        SELECT
+        IF
+        ( packageSigningNum IS NULL, 0, packageSigningNum ) AS packageSigningQuantity,
+        IF
+        ( inventorySigningNum IS NULL, 0, inventorySigningNum ) AS inventorySigningQuantity
+        FROM
+        (
+        ( SELECT sum( received_quantity ) AS packageSigningNum FROM logpm_distribution_loadscan WHERE reservation_id = #{reservationId} and scan_status != 1 AND signfor_state =2 AND is_abnormal_signing = 1) AS a
+        INNER JOIN ( SELECT sum( received_quantity ) AS inventorySigningNum FROM logpm_distribution_loadscaninvn WHERE reservation_id = #{reservationId} and scan_status != 1 AND signfor_state =2 ) AS b
+        )
+    </select>
 
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAsyncService.java

@@ -147,7 +147,7 @@ public interface IDistributionAsyncService {
 	 * @param barcode
 	 * @param deliveryId
 	 */
-	void changeMarketDeliveryListStatus(String barcode, Long deliveryId);
+	void changeMarketDeliveryListStatus(String barcode, Long deliveryId,Long reservationId);
 
 	/**
 	 * 自提签收判断是否完成
@@ -226,5 +226,13 @@ public interface IDistributionAsyncService {
 	 * 维护零担订单装车状态
 	 * @param parcelNumberEntity
 	 */
-    void checkZeroStockArticleLoadingStatus(DistributionParcelNumberEntity parcelNumberEntity);
+    void checkZeroStockArticleLoadingStatus(DistributionParcelNumberEntity parcelNumberEntity,Long deliveryId,Long reservationId);
+
+	/**
+	 * 签收状态维护
+	 * @param packageId
+	 * @param reservationId
+	 * @param deliveryId
+	 */
+	void checkSignStatus(Long packageId, Long reservationId, Long deliveryId);
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
+import com.logpm.distribution.dto.DistributionLoadingNumDTO;
 import com.logpm.distribution.dto.DistributionStockArticleDTO;
 import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO;
 import com.logpm.distribution.dto.app.StockupDTO;
@@ -358,31 +359,8 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 	@Async
 	@Override
 	@Transactional(isolation = Isolation.READ_UNCOMMITTED, rollbackFor = Exception.class)
-	public void changeMarketDeliveryListStatus(String barcode, Long deliveryId) {
-		//修改包件状态
-		//这里需要查询出该包件
-		DistributionParcelListEntity parcelListEntity = distributionDeliveryListMapper.getLoadingPackageDetails(barcode, deliveryId);
-		if (Func.isNotEmpty(parcelListEntity)) {
-			parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
-			parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yichuku.getValue());
-			//修改包件状态
-			distributionParcelListService.updateById(parcelListEntity);
-			List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListService.getBaseMapper().selectList(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId, parcelListEntity.getStockArticleId()));
-			boolean flag = parcelListEntityList.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue()));
-			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(parcelListEntity.getStockArticleId());
-			//维护包件、订单扫描装车状态
-			if (flag) {
-				stockArticleEntity.setOrderStatus(OrderStatusConstant.chuku.getValue());
-			} else {
-				flag = parcelListEntityList.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue()));
-				if (flag) {
-					stockArticleEntity.setOrderStatus(OrderStatusConstant.ruku.getValue());
-				} else {
-					stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenchuku.getValue());
-				}
-			}
-			distributionStockArticleService.updateById(stockArticleEntity);
-		} else {
+	public void changeMarketDeliveryListStatus(String barcode, Long deliveryId,Long reservationId) {
+
 		//查询库存品
 		DisStockListDetailEntity loadingInventoryDetail = distributionDeliveryListMapper.getLoadingInventoryDetail(barcode, deliveryId);
 		loadingInventoryDetail.setStockLockingStatus(InventoryLoadingStatusConstant.yizhuangche.getValue());
@@ -421,49 +399,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 			log.error("####库存品记录错误+{" + reservationStockarticleEntityList + "}");
 			return;
 		}
-		}
-
-		//查询出这个预约下的包件信息和库存品信息分别进行判断是否都完成装车
-		List<DistributionReservationEntity> reservationEntityList = distributionDeliveryListMapper.selectReservationByDeliveryListId(deliveryId);
-		reservationEntityList.forEach(r -> {
-			//查询预约下的所有包件信息
-			List<DistributionParcelListEntity> parcelListEntities = distributionReservationMapper.selectPackageListByReservationId(r.getId());
-			boolean reservationLoadingFlag = parcelListEntities.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(InventoryLoadingStatusConstant.yizhuangche.getValue()));
-			List<DistributionReservationStocklistEntity> distributionReservationStocklistEntities = distributionReservationStocklistMapper.selectList(Wrappers.<DistributionReservationStocklistEntity>query().lambda()
-				.eq(DistributionReservationStocklistEntity::getReservationId, r.getId())
-				.ne(DistributionReservationStocklistEntity::getStockListStatus, ReservationInventoryStatusConstant.quxiao.getValue()));
-			boolean inventoryLoadingFlag = distributionReservationStocklistEntities.stream().allMatch(i -> i.getLoadingStatus().equals(ReservationInventoryLoadingStatusConstant.yizhuangche.getValue()));
-			if (reservationLoadingFlag && inventoryLoadingFlag) {
-				r.setLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getValue());
-			} else {
-				reservationLoadingFlag = parcelListEntities.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue()));
-				inventoryLoadingFlag = distributionReservationStocklistEntities.stream().allMatch(i -> i.getLoadingStatus().equals(ReservationInventoryLoadingStatusConstant.weizhuangche.getValue()));
-				if (reservationLoadingFlag && inventoryLoadingFlag) {
-					r.setLoadingStatus(ReservationLoadingStatusConstant.daizhuangche.getValue());
-				} else {
-					r.setLoadingStatus(ReservationLoadingStatusConstant.bufenzhuangche.getValue());
-				}
-			}
-			distributionReservationMapper.updateById(r);
-		});
-
-		List<DistributionParcelListEntity> deliveryParcelListEntityList = distributionDeliveryListMapper.selectPackageListByDeliveryListId(deliveryId);
-		List<DisStockListDetailEntity> detailEntities = distributionDeliveryListMapper.selectInventoryListByDeliveryListId(deliveryId);
-		boolean deliveryLoadingFlag = deliveryParcelListEntityList.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue()));
-		boolean deliveryInventoryLoadingFlag = detailEntities.stream().allMatch(i -> i.getStockLockingStatus().equals(ReservationInventoryLoadingStatusConstant.yizhuangche.getValue()));
-		DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListMapper.selectOne(Wrappers.<DistributionDeliveryListEntity>query().lambda().eq(DistributionDeliveryListEntity::getId, deliveryId));
-		if (deliveryLoadingFlag && deliveryInventoryLoadingFlag) {
-			deliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.yizhuangche.getValue());
-		} else {
-			deliveryLoadingFlag = deliveryParcelListEntityList.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue()));
-			deliveryInventoryLoadingFlag = detailEntities.stream().allMatch(i -> i.getStockLockingStatus().equals(ReservationInventoryLoadingStatusConstant.weizhuangche.getValue()));
-			if (deliveryLoadingFlag && deliveryInventoryLoadingFlag) {
-				deliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.weizhuangche.getValue());
-			} else {
-				deliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.bunfenzhuangche.getValue());
-			}
-		}
-		distributionDeliveryListMapper.updateById(deliveryListEntity);
+		checkReservationAndDeliveryLoadingStatus(deliveryId,reservationId);
 	}
 
 	@Async
@@ -730,14 +666,71 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 			throw new RuntimeException("包件信息异常");
 		}
 		//维护包件所属订单是否均已完成装车，如果均已完成装车则订单进行装车状态的修改
-		switch (parcelListEntity.getConditions()){
-			case 1:
-				break;
+		if (parcelListEntity.getConditions() != 2){
+			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(parcelListEntity.getStockArticleId());
+			//查询出该订单的装车件数
+			Integer orderLoadingNum = distributionLoadscanMapper.selectOrderLoadingNum(stockArticleEntity.getId());
+			if (Func.isNotEmpty(orderLoadingNum) && orderLoadingNum > 0){
+				//存在装车数量，需要对装车数量进行判定
+				if (orderLoadingNum == stockArticleEntity.getTotalNumber()){
+					stockArticleEntity.setOrderStatus(OrderStatusConstant.chuku.getValue());
+				}else {
+					stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenchuku.getValue());
+				}
+				distributionStockArticleService.updateById(stockArticleEntity);
+			}
+		}
 
-			case 3:
-				break;
+		checkReservationAndDeliveryLoadingStatus(deliveryId, reservationId);
 	}
-		DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(parcelListEntity.getStockArticleId());
+
+	@Transactional(rollbackFor = Exception.class)
+	private void checkReservationAndDeliveryLoadingStatus(Long deliveryId, Long reservationId) {
+		//判断客户是否完成装车
+		DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(reservationId);
+		int reservationPackageTotal = distributionReservationEntity.getReservationNum() + distributionReservationEntity.getReservationStockListNum();
+		if (reservationPackageTotal!=0){
+			DistributionLoadingNumDTO reservationLoadingNum =  distributionReservationMapper.selectReservationLoadingNum(distributionReservationEntity.getId());
+			if (Func.isNotEmpty(reservationLoadingNum)){
+				int reservationLoadingQuantity = reservationLoadingNum.getPackageLoadingQuantity()+reservationLoadingNum.getInventoryLoadingQuantity();
+				if (reservationLoadingQuantity == reservationPackageTotal){
+					distributionReservationEntity.setLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getValue());
+				}else {
+					distributionReservationEntity.setLoadingStatus(ReservationLoadingStatusConstant.bufenzhuangche.getValue());
+				}
+				distributionReservationMapper.updateById(distributionReservationEntity);
+			}
+		}else {
+			log.error("##########查询客户配送数量为0");
+		}
+		DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(deliveryId);
+		int deliveryPackageTotal = distributionDeliveryListEntity.getDeliveryNumber();
+		if (deliveryPackageTotal!=0){
+			DistributionLoadingNumDTO deliveryLoadingNum = distributionDeliveryListMapper.selectDeliveryLoadingNum(distributionDeliveryListEntity.getId());
+			if (Func.isNotEmpty(deliveryLoadingNum)){
+				int deliveryLoadingQuantity = deliveryLoadingNum.getPackageLoadingQuantity()+deliveryLoadingNum.getInventoryLoadingQuantity();
+				if (deliveryPackageTotal == deliveryLoadingQuantity){
+					distributionReservationEntity.setLoadingStatus(DeliveryLoadingStatusConstant.yizhuangche.getValue());
+				}else {
+					distributionReservationEntity.setLoadingStatus(DeliveryLoadingStatusConstant.bunfenzhuangche.getValue());
+				}
+				distributionDeliveryListMapper.updateById(distributionDeliveryListEntity);
+			}
+		}else {
+			log.error("##########查询客户配送数量为0");
+		}
+	}
+
+
+//		switch (parcelListEntity.getConditions()){
+//			case 1:
+//
+//				break;
+//			case 3:
+//
+//				break;
+//		}
+//		DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(parcelListEntity.getStockArticleId());
 
 
 //		//首先能够进入这个检测方法那么此包件就是进行装车了，这里对包件装车状态再次进行维护
@@ -806,7 +799,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 
 
 
-	}
+//	}
 
 
 	@Override
@@ -1056,12 +1049,11 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 			}
 		}
 		distributionStockArticleService.updateById(stockArticleEntity);
-
 	}
 
 	@Override
 	@Transactional
-	public void checkZeroStockArticleLoadingStatus(DistributionParcelNumberEntity parcelNumberEntity) {
+	public void checkZeroStockArticleLoadingStatus(DistributionParcelNumberEntity parcelNumberEntity,Long deliveryId,Long reservationId) {
 		if (Func.isEmpty(parcelNumberEntity)){
 			log.error("#################parcelNumberEntity参数错误:{}",parcelNumberEntity);
 			return;
@@ -1102,6 +1094,80 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 			stockArticleEntity.setDeliveryQuantity(stockArticleEntity.getDeliveryQuantity() + outboundQuantity);
 		}
 		distributionStockArticleService.updateById(stockArticleEntity);
+		//维护预约客户和配送任务装车状态
+		checkReservationAndDeliveryLoadingStatus(deliveryId,reservationId);
+	}
+
+	@Override
+	public void checkSignStatus(Long packageId, Long reservationId, Long deliveryId) {
+		if (Func.isNotEmpty(packageId)){
+			DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(packageId);
+			//维护包件所属订单签收状态
+			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(parcelListEntity.getStockArticleId());
+			//维护该订单的签收状态
+			if (Func.isNotEmpty(stockArticleEntity)){
+				Integer totalNumber = stockArticleEntity.getTotalNumber();
+				Integer orderSignNum = distributionLoadscanMapper.selectOrderSignNum(stockArticleEntity.getId());
+				Integer orderLoadingNum = distributionLoadscanMapper.selectOrderLoadingNum(stockArticleEntity.getId());
+
+				if (Func.isNotEmpty(orderSignNum) && orderSignNum>0){
+					if (totalNumber ==orderSignNum){
+						stockArticleEntity.setOrderStatus(OrderStatusConstant.qianshou.getValue());
+					}else {
+						stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue());
+					}
+				}
+				distributionStockArticleService.updateById(stockArticleEntity);
+			}
+		}
+
+
+		checkReservationAndDeliveryLoadingStatus(deliveryId,reservationId);
+		checkReservationAndDeliverySigningStatus(reservationId, deliveryId);
+
+		//注意：这里对于异常装车的包件也需要进行统计
+
+	}
+
+	@Transactional
+	private void checkReservationAndDeliverySigningStatus(Long reservationId, Long deliveryId) {
+		//维护客户签收状态
+		DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(reservationId);
+		if (Func.isNotEmpty(distributionReservationEntity)){
+			int reservationTotal = distributionReservationEntity.getReservationNum() + distributionReservationEntity.getReservationStockListNum();
+			//查询该客户的签收数量
+			DistributionLoadingNumDTO reservationSigningNum= distributionReservationMapper.selectReservationSigningNum(distributionReservationEntity.getId());
+			if (Func.isNotEmpty(reservationSigningNum)){
+				int reservationSigningQuantity = reservationSigningNum.getPackageSigningQuantity() + reservationSigningNum.getInventorySigningQuantity();
+				if (reservationSigningQuantity>0){
+					if (reservationTotal ==reservationSigningQuantity){
+						distributionReservationEntity.setSigningStatus(ReservationSigningStatusConstant.yiqianshou.getValue());
+					}else {
+						distributionReservationEntity.setSigningStatus(ReservationSigningStatusConstant.bufenqianshou.getValue());
+					}
+					distributionReservationMapper.updateById(distributionReservationEntity);
+				}
+			}
+		}
+
+
+		//维护配送任务签收状态
+		DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(deliveryId);
+		if (Func.isNotEmpty(distributionDeliveryListEntity)){
+			Integer deliverySigningTotal = distributionDeliveryListEntity.getDeliveryNumber();
+			DistributionLoadingNumDTO deliverySigningNum= distributionDeliveryListMapper.selectDeliverySigningNum(distributionReservationEntity.getId());
+			if (Func.isNotEmpty(deliverySigningNum)){
+				int deliverySigningQuantity = deliverySigningNum.getPackageSigningQuantity() + deliverySigningNum.getInventorySigningQuantity();
+				if (deliverySigningQuantity>0){
+					if (deliverySigningTotal ==deliverySigningQuantity){
+						distributionDeliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.yiwancheng.getValue());
+					}else {
+						distributionDeliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.peisongzhong.getValue());
+					}
+					distributionReservationMapper.updateById(distributionReservationEntity);
+				}
+			}
+		}
 	}
 
 

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

@@ -573,7 +573,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				//异步维护状态
 //				str.append("包件装车");
 //				loadingNum.getAndAdd(loadscanEntity.getPackageNub());
-//				distributionAsyncService.checkLoadingByPackage(parcelListEntity, distrilbutionloadingscanDTO.getDeliveryId());
+				distributionAsyncService.checkLoadingByPackage(parcelListEntity,loadscanEntity.getDeliveryId(),loadscanEntity.getReservationId());
 			} else if (parcelListEntityList.size() == 0) {
 				//查找出该包件信息
 				DistributionParcelListEntity parcelListEntity = distributionParcelListService.getOne(Wrappers.<DistributionParcelListEntity>query().lambda()
@@ -612,7 +612,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 						log.error("配送计划预约类型错误:{}", reservationEntityList);
 					}
 				}
-				//不存在配送计划中，这里进行客户的判断
 			}
 		} else if (distrilbutionloadingscanDTO.getType() == 2) {
 			log.info("#########!!!!!!!!!!!!!!!!!---------    000000000  type={}",distrilbutionloadingscanDTO.getType());
@@ -2133,7 +2132,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					//更新签收表的装车数量
 					Integer j = distributionSignforMapper.updateloadByinvn(distributionLoadscaninvnEntity.getDeliveryId(), distributionLoadscaninvnEntity.getReservationId(), distributionLoadscaninvnEntity.getLoadedNub());
 					//异步处理状态信息
-					distributionAsyncService.changeMarketDeliveryListStatus(distributionLoadscaninvnEntity.getOrderPackageCode(), distributionLoadscaninvnEntity.getDeliveryId());
+					distributionAsyncService.changeMarketDeliveryListStatus(distributionLoadscaninvnEntity.getOrderPackageCode(), distributionLoadscaninvnEntity.getDeliveryId(),distributionLoadscaninvnEntity.getReservationId());
 					//处理出库问题
 					DistributionStockListEntity distributionStockListEntity = distributionStockListMapper.selectOne(Wrappers.<DistributionStockListEntity>query().lambda().eq(DistributionStockListEntity::getId, distributionLoadscaninvnEntity.getInventoryId()));
 					BigDecimal quantityStock = new BigDecimal(distributionStockListEntity.getQuantityStock());
@@ -2877,6 +2876,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			HashSet<String> warehouseName = new HashSet<>();
 			//经销商名称
 			HashSet<String> mallName = new HashSet<>();
+
+			ArrayList<Long> mallId = new ArrayList<>();
 			//门店名称
 			HashSet<String> storeName = new HashSet<>();
 			//包件总数量
@@ -2918,6 +2919,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					if (Func.isNotEmpty(s.getMallName())) {
 						mallName.add(s.getMallName());
 					}
+					if (Func.isNotEmpty(s.getMallId())) {
+						mallId.add(s.getMallId());
+					}
 					if (Func.isNotEmpty(s.getStoreName())) {
 						storeName.add(s.getStoreName());
 					}
@@ -3083,6 +3087,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				reservationEntity.setServiceNumber(String.join(",", serviceNumber));
 				reservationEntity.setWarehouseName(String.join(",", warehouseName));
 				reservationEntity.setMallName(String.join(",", mallName));
+				if (Func.isNotEmpty(mallId)){
+					reservationEntity.setMallId(mallId.get(0));
+				}
 				reservationEntity.setStoreName(String.join(",", storeName));
 				//预约添加订单数量
 				reservationEntity.setReservationNum(packageTotal.get());
@@ -5181,7 +5188,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 									loadscanEntity.setPackageNub(parcelListDTO.getLoadingNum());
 									distributionLoadscanService.updateById(loadscanEntity);
 									//维护零担订单装车状态
-									distributionAsyncService.checkZeroStockArticleLoadingStatus(parcelNumberEntity);
+									distributionAsyncService.checkZeroStockArticleLoadingStatus(parcelNumberEntity,loadscanEntity.getDeliveryId(),loadscanEntity.getReservationId());
 								}
 							} else {
 								if (parcelListDTO.getLoadingNum() <= reservationZeroPackageEntity.getQuantity()) {
@@ -5230,8 +5237,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 									parcelNumberEntity.setDeliveryQuantity(parcelNumberEntity.getDeliveryQuantity() - parcelListDTO.getLoadingNum());
 									parcelNumberEntity.setHandQuantity(parcelNumberEntity.getHandQuantity() - parcelListDTO.getLoadingNum());
 									distributionParcelNumberService.updateById(parcelNumberEntity);
+
 //								loadingNum.getAndAdd(loadscanEntity.getLoadedNub());
-									distributionAsyncService.checkZeroStockArticleLoadingStatus(parcelNumberEntity);
+									distributionAsyncService.checkZeroStockArticleLoadingStatus(parcelNumberEntity,loadscanEntity.getDeliveryId(),loadscanEntity.getReservationId());
+//									distributionAsyncService.checkLoadingByPackage(parcelListEntity,loadscanEntity.getDeliveryId(),loadscanEntity.getReservationId());
 								}
 							}
 						} else {
@@ -5282,7 +5291,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 								parcelNumberEntity.setDeliveryQuantity(parcelNumberEntity.getDeliveryQuantity() - parcelListDTO.getLoadingNum());
 								parcelNumberEntity.setHandQuantity(parcelNumberEntity.getHandQuantity() - parcelListDTO.getLoadingNum());
 								distributionParcelNumberService.updateById(parcelNumberEntity);
-								distributionAsyncService.checkZeroStockArticleLoadingStatus(parcelNumberEntity);
+								distributionAsyncService.checkZeroStockArticleLoadingStatus(parcelNumberEntity,loadscanEntity.getDeliveryId(),loadscanEntity.getReservationId());
 							}
 
 //							loadingNum.getAndAdd(loadscanEntity.getLoadedNub());

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

@@ -1254,6 +1254,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		AtomicInteger reduceTotal = new AtomicInteger();
 		HashSet<String> warehouseNames = new HashSet<>();
 		HashSet<String> mallName = new HashSet<>();
+		List<Long> mallId = new ArrayList<>();
 		HashSet<String> storeName = new HashSet<>();
 		HashSet<String> receivingUnit = new HashSet<>();
 		newStockArticle.forEach((k, v) -> {
@@ -1302,7 +1303,6 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 									dp.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
 									distributionParcelListService.updateById(dp);
 									distributionAsyncService.checkStockArticleReservationStatus(dp);
-
 								}
 							}
 //							stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
@@ -1312,7 +1312,6 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 						DistributionStockArticleEntity stockArticleEntity = Func.copy(distributionStockArticleDTO, DistributionStockArticleEntity.class);
 						distributionStockArticleService.updateById(stockArticleEntity);
 					}
-
 				} else {
 					//新增了零担订单
 					List<DistributionParcelNumberVO> parcelNumberVOS = distributionStockArticleDTO.getParcelNumberVOS();
@@ -1386,6 +1385,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				distributionStockArticleService.updateById(stockArticleEntity);
 				warehouseNames.add(stockArticleEntity.getWarehouse());
 				mallName.add(stockArticleEntity.getMallName());
+				mallId.add(stockArticleEntity.getMallId());
 				storeName.add(stockArticleEntity.getStoreName());
 				receivingUnit.add(distributionStockArticleDTO.getConsigneeUnit());
 			} else {
@@ -1519,6 +1519,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				}
 				warehouseNames.add(distributionStockArticleDTO.getWarehouse());
 				mallName.add(distributionStockArticleDTO.getMallName());
+				mallId.add(distributionStockArticleDTO.getMallId());
 				storeName.add(distributionStockArticleDTO.getStoreName());
 				receivingUnit.add(distributionStockArticleDTO.getConsigneeUnit());
 
@@ -1718,6 +1719,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		reservationEntity.setServeType(distributionReservationDTO.getServeType());
 		reservationEntity.setReservationNum(packTotal.get());
 		reservationEntity.setMallName(String.join(",", mallName));
+		if (Func.isNotEmpty(mallId)){
+			reservationEntity.setMallId(mallId.get(0));
+		}
 		reservationEntity.setStoreName(String.join(",", storeName));
 		reservationEntity.setReceivingUnit(String.join(",", receivingUnit));
 		reservationEntity.setReservationStockListNum(inventorTotal.get());
@@ -1822,6 +1826,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			HashSet<String> warehouseName = new HashSet<>();
 			//经销商名称
 			HashSet<String> mallName = new HashSet<>();
+
+			List<Long> mallId = new ArrayList<>();
 			//门店名称
 			HashSet<String> storeName = new HashSet<>();
 
@@ -1862,6 +1868,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				if (Func.isNotEmpty(s.getMallName())) {
 					mallName.add(s.getMallName());
 				}
+				if (Func.isNotEmpty(s.getMallId())) {
+					mallId.add(s.getMallId());
+				}
 				if (Func.isNotEmpty(s.getStoreName())) {
 					storeName.add(s.getStoreName());
 				}
@@ -2059,6 +2068,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			reservationEntity.setWaybillId(String.join(",", waybillId));
 			reservationEntity.setMailPhone(String.join(",", marketPhone));
 			reservationEntity.setMallName(String.join(",", mallName));
+			if (Func.isNotEmpty(mallId)){
+				reservationEntity.setMallId(mallId.get(0));
+			}
 			reservationEntity.setStoreName(String.join(",", storeName));
 			reservationEntity.setLoadingStatus(ReservationLoadingStatusConstant.daizhuangche.getValue());
 			reservationEntity.setSigningStatus(ReservationSigningStatusConstant.daiqianshou.getValue());
@@ -2757,6 +2769,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 
 		HashSet<String> mallName = new HashSet<>();
 
+		List<Long> mallId = new ArrayList<>();
+
 		HashSet<String> receivingUnit = new HashSet<>();
 
 		HashSet<String> waybillNo = new HashSet<>();
@@ -2806,6 +2820,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 					if (Func.isNotBlank(s.getMallName())) {
 						mallName.add(s.getMallName());
 					}
+					if (Func.isNotEmpty(s.getMallId())) {
+						mallId.add(s.getMallId());
+					}
 					if (Func.isNotBlank(s.getStoreName())) {
 						storeName.add(s.getStoreName());
 					}
@@ -2919,6 +2936,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 					if (Func.isNotBlank(s.getMallName())) {
 						mallName.add(s.getMallName());
 					}
+					if (Func.isNotEmpty(s.getMallId())) {
+						mallId.add(s.getMallId());
+					}
 					if (Func.isNotBlank(s.getStoreName())) {
 						storeName.add(s.getStoreName());
 					}
@@ -3005,6 +3025,11 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				//对库存品的数量进行维护，将预约单的库存品数量进行冻结
 //				int count = i.getOutboundQuantity() + i.getReservationNum();
 //				i.setQuantityOccupied(count);
+				DistributionStockListEntity stockListEntity = distributionStockListService.getById(i.getId());
+				int keyongshuliang = stockListEntity.getQuantityStock() - stockListEntity.getQuantityOccupied();
+				if (i.getReservationNum() > keyongshuliang){
+					throw new RuntimeException("库存品库内数量不足!!!");
+				}
 				if (Func.isNotBlank(i.getServiceNumber())) {
 					serviceNumber.add(i.getServiceNumber());
 				}
@@ -3017,6 +3042,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				if (Func.isNotBlank(i.getMarketName())) {
 					mallName.add(i.getMarketName());
 				}
+				if (Func.isNotEmpty(i.getMaterialId())) {
+					mallId.add(i.getMaterialId());
+				}
 				if (Func.isNotBlank(i.getOrderCode())) {
 					orderNumber.add(i.getOrderCode());
 				}
@@ -3075,6 +3103,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		}
 		reservationEntity.setWaybillNo(String.join(",", waybillNo));
 		reservationEntity.setWaybillId(String.join(",", waybillId));
+		if (Func.isNotEmpty(mallId)){
+			reservationEntity.setMallId(mallId.get(0));
+		}
+
 		reservationEntity.setMailPhone(String.join(",", marketPhone));
 		reservationEntity.setReceivingUnit(String.join(",", receivingUnit));
 		//统计数量

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

@@ -365,6 +365,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				//更新装车包件数和签收包件数
 				Integer j = distributionSignforMapper.updateSignforByReservationId(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
 				warehouseUpdownTypeClient.downPackageOrDelTray(collect.get(0).getOrderPackageCode(), myCurrentWarehouse.getId());
+				distributionAsyncService.checkSignStatus(distributionLoadscanEntity.getPackageId(),distributionLoadscanEntity.getReservationId(),distributionLoadscanEntity.getDeliveryId());
 			}
 			//TODO 这里就需要一个异步的包件状态维护方法
 		} else if (Func.isEmpty(collect)) {
@@ -389,7 +390,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		}
 		String str = checkSignNum(distrilbutionloadingscanDTO);
 		//查询出客户下的所有包件信息
-		distributionAsyncService.checkDeliverySignStatus(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
+//		distributionAsyncService.checkDeliverySignStatus(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
 		return Resp.scanSuccess("签收成功", str);
 	}
 
@@ -989,6 +990,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					stockListEntity.setQuantityStock(stockListEntity.getQuantityStock() - distributionLoadscaninvnEntity.getPackageNub());
 					stockListEntity.setOutboundQuantity(stockListEntity.getOutboundQuantity() + distributionLoadscaninvnEntity.getPackageNub());
 					distributionStockListService.updateById(stockListEntity);
+					distributionAsyncService.checkSignStatus(null, distributionLoadscaninvnEntity.getReservationId(),distributionLoadscaninvnEntity.getDeliveryId());
+
 				}
 			} else if (inventory.size() == 0) {
 				//这里就需要查询整个配送计划是否存在该码值的库存品包件
@@ -1011,7 +1014,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			log.error("########该客户下的库存品是否已备货:{}", isHaveCode);
 			return Resp.scanFail("操作失败", "操作失败");
 		}
-		distributionAsyncService.checkDeliverySignStatus(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
 		return Resp.scanSuccess("签收成功", "签收成功");
 
 
@@ -1457,6 +1459,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 							distributionLoadscaninvnService.updateById(loadscaninvnEntity);
 							Integer i = distributionDeliveryListMapper.updateloadingTimeById(distributionDeliveryListEntity.getId());
 							Integer j = distributionSignforMapper.updatesignforByinvn(loadscaninvnEntity.getDeliveryId(), loadscaninvnEntity.getReservationId(), loadscaninvnEntity.getPackageNub());
+							distributionAsyncService.checkSignStatus(null,loadscaninvnEntity.getReservationId(),loadscaninvnEntity.getDeliveryId());
 						}
 					}else {
 						//不存在装车数据  这里需要进行装车数据的补录
@@ -1516,6 +1519,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						stockListEntity.setQuantityStock(stockListEntity.getQuantityStock() - newLoadscaninvnEntity.getPackageNub());
 						stockListEntity.setOutboundQuantity(stockListEntity.getOutboundQuantity() + newLoadscaninvnEntity.getPackageNub());
 						distributionStockListService.updateById(stockListEntity);
+						distributionAsyncService.checkSignStatus(null,newLoadscaninvnEntity.getReservationId(),newLoadscaninvnEntity.getDeliveryId());
+
 					}
 
 				}
@@ -1694,6 +1699,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						distributionLoadscanEntity.setMsg("司机一键签收数据补录");
 					}
 					distributionLoadscanService.updateById(distributionLoadscanEntity);
+					distributionAsyncService.checkSignStatus(distributionLoadscanEntity.getPackageId(),distributionLoadscanEntity.getReservationId(),distributionLoadscanEntity.getDeliveryId());
 
 					//维护签收数量
 					DistributionSignforEntity signforEntity = distributionSignforMapper.selectOne(Wrappers.<DistributionSignforEntity>query().lambda().eq(DistributionSignforEntity::getDeliveryId, distributionLoadscanEntity.getDeliveryId()).eq(DistributionSignforEntity::getReservationId, distributionLoadscanEntity.getReservationId()));
@@ -1747,6 +1753,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						loadscanEntity.setMsg("司机一键签收数据补录");
 					}
 					distributionLoadscanService.save(loadscanEntity);
+					distributionAsyncService.checkSignStatus(loadscanEntity.getPackageId(),loadscanEntity.getReservationId(),loadscanEntity.getDeliveryId());
+
 					Integer i = distributionDeliveryListMapper.updateloadingTimeById(distributionDeliveryListEntity.getId());
 					//更新签收表的签收数量和装车数量
 					Integer j = distributionSignforMapper.updateSignforByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
@@ -1825,7 +1833,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					Integer i = distributionDeliveryListMapper.updateloadingTimeById(distributionDeliveryListEntity.getId());
 					//更新签收表的签收数量和装车数量
 					Integer j = distributionSignforMapper.updateSignforByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
-					distributionAsyncService.checkStockArticleSignStatus(parcelListEntity);
+					distributionAsyncService.checkSignStatus(loadscanEntity.getPackageId(),loadscanEntity.getReservationId(),loadscanEntity.getDeliveryId());
+
 					warehouseUpdownTypeClient.downPackageOrDelTray(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId());
 				} else {
 					//存在装车数据
@@ -1847,6 +1856,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						Integer i = distributionDeliveryListMapper.updateloadingTimeById(distributionDeliveryListEntity.getId());
 						//更新签收数量
 						Integer j = distributionSignforMapper.updateSignforNum(loadscanEntities.getDeliveryId(), loadscanEntities.getReservationId(), loadscanEntities.getPackageNub());
+						distributionAsyncService.checkSignStatus(loadscanEntities.getPackageId(),loadscanEntities.getReservationId(),loadscanEntities.getDeliveryId());
 					}
 				}
 				distributionParcelListService.updateById(parcelListEntity);
@@ -2713,6 +2723,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 								parcelNumberEntity.setSigninQuantity(signinQuantity.add(signingNum).intValue());
 								distributionLoadscanService.updateById(loadscanEntityList);
 								distributionParcelNumberService.updateById(parcelNumberEntity);
+								distributionAsyncService.checkSignStatus(loadscanEntityList.getPackageId(),loadscanEntityList.getReservationId(),loadscanEntityList.getDeliveryId());
 							}
 						}
 					}
@@ -2746,6 +2757,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 								signforEntity.setReceivedQuantity(signingNumber.subtract(receivedQuantity).add(signingNum).intValue());
 								distributionSignforMapper.updateById(signforEntity);
 								distributionLoadscanService.updateById(loadscanEntityList);
+								distributionAsyncService.checkSignStatus(loadscanEntityList.getPackageId(),loadscanEntityList.getReservationId(),loadscanEntityList.getDeliveryId());
+
 								distributionParcelNumberService.updateById(parcelNumberEntity);
 							}
 						}
@@ -2798,6 +2811,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						loadscanEntity.setSigningUser(AuthUtil.getUser().getNickName());
 						loadscanEntity.setSigningUserId(AuthUtil.getUser().getUserId());
 						distributionLoadscanService.save(loadscanEntity);
+						distributionAsyncService.checkSignStatus(loadscanEntity.getPackageId(),loadscanEntity.getReservationId(),loadscanEntity.getDeliveryId());
 						//进行签收数量的修改
 						Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
 						//更新装车包件数和签收包件数
@@ -2810,6 +2824,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						parcelNumberEntity.setHandQuantity(handQuantity.subtract(signNum).intValue());
 						parcelNumberEntity.setDeliveryQuantity(deliveryQuantity.subtract(signNum).intValue());
 						parcelNumberEntity.setOutboundQuantity(outboundQuantity.add(signNum).intValue());
+
 					}
 				}
 			}