From 11fb3c1b025502f5e16ac4ba261910e370197aff Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Tue, 25 Jun 2024 11:05:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A3=85=E8=BD=A6=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=20=E5=88=87=E6=8D=A2=E8=BD=A6=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BusinessPreOrderServiceImpl.java        | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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 751af971b..0139e5a6e 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
@@ -269,9 +269,16 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrde
 			// 全仓查询
 			if (!list2.isEmpty()) {
 				for (BusinessPreOrderEntity distributionBusinessPreOrderEntity : list2) {
-					if (distributionBusinessPreOrderEntity.getOrderPackageCode().equals(orderPackageCode)) {
+					if (distributionBusinessPreOrderEntity.getOrderPackageCode().equals(orderPackageCode)&& "20".equals(distributionBusinessPreOrderEntity.getOrderPackageLoadingStatus())) {
+						return Resp.scanSuccessWithData("已装车", "当前包件已在其它车次装车，请切换后在进行扫描", distributionBusinessPreOrderEntity.getDistrCarNumber());
+					}else if(distributionBusinessPreOrderEntity.getOrderPackageCode().equals(orderPackageCode) && "10".equals(distributionBusinessPreOrderEntity.getOrderPackageLoadingStatus())){
+
 						return Resp.scanSuccessWithData("是否切换车次", "当前包件不在当前车次，是否切换车次?", distributionBusinessPreOrderEntity.getDistrCarNumber());
 					}
+
+
+
+
 					selectD = distributionBusinessPreOrderEntity;
 					break;
 				}