打印调整获取organizeName的取值

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<String,Object> execute(MesProductionPsOutContext sn , String organizeCode);
+    Map<String,Object> execute(StationRequestBean reqBean, MesProductionPsOutContext sn , String organizeCode);
 }

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<String,Object> execute(MesProductionPsOutContext sn, String organizeCode) {
+    public Map<String,Object> execute(StationRequestBean reqBean, MesProductionPsOutContext sn, String organizeCode) {
         //零件条码中获取 serialNo
         String productSn = sn.getProductSn();
         //构造标签
         Map<String,Object> 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);

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<String, Object> execute(MesProductionPsOutContext sn, String organizeCode) {
+    public Map<String, Object> execute(StationRequestBean reqBean,MesProductionPsOutContext sn, String organizeCode) {
         Map<String,Object> 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);

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<String, Object> execute(MesProductionPsOutContext sn, String organizeCode) {
+    public Map<String, Object> execute(StationRequestBean reqBean,MesProductionPsOutContext sn, String organizeCode) {
         Map<String,Object> 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);

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<String, Object> execute(MesProductionPsOutContext sn, String organizeCode) {
+    public Map<String, Object> execute(StationRequestBean reqBean,MesProductionPsOutContext sn, String organizeCode) {
         //从条码中截取流水号，流水号 后四位
         String productSn = sn.getProductSn();
         Map<String,Object> map = new HashMap<>();

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<String, Object> execute(MesProductionPsOutContext sn, String organizeCode) {
+    public Map<String, Object> execute(StationRequestBean reqBean,MesProductionPsOutContext sn, String organizeCode) {
+
         Map<String,Object> 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);

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<String, Object> snData = strategyService.execute(sn, organizeCode);
+            Map<String, Object> snData = strategyService.execute(reqBean,sn, organizeCode);
             List<Map<String, Object>> printData;
             if (resultData.containsKey(labelTemplate.getTemplateCode())) {
                 printData = resultData.get(labelTemplate.getTemplateCode());