From 89709b9af71c979840c304449c8a1f0d07ef7629 Mon Sep 17 00:00:00 2001 From: jun Date: Sat, 27 Jul 2024 21:03:59 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java | 5 +---- .../apiservice/serviceimpl/print/strategy/GqaaPrintStrategy.java | 6 ++++-- .../apiservice/serviceimpl/print/strategy/GqxnyPrintStrategy.java | 6 ++++-- .../serviceimpl/print/strategy/NoSortBarCodeGzStrategy.java | 6 ++++-- .../serviceimpl/print/strategy/XiaoPengNewPrintStrategy.java | 6 ++++-- .../serviceimpl/print/strategy/XiaoPengPrintStrategy.java | 6 ++++-- 6 files changed, 21 insertions(+), 14 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 70f9574..3a1e937 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 @@ -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); }); 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 eec752d..3e35a69 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 @@ -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; 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 a14bfdc..a34c532 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 @@ -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; 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 5364b9c..bfb4ca6 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 @@ -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; diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/XiaoPengNewPrintStrategy.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/XiaoPengNewPrintStrategy.java index 14f0c95..7aea21b 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/XiaoPengNewPrintStrategy.java +++ b/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); } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/XiaoPengPrintStrategy.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/XiaoPengPrintStrategy.java index 8f58aad..a370e0b 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/XiaoPengPrintStrategy.java +++ b/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); }