From b6e806f40e81c4b56dada7ecdf5577ae7dfba9cf Mon Sep 17 00:00:00 2001
From: administrator <suibian6d7d8t>
Date: Mon, 8 Jul 2024 09:59:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E6=89=93=E5=8D=B0=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java | 8 ++++----
 .../apiservice/serviceimpl/print/strategy/GqxnyPrintStrategy.java | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java
index d4aae9a..ca2a6cf 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java
@@ -151,15 +151,15 @@ public class MesProduceSnPrintService implements IMesProduceSnPrintService {
             }
 
             INumberRulePackAttributeStrategyService packStrategy = (INumberRulePackAttributeStrategyService) SpringContextsUtil.getBean(methodNameExt);
+            MesCustomerPart mesCustomerPart = getMesCustomerPart(mesProduceSnPrintModel);
             GenSerialNoModel genSerialNoModel = new GenSerialNoModel();
             genSerialNoModel.setRuleCode(numberRule.getRuleCode());
             genSerialNoModel.setPartNo(mesPart.getPartNo());
+            genSerialNoModel.putDataMap("mesPart",mesPart);
+            genSerialNoModel.putDataMap("mesCustomerPart",mesCustomerPart);
+            genSerialNoModel.setOrganizeCode(organizeCode);
             genSerialNoModel = packStrategy.execute(genSerialNoModel);
-            MesCustomerPart mesCustomerPart = getMesCustomerPart(mesProduceSnPrintModel);
             genSerialNoModel.setCustPartNo(mesCustomerPart.getCustPartNo());
-            Map<String, Object> dataMap = new HashMap<>();
-            dataMap.put("mesPart", mesPart);
-            dataMap.put("mesCustomerPart", mesCustomerPart);
             IPrintTemplateStrategyService templateStrategy = (IPrintTemplateStrategyService) SpringContextsUtil.getBean(methodCode);
 
             MesProduceSnPrintModel resultModel = templateStrategy.execute(genSerialNoModel, mesProduceSnPrintModel, numberRule);
diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/GqxnyPrintStrategy.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/GqxnyPrintStrategy.java
index fb289ac..1190233 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/GqxnyPrintStrategy.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/GqxnyPrintStrategy.java
@@ -66,7 +66,7 @@ public class GqxnyPrintStrategy implements IPrintTemplateStrategyService {
     private MesCustomerPartRepository mesCustomerPartRDao;
 
     @Override
-    public MesProduceSnPrintModel execute(GenSerialNoModel model, MesProduceSnPrintModel mesProduceSnPrintModel, MesNumberRule numberRule) {
+    public MesProduceSnPrintModel execute(GenSerialNoModel genSerialNoModel, MesProduceSnPrintModel mesProduceSnPrintModel, MesNumberRule numberRule) {
         String format = DateUtil.BASE_FORMAT;
         // 获取工厂名称
         String organizeCode = mesProduceSnPrintModel.getOrganizeCode();
@@ -83,7 +83,6 @@ public class GqxnyPrintStrategy implements IPrintTemplateStrategyService {
         //{custPartNo}{SPILTURE}{custCode}{spiltrure}{spiltrule}{year}{serialNo}{spilture}{spiltrule}
         //客户零件号-扩展位-客户代码-预留位000-产线1-年月日-条码-扩展0000-追溯位+
         //零件长号---17位,不足17位 右边补*
-        GenSerialNoModel genSerialNoModel = new GenSerialNoModel();
         genSerialNoModel.setRuleCode(numberRule.getRuleCode());
         //获取客户零件号
         String custPartNo = getMesCustomerPart(mesProduceSnPrintModel).getCustPartNo();