From f5362f65ee341379c65f92aaa6ac5439e87131f5 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Sun, 17 Nov 2024 21:15:13 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=89=93=E6=89=98=E4=BF=9D=E5=AD=98=E6=89=93?=
 =?UTF-8?q?=E6=89=98=E5=BD=93=E6=97=B6bug=E4=BF=AE=E5=A4=8D=202.=E6=95=B4?=
 =?UTF-8?q?=E6=89=98=E8=A3=85=E8=BD=A6=E5=88=A4=E5=AE=9A=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E4=BB=B6=E6=95=B0=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trunkline/mapper/TrunklineCarsLoadLineMapper.xml |  3 +--
 .../trunkline/service/impl/OpenOrderServiceImpl.java |  7 +++----
 .../service/impl/TrunklineCarsLoadServiceImpl.java   | 10 +++++++++-
 .../service/impl/WarehouseTrayTypeServiceImpl.java   | 12 ++++++++++++
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadLineMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadLineMapper.xml
index b0f2cdb5d..ebcd91625 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadLineMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadLineMapper.xml
@@ -59,8 +59,7 @@
             node_status = #{nodeStatus},
             start_user_id = #{userId},
             start_user_name = #{nickName}
-        where load_id = #{lineId}
-        and id = #{lineId}
+        where id = #{lineId}
     </update>
 
 </mapper>
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
index b3358f0c9..055446f11 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
@@ -3142,13 +3142,12 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		InputStream inputStream = file.getInputStream();
 
 		List<ImportOrderNoPackageExcelDTO> importOrderNoPackageExcelDTOS = EasyExcel.read(inputStream).head(ImportOrderNoPackageExcelDTO.class).sheet(0).headRowNumber(2).doReadSync();
-		importOrderNoPackageExcelDTOS.forEach(dto -> {
-			dto.setOrderCode(dto.getOrderCode().trim());
-		});
 
 		//过滤掉importOrderNoPackageExcelDTOS中orderCode为空的数据
 		importOrderNoPackageExcelDTOS = importOrderNoPackageExcelDTOS.stream().filter(item -> StringUtil.isNotBlank(item.getOrderCode())).collect(Collectors.toList());
-
+		importOrderNoPackageExcelDTOS.forEach(dto -> {
+			dto.setOrderCode(dto.getOrderCode().trim());
+		});
 
 		//把importOrderNoPackageExcelDTOS中所有brand放入一个Set
 		Set<String> brands = importOrderNoPackageExcelDTOS.parallelStream().map(ImportOrderNoPackageExcelDTO::getBrand).collect(Collectors.toSet());
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 65db4975d..c4c43f5f9 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
@@ -10021,6 +10021,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				String waybillNumber = parcelList.getWaybillNumber();
 				String orderPackageCode = parcelList.getOrderPackageCode();
 
+				int flag = 0;
+
 				for (TrunklineCarsOrderEntity carsOrderEntity : carsOrderList) {
 					String orderCode1 = carsOrderEntity.getOrderCode();
 					String waybillNo = carsOrderEntity.getWaybillNo();
@@ -10029,11 +10031,17 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					if(orderCode1.equals(orderCode) && waybillNo.equals(waybillNumber)){
 						int totalNum = realNum + 1;
 						if(totalNum > planNum){
-							noPlanPackageList.add(orderPackageCode);
 							carsOrderEntity.setRealNum(totalNum);
+						}else{
+							carsOrderEntity.setRealNum(totalNum);
+							flag = 1;
 						}
 					}
 				}
+
+				if(flag == 0){
+					noPlanPackageList.add(orderPackageCode);
+				}
 			}
 			if(CollUtil.isNotEmpty(noPlanPackageList)){
 				log.warn("##################loadingTrayPackageList: 存在不在计划的包件 noPlanPackageList={}", noPlanPackageList);
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
index 709e5e189..3bdc52dd4 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
@@ -1743,6 +1743,16 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 	private WarehouseTrayTypeEntity saveTrayTypeByOrderPackageCode(String trayType, String trayCode, Long trayId, DistributionParcelListEntity parcelListEntity, DistributionStockArticleEntity stockArticleEntity, Long warehouseId) {
 		log.info("#########saveTrayType: 存入打托方式 trayType={}，trayCode={}", trayType, trayCode);
 
+		String key = "saveTrayTypeNew:"+trayCode;
+
+		Boolean exists = redis.exists(key);
+		if(exists){
+			log.warn("#########orderScanOrderPackageCode: 托盘正在保存打托方式 trayCode={} warehouseId={}", trayCode, warehouseId);
+			throw new CustomerException(405, "托盘信息正在更新，请重试");
+		}
+
+		redis.setEx(key,"1",5L);
+
 		WarehouseTrayTypeEntity trayTypeEntity = new WarehouseTrayTypeEntity();
 		BladeUser user = AuthUtil.getUser();
 		if (user == null) {
@@ -1831,6 +1841,8 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		//修改托盘的状态
 		basicdataTrayClient.updateTrayStatus(trayId, 2);
 
+		redis.del(key);
+
 		return trayTypeEntity;
 	}