From b9d23adddf9e4f1d54c45423d8b8203bee0c6b55 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 2 Apr 2024 12:00:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E7=AD=BE=E6=94=B6=E5=AE=8C?=
 =?UTF-8?q?=E7=BB=93=E5=A4=87=E8=B4=A7=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionStockupInfoServiceImpl.java   | 63 ++++++++++++-------
 1 file changed, 41 insertions(+), 22 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupInfoServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupInfoServiceImpl.java
index 7e820c9fe..0c6e79d0d 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupInfoServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupInfoServiceImpl.java
@@ -108,6 +108,7 @@ public class DistributionStockupInfoServiceImpl extends BaseServiceImpl<Distribu
 	public void maintenanceStockUp(Long reservationId, Integer type) {
 		String method = "########################DistributionStockupInfoServiceImpl.maintenanceStockUp";
 		DistributionStockupInfoEntity stockupInfoEntity = null;
+		DistributionStockupInfoEntity distributionStockupInfoEntity = null;
 		switch (type){
 			case 1:
 				//商配。市配备货任务
@@ -117,37 +118,55 @@ public class DistributionStockupInfoServiceImpl extends BaseServiceImpl<Distribu
 					.ne(DistributionStockupInfoEntity::getStockStatus, "4")
 				);
 				if (entityList.size()==1){
+					 distributionStockupInfoEntity = entityList.get(0);
+
 					//可进行备货任务的完结标识
-					DistributionStockupInfoEntity distributionStockupInfoEntity = entityList.get(0);
 					distributionStockupInfoEntity.setStockStatus("3");
 					this.updateById(distributionStockupInfoEntity);
 					//查询备货任务是否都完成
-					List<DistributionStockupInfoEntity> stockupInfoEntityList = this.list(Wrappers.<DistributionStockupInfoEntity>query().lambda()
-						.eq(DistributionStockupInfoEntity::getStockupId, distributionStockupInfoEntity.getStockupId())
-						.ne(DistributionStockupInfoEntity::getStockStatus, "4")
-					);
-					if (Func.isNotEmpty(stockupInfoEntityList)){
-						DistributionStockupEntity distributionStockupEntity = new DistributionStockupEntity();
-						distributionStockupEntity.setId(distributionStockupInfoEntity.getStockupId());
-						boolean flag = stockupInfoEntityList.stream().allMatch(f -> "3".equals(f.getStockStatus()));
-						if (flag){
-							distributionStockupEntity.setStockupStatus(StockupStatusConstant.yibeihuo.getValue());
-						}else {
-							//查询是否存在完结
-							boolean anyMatch = stockupInfoEntityList.stream().anyMatch(f -> "3".equals(f.getStockStatus()));
-							if (anyMatch){
-								distributionStockupEntity.setStockupStatus(StockupStatusConstant.beihuozhong.getValue());
-							}else {
-								distributionStockupEntity.setStockupStatus(StockupStatusConstant.daibeihuo.getValue());
-							}
-						}
-						distributionStockupService.updateById(distributionStockupEntity);
-					}
 				}else {
 					//查询备货任务错误的原因
 					log.error(method+"预约单关联备货任务错误reservationId:{}",reservationId);
 				}
 				break;
+			case 2:
+				List<DistributionStockupInfoEntity> billLadingentityList = this.list(Wrappers.<DistributionStockupInfoEntity>query().lambda()
+					.eq(DistributionStockupInfoEntity::getReservationId, reservationId)
+					.eq(DistributionStockupInfoEntity::getStockUpType, 3)
+					.ne(DistributionStockupInfoEntity::getStockStatus, "4")
+				);
+				if (billLadingentityList.size() == 1){
+					 distributionStockupInfoEntity = billLadingentityList.get(0);
+                    //可进行备货任务的完结标识
+					distributionStockupInfoEntity.setStockStatus("3");
+					this.updateById(distributionStockupInfoEntity);
+				}else {
+					log.error(method+"预约单关联备货任务错误reservationId:{}",reservationId);
+				}
+				break;
+			default:
+				List<DistributionStockupInfoEntity> stockupInfoEntityList = this.list(Wrappers.<DistributionStockupInfoEntity>query().lambda()
+					.eq(DistributionStockupInfoEntity::getStockupId, distributionStockupInfoEntity.getStockupId())
+					.ne(DistributionStockupInfoEntity::getStockStatus, "4")
+				);
+				if (Func.isNotEmpty(stockupInfoEntityList)){
+					DistributionStockupEntity distributionStockupEntity = new DistributionStockupEntity();
+					distributionStockupEntity.setId(distributionStockupInfoEntity.getStockupId());
+					boolean flag = stockupInfoEntityList.stream().allMatch(f -> "3".equals(f.getStockStatus()));
+					if (flag){
+						distributionStockupEntity.setStockupStatus(StockupStatusConstant.yibeihuo.getValue());
+					}else {
+						//查询是否存在完结
+						boolean anyMatch = stockupInfoEntityList.stream().anyMatch(f -> "3".equals(f.getStockStatus()));
+						if (anyMatch){
+							distributionStockupEntity.setStockupStatus(StockupStatusConstant.beihuozhong.getValue());
+						}else {
+							distributionStockupEntity.setStockupStatus(StockupStatusConstant.daibeihuo.getValue());
+						}
+					}
+					distributionStockupService.updateById(distributionStockupEntity);
+				}
+				break;
 		}
 	}