From 7f2ddbbca1337e8d4b0643126278780492adf11d Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Thu, 26 Dec 2024 16:13:36 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E8=AF=97=E5=B0=BC=E6=9B=BC?=
 =?UTF-8?q?=E5=B7=A5=E5=8E=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 修改重复包条码订单数量不正确的问题
---
 .../org/springblade/common/constant/PackagesTypeEnum.java   | 6 +++++-
 .../java/com/logpm/factory/jobhandler/FactoryXxlJob.java    | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/PackagesTypeEnum.java b/blade-biz-common/src/main/java/org/springblade/common/constant/PackagesTypeEnum.java
index 61f2f7188..339c4ff1d 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/PackagesTypeEnum.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/PackagesTypeEnum.java
@@ -14,7 +14,11 @@ public enum PackagesTypeEnum {
 	LK("LK","柜门"),
 	XS("XS","柜门"),
 	PM("PM","柜门"),
-	QM("QM","柜门");
+	QM("QM","柜门"),
+	// FX("FX","辅异型板批次"),
+	// FH("FH","辅异型板6批次"),
+	// FZ("FZ","辅杂板批次")
+	;
 
 
 	private String typeCode;
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java
index 7c25d71e1..ffda34fbd 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java
@@ -471,7 +471,7 @@ public class FactoryXxlJob {
 					advanceEntity.setBrand(BrandEnums.SNM.getValue());
 					advanceEntity.setSiteName(siteName);
 					advanceEntity.setArea("");
-					advanceEntity.setTotalNum(CollUtil.isNotEmpty(staorderPackagesList) ? staorderPackagesList.size() : 0);
+
 					advanceEntity.setPackName("");
 					advanceEntity.setPackCode("");
 					advanceEntity.setWarehouseId(startWarehouseId);
@@ -561,7 +561,9 @@ public class FactoryXxlJob {
 							staorderPackagesService.updateById(it);
 						});
 					}
+					advanceEntity.setTotalNum(CollUtil.isNotEmpty(orderPackageSet) ? orderPackageSet.size() : 0);
 				});
+
 				// 将组装好的暂存单发送到 MQ ，由暂存单服务统一消费SendMsg.
 				if (CollUtil.isNotEmpty(advances)) {
 					for (cn.hutool.json.JSONObject advance : advances) {