From e1aae44f1ef3444b24cf48dd237f4e4a79b3cbc5 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 8 Apr 2024 19:35:17 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=89=8B=E5=8A=A8=E8=A3=85=E8=BD=A6=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trunkline/service/impl/TrunklineCarsLoadServiceImpl.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 d0374924d..339456690 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
@@ -3740,13 +3740,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		List<TrunklineCarsOrderEntity> carsOrderEntityList = trunklineCarsOrderService.findListByLoadIdAndNodeId(loadId, warehouseId);
 		for (TrunklineCarsOrderEntity carsOrderEntity : carsOrderEntityList) {
 			Integer type = carsOrderEntity.getType();
+			Integer realNum = carsOrderEntity.getRealNum();
 			if (type.equals(1)) {
 				//订制品订单
 				String orderCode = carsOrderEntity.getOrderCode();
 				Integer planNum = carsOrderEntity.getPlanNum();
 				List<DistributionParcelListEntity> entityListByOrderCode = distributionParcelListClient.findEntityListByOrderCodeAndStatus(orderCode, warehouseId, "20");
 				int size = entityListByOrderCode.size();
-				if (planNum.equals(size)) {
+				if (planNum.equals(size+realNum)) {
 					for (DistributionParcelListEntity parcelListEntity : entityListByOrderCode) {
 						String orderPackageCode = parcelListEntity.getOrderPackageCode();
 						//查询包件是否已经装车
@@ -3761,7 +3762,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				String orderCode = carsOrderEntity.getOrderCode();
 				String waybillNo = carsOrderEntity.getWaybillNo();
 				Integer planNum = carsOrderEntity.getPlanNum();
-				Integer realNum = carsOrderEntity.getRealNum();
+//				Integer realNum = carsOrderEntity.getRealNum();
 				if (realNum.equals(0)) {
 					loadingZero(loadId, warehouseId, waybillNo, orderCode, null, planNum, "手动一键装车");
 				}