From 2447d39999d69a2d855bbc70bf0ced7d966038bb Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Mon, 24 Jun 2024 14:46:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=98=E7=9B=98=E6=89=93?=
 =?UTF-8?q?=E6=89=98=E6=8A=A5=E7=9A=84=E8=AF=AD=E9=9F=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BusinessPreOrderServiceImpl.java     | 39 +++++++------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java b/blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java
index 3961795a9..acef10564 100644
--- a/blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java
+++ b/blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java
@@ -90,31 +90,22 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrde
 			sb.append(distributionBusinessPreOrderEntity.getOrderPackageCode());
 			data.add(distributionBusinessPreOrderEntity);
 
-			if(!carNumberList.contains(distributionBusinessPreOrderEntity.getDistrCarNumber())){
-				carNumberList.add(distributionBusinessPreOrderEntity.getDistrCarNumber());
-			}
-		}
-		if(carNumberList.size()>1){
-			throw new ServiceException("不能同时操作多个车次");
-		}
-
-		BusinessSanDTO businessSanDTO = new BusinessSanDTO();
-		businessSanDTO.setOrderPackageCode(sb.toString());
-		businessSanDTO.setInWarehouseException(0);
-		businessSanDTO.setDistrCarNumber(carNumberList.get(0));
-		R r = inOrderWarehourse(businessSanDTO);
-		if (r.isSuccess()) {
-			// 更新成功
-			// 更新入库状态
-			for (BusinessPreOrderEntity distributionBusinessPreOrderEntity : data) {
-				distributionBusinessPreOrderEntity.setInWarehouse(1);
-				baseMapper.updateById(distributionBusinessPreOrderEntity);
-
-				Object o = bladeRedis.get(RedisKeyConstant.BUSINESS_IN_CARNUMBER + distributionBusinessPreOrderEntity.getDistrCarNumber());
-				if (!Objects.isNull(o)) {
-					bladeRedis.set(RedisKeyConstant.BUSINESS_IN_CARNUMBER + distributionBusinessPreOrderEntity.getDistrCarNumber(), null);
+			BusinessSanDTO businessSanDTO = new BusinessSanDTO();
+			businessSanDTO.setOrderPackageCode(distributionBusinessPreOrderEntity.getOrderPackageCode());
+			businessSanDTO.setInWarehouseException(0);
+			businessSanDTO.setDistrCarNumber(distributionBusinessPreOrderEntity.getDistrCarNumber());
+			R r = inOrderWarehourse(businessSanDTO);
+			if (r.isSuccess()) {
+				// 更新成功
+				// 更新入库状态
+					distributionBusinessPreOrderEntity.setInWarehouse(1);
+					baseMapper.updateById(distributionBusinessPreOrderEntity);
+					Object o = bladeRedis.get(RedisKeyConstant.BUSINESS_IN_CARNUMBER + distributionBusinessPreOrderEntity.getDistrCarNumber());
+					if (!Objects.isNull(o)) {
+						bladeRedis.set(RedisKeyConstant.BUSINESS_IN_CARNUMBER + distributionBusinessPreOrderEntity.getDistrCarNumber(), null);
+					}
 				}
-			}
+
 		}
 
 		return true;