问题清单修复

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java

@@ -170,11 +170,8 @@ public class MesProduceSnPrintService implements IMesProduceSnPrintService {
                 //保存条码
                 mesProduceSnRDao.insert(mesProduceSn);
             });
-            resultModel.getMesPrintedSnLogList().forEach(model -> {
+            resultModel.getMesPrintedSnLogList().forEach(snLog -> {
                 //保存打印记录
-                MesPrintedSnLog snLog = new MesPrintedSnLog();
-                ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
-                BeanUtil.copyProperties(model, snLog);
                 mesPrintedSnRao.insert(snLog);
             });
 

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/GqaaPrintStrategy.java

@@ -94,8 +94,9 @@ public class GqaaPrintStrategy implements IPrintTemplateStrategyService {
               mesProduceSnPrintModel.getMesProduceSnList().add(produceSn);
               //保存打印记录
               MesPrintedSnLog snLog = new MesPrintedSnLog();
-              ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
               BeanUtil.copyProperties(printDataModel,snLog);
+              snLog.setOrganizeCode(organizeCode);
+              ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
               mesProduceSnPrintModel.getMesPrintedSnLogList().add(snLog);
           }
       }else {
@@ -117,8 +118,9 @@ public class GqaaPrintStrategy implements IPrintTemplateStrategyService {
             mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(printDataModel);
             //保存打印记录
             MesPrintedSnLog snLog = new MesPrintedSnLog();
-            ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
             BeanUtil.copyProperties(printDataModel,snLog);
+            snLog.setOrganizeCode(organizeCode);
+            ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
             mesProduceSnPrintModel.getMesPrintedSnLogList().add(snLog);
         }
         return mesProduceSnPrintModel;

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/GqxnyPrintStrategy.java

@@ -127,8 +127,9 @@ public class GqxnyPrintStrategy implements IPrintTemplateStrategyService {
 
                 //保存打印记录
                 MesPrintedSnLog snLog = new MesPrintedSnLog();
-                ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
                 BeanUtil.copyProperties(printDataModel, snLog);
+                snLog.setOrganizeCode(organizeCode);
+                ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
                 mesProduceSnPrintModel.getMesProduceSnList().add(produceSn);
             }
         }else {
@@ -150,8 +151,9 @@ public class GqxnyPrintStrategy implements IPrintTemplateStrategyService {
             mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(printDataModel);
             //保存打印记录
             MesPrintedSnLog snLog = new MesPrintedSnLog();
-            ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
             BeanUtil.copyProperties(printDataModel,snLog);
+            snLog.setOrganizeCode(organizeCode);
+            ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
             mesProduceSnPrintModel.getMesPrintedSnLogList().add(snLog);
         }
         return mesProduceSnPrintModel;

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/NoSortBarCodeGzStrategy.java

@@ -85,8 +85,9 @@ public class NoSortBarCodeGzStrategy implements IPrintTemplateStrategyService {
                 mesProduceSnPrintModel.getMesProduceSnList().add(produceSn);
                 //保存打印记录
                 MesPrintedSnLog snLog = new MesPrintedSnLog();
-                ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
                 BeanUtil.copyProperties(printDataModel,snLog);
+                snLog.setOrganizeCode(organizeCode);
+                ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
                 mesProduceSnPrintModel.getMesPrintedSnLogList().add(snLog);
             }
         }else {
@@ -105,8 +106,9 @@ public class NoSortBarCodeGzStrategy implements IPrintTemplateStrategyService {
             mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(printDataModel);
             //保存打印记录
             MesPrintedSnLog snLog = new MesPrintedSnLog();
-            ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
             BeanUtil.copyProperties(printDataModel,snLog);
+            snLog.setOrganizeCode(organizeCode);
+            ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
             mesProduceSnPrintModel.getMesPrintedSnLogList().add(snLog);
         }
         return mesProduceSnPrintModel;

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/XiaoPengNewPrintStrategy.java

@@ -95,8 +95,9 @@ public class XiaoPengNewPrintStrategy implements IPrintTemplateStrategyService {
               mesProduceSnPrintModel.getMesProduceSnList().add(produceSn);
               //保存打印记录
               MesPrintedSnLog snLog = new MesPrintedSnLog();
-              ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
               BeanUtil.copyProperties(printDataModel,snLog);
+              snLog.setOrganizeCode(organizeCode);
+              ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
               mesProduceSnPrintModel.getMesPrintedSnLogList().add(snLog);
           }
       }else {
@@ -110,8 +111,9 @@ public class XiaoPengNewPrintStrategy implements IPrintTemplateStrategyService {
             mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(printDataModel);
             //保存打印记录
             MesPrintedSnLog snLog = new MesPrintedSnLog();
-            ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
             BeanUtil.copyProperties(printDataModel,snLog);
+            snLog.setOrganizeCode(organizeCode);
+            ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
             mesProduceSnPrintModel.getMesPrintedSnLogList().add(snLog);
       }
 

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/XiaoPengPrintStrategy.java

@@ -97,8 +97,9 @@ public class XiaoPengPrintStrategy implements IPrintTemplateStrategyService {
                mesProduceSnPrintModel.getMesProduceSnList().add(produceSn);
                //保存打印记录
                MesPrintedSnLog snLog = new MesPrintedSnLog();
-               ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
                BeanUtil.copyProperties(printDataModel,snLog);
+               snLog.setOrganizeCode(organizeCode);
+               ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
                mesProduceSnPrintModel.getMesPrintedSnLogList().add(snLog);
            }
        }else {
@@ -111,8 +112,9 @@ public class XiaoPengPrintStrategy implements IPrintTemplateStrategyService {
            mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(printDataModel);
            //保存打印记录
            MesPrintedSnLog snLog = new MesPrintedSnLog();
-           ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
            BeanUtil.copyProperties(printDataModel,snLog);
+           snLog.setOrganizeCode(organizeCode);
+           ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
            mesProduceSnPrintModel.getMesPrintedSnLogList().add(snLog);
        }