From 8e008c890e42af959895a853442a5e463b1ffdae Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Thu, 22 Aug 2024 19:37:36 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=EF=BC=8C=E8=BF=90?=
 =?UTF-8?q?=E5=8D=95bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/trunkline/vo/UnloadPackageVO.java   |  2 +-
 .../mapper/TrunklineCarsLoadScanMapper.xml    |  2 +-
 .../impl/TrunklineCarsLoadServiceImpl.java    | 44 ++++++++++---------
 .../TrunklineWaybillPackageServiceImpl.java   | 14 +++---
 4 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadPackageVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadPackageVO.java
index 574bf1d47..1b7bbbdb1 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadPackageVO.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadPackageVO.java
@@ -7,7 +7,7 @@ import java.io.Serializable;
 @Data
 public class UnloadPackageVO implements Serializable {
 
-	private Long loadScanId;
+	private Long carsLoadScanId;
 	private String orderPackageCode;
 	private Integer num;
 	private Integer unloadNum;
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
index 705c4bd29..a8bf03373 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
@@ -221,7 +221,7 @@
     </select>
 
     <select id="findUnloadPackageList" resultType="com.logpm.trunkline.vo.UnloadPackageVO">
-        select id loadScanId,
+        select id carsLoadScanId,
                scan_code orderPackageCode,
                num num,
                unload_num unloadNum,
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
index 23f5448fe..44f3bda0f 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
@@ -3105,27 +3105,29 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 //		String operationRemark = "运单装车"+enterNum+"件  干线批次号："+carsLoadEntity.getCarsNo()+"，车牌号："+carsLoadEntity.getCarNumber()+"，司机姓名："+carsLoadEntity.getDriverName()+"，司机手机："+carsLoadEntity.getDriverMobile();
 //		openOrderAsyncService.saveLog(waybillId, waybillNo, "30", "干线装车", operationRemark, AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName);
-		QueryWrapper<TrunklineWaybillOrderEntity> queryWrapper1 = new QueryWrapper<>();
-		queryWrapper1.eq("waybill_id",waybillId)
-				.eq("order_code",waybillNo);
-		TrunklineWaybillOrderEntity one = trunklineWaybillOrderService.getOne(queryWrapper1);
-		if(!Objects.isNull(one)){
-			Integer totalCount = waybillEntity.getTotalCount();
-			Integer waybillStatusInt = Integer.parseInt(waybillEntity.getWaybillStatus());
-			if(waybillStatusInt <= 30){
-				Integer handleNumber = one.getHandleNumber();
-				int total = handleNumber + enterNum;
-				if(total < totalCount){
-					waybillEntity.setWaybillStatus("30");
-					one.setHandleNumber(total);
-				}else{
-					waybillEntity.setWaybillStatus("40");
-					one.setHandleNumber(totalCount);
-				}
-				warehouseWaybillClient.updateEntity(waybillEntity);
-				trunklineWaybillOrderService.updateById(one);
-			}
-		}
+//		QueryWrapper<TrunklineWaybillOrderEntity> queryWrapper1 = new QueryWrapper<>();
+//		queryWrapper1.eq("waybill_id",waybillId)
+//				.eq("order_code",waybillNo);
+//		TrunklineWaybillOrderEntity one = trunklineWaybillOrderService.getOne(queryWrapper1);
+//		if(!Objects.isNull(one)){
+//			Integer totalCount = waybillEntity.getTotalCount();
+//			Integer waybillStatusInt = Integer.parseInt(waybillEntity.getWaybillStatus());
+//			if(waybillStatusInt <= 30){
+//				Integer handleNumber = one.getHandleNumber();
+//				int total = handleNumber + enterNum;
+//				if(total < totalCount){
+//					waybillEntity.setWaybillStatus("30");
+//					one.setHandleNumber(total);
+//				}else{
+//					waybillEntity.setWaybillStatus("40");
+//					one.setHandleNumber(totalCount);
+//				}
+//				warehouseWaybillClient.updateEntity(waybillEntity);
+//				trunklineWaybillOrderService.updateById(one);
+//			}
+//		}
+
+		waybillPackageService.updateWaybillStatus(waybillEntity);
 
 		trunklineCarsLoadingLogService.savaLoadingLog(warehouseId, warehouseName, loadId, loadCode, waybillId, waybillNo, orderCode, goodsName, difficult,
 			2, isData, isAbnormal, trayId, trayCode, trayName, fromWarehouseId, loadScanId, remark);
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillPackageServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillPackageServiceImpl.java
index 99e640e76..6a5c3df8e 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillPackageServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillPackageServiceImpl.java
@@ -137,26 +137,28 @@ public class TrunklineWaybillPackageServiceImpl extends BaseServiceImpl<Trunklin
 			}
 			warehouseWaybillClient.updateEntity(updateEntity);
 		}else if(waybillType == 2){
-
+			WarehouseWaybillEntity updateEntity = new WarehouseWaybillEntity();
+			updateEntity.setId(waybillEntity.getId());
 			Integer incomingNum = distributionStockArticleClient.findIncomingNumByWaybillNo(waybillNo, destinationWarehouseId);
 			Integer stockNum = distributionStockArticleClient.findStockNumByWaybillNo(waybillNo,departureWarehouseId);
 			if(incomingNum == 0){
 				if(stockNum == 0){
-					waybillEntity.setWaybillStatus("40");
+					updateEntity.setWaybillStatus("40");
 				}else{
 					if(stockNum == totalCount){
-						waybillEntity.setWaybillStatus("20");
+						updateEntity.setWaybillStatus("20");
 					}else{
-						waybillEntity.setWaybillStatus("30");
+						updateEntity.setWaybillStatus("30");
 					}
 				}
 			}else{
 				if(incomingNum == totalCount){
-					waybillEntity.setWaybillStatus("60");
+					updateEntity.setWaybillStatus("60");
 				}else{
-					waybillEntity.setWaybillStatus("50");
+					updateEntity.setWaybillStatus("50");
 				}
 			}
+			warehouseWaybillClient.updateEntity(updateEntity);
 		}