From 922cbf0d695f3ec118ccbc02835328e9766bfa96 Mon Sep 17 00:00:00 2001 From: administrator Date: Thu, 20 Jun 2024 11:54:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E8=B0=83=E6=95=B4=E8=8E=B7?= =?UTF-8?q?=E5=8F=96organizeName=E7=9A=84=E5=8F=96=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/print/IPrintTemplateStrategyService.java | 3 ++- .../apiservice/serviceimpl/print/strategy/AionPrintStrategy.java | 5 +++-- .../apiservice/serviceimpl/print/strategy/GqaaPrintStrategy.java | 5 +++-- .../apiservice/serviceimpl/print/strategy/GqxnyPrintStrategy.java | 5 +++-- .../serviceimpl/print/strategy/NoSortBarCodeGzNewStrategy.java | 3 ++- .../serviceimpl/print/strategy/NoSortBarCodeGzStrategy.java | 6 ++++-- .../apiservice/serviceimpl/step/MesProductSnPrintStepService.java | 2 +- 7 files changed, 18 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/IPrintTemplateStrategyService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/IPrintTemplateStrategyService.java index 35d399f..0e1caf3 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/IPrintTemplateStrategyService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/IPrintTemplateStrategyService.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsOutContext; +import cn.estsh.i3plus.pojo.mes.model.StationRequestBean; import java.util.List; import java.util.Map; @@ -19,5 +20,5 @@ public interface IPrintTemplateStrategyService { * @param sn * @return */ - Map execute(MesProductionPsOutContext sn , String organizeCode); + Map execute(StationRequestBean reqBean, MesProductionPsOutContext sn , String organizeCode); } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/AionPrintStrategy.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/AionPrintStrategy.java index 0b8d661..1a845b7 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/AionPrintStrategy.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/AionPrintStrategy.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.MesCustomerOriganze; import cn.estsh.i3plus.pojo.mes.bean.MesPart; +import cn.estsh.i3plus.pojo.mes.model.StationRequestBean; import cn.estsh.i3plus.pojo.mes.repository.MesCustomerOriganizeRepository; import cn.estsh.i3plus.pojo.mes.repository.MesLabelTemplateRepository; import cn.estsh.i3plus.pojo.mes.repository.MesPartRepository; @@ -36,14 +37,14 @@ public class AionPrintStrategy implements IPrintTemplateStrategyService { @Autowired private MesPartRepository mesPartRao; @Override - public Map execute(MesProductionPsOutContext sn, String organizeCode) { + public Map execute(StationRequestBean reqBean, MesProductionPsOutContext sn, String organizeCode) { //零件条码中获取 serialNo String productSn = sn.getProductSn(); //构造标签 Map map = new HashMap<>(); String partNo = sn.getPartNo(); String partName = sn.getPartName(); - String factoryName = AuthUtil.getOrganize().getName(); + String factoryName = reqBean.getOrganizeName(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd"); LocalDateTime now = LocalDateTime.now(); String productDate = now.format(formatter); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/GqaaPrintStrategy.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/GqaaPrintStrategy.java index c9a58c8..f2a6e49 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/GqaaPrintStrategy.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/GqaaPrintStrategy.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.strategy; import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.IPrintTemplateStrategyService; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsOutContext; +import cn.estsh.i3plus.pojo.mes.model.StationRequestBean; import cn.estsh.impp.framework.boot.auth.AuthUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -22,12 +23,12 @@ import java.util.Map; @Slf4j public class GqaaPrintStrategy implements IPrintTemplateStrategyService { @Override - public Map execute(MesProductionPsOutContext sn, String organizeCode) { + public Map execute(StationRequestBean reqBean,MesProductionPsOutContext sn, String organizeCode) { Map map = new HashMap<>(); String partNo = sn.getPartNo(); String partName = sn.getPartName(); - String factoryName = AuthUtil.getOrganize().getName(); + String factoryName = reqBean.getOrganizeName(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yy/MM/dd"); LocalDateTime now = LocalDateTime.now(); String productDate = now.format(formatter); 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 adabbb1..a70c711 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 @@ -2,6 +2,7 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.strategy; import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.IPrintTemplateStrategyService; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsOutContext; +import cn.estsh.i3plus.pojo.mes.model.StationRequestBean; import cn.estsh.impp.framework.boot.auth.AuthUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -22,12 +23,12 @@ import java.util.Map; @Slf4j public class GqxnyPrintStrategy implements IPrintTemplateStrategyService { @Override - public Map execute(MesProductionPsOutContext sn, String organizeCode) { + public Map execute(StationRequestBean reqBean,MesProductionPsOutContext sn, String organizeCode) { Map map = new HashMap<>(); String partNo = sn.getPartNo(); String partName = sn.getPartName(); - String factoryName = AuthUtil.getOrganize().getName(); + String factoryName = reqBean.getOrganizeName(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yy/MM/dd"); LocalDateTime now = LocalDateTime.now(); String productDate = now.format(formatter); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/NoSortBarCodeGzNewStrategy.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/NoSortBarCodeGzNewStrategy.java index 801bc1c..69215ee 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/NoSortBarCodeGzNewStrategy.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/NoSortBarCodeGzNewStrategy.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.strategy; import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.IPrintTemplateStrategyService; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsOutContext; +import cn.estsh.i3plus.pojo.mes.model.StationRequestBean; import cn.estsh.impp.framework.boot.auth.AuthUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -23,7 +24,7 @@ import java.util.Map; @Slf4j public class NoSortBarCodeGzNewStrategy implements IPrintTemplateStrategyService { @Override - public Map execute(MesProductionPsOutContext sn, String organizeCode) { + public Map execute(StationRequestBean reqBean,MesProductionPsOutContext sn, String organizeCode) { //从条码中截取流水号，流水号 后四位 String productSn = sn.getProductSn(); Map map = new HashMap<>(); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/NoSortBarCodeGzStrategy.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/NoSortBarCodeGzStrategy.java index 755344c..ef6dfb7 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/NoSortBarCodeGzStrategy.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/NoSortBarCodeGzStrategy.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.strategy; import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.IPrintTemplateStrategyService; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsOutContext; +import cn.estsh.i3plus.pojo.mes.model.StationRequestBean; import cn.estsh.impp.framework.boot.auth.AuthUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -22,12 +23,13 @@ import java.util.Map; @Slf4j public class NoSortBarCodeGzStrategy implements IPrintTemplateStrategyService { @Override - public Map execute(MesProductionPsOutContext sn, String organizeCode) { + public Map execute(StationRequestBean reqBean,MesProductionPsOutContext sn, String organizeCode) { + Map map = new HashMap<>(); String partNo = sn.getPartNo(); String partName = sn.getPartName(); - String factoryName = AuthUtil.getOrganize().getName(); + String factoryName = reqBean.getOrganizeName(); String supplierCode = "VD501"; int no = 1; String noStr = String.format("%04d", no); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnPrintStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnPrintStepService.java index f5205ce..4cfc6d7 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnPrintStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnPrintStepService.java @@ -79,7 +79,7 @@ public class MesProductSnPrintStepService extends BaseStepService { execExpSendMsgAndThrowEx(reqBean, resultBean, String.format("零件号[%s]的模板代码[%s]的反射类丢失,请配置!", sn.getPartNo(), prodLabelTemplate)); } IPrintTemplateStrategyService strategyService = (IPrintTemplateStrategyService) SpringContextsUtil.getBean(methodCode); - Map snData = strategyService.execute(sn, organizeCode); + Map snData = strategyService.execute(reqBean,sn, organizeCode); List> printData; if (resultData.containsKey(labelTemplate.getTemplateCode())) { printData = resultData.get(labelTemplate.getTemplateCode());