From 6e89a4aa8a629d5eb9937e0a0294a232d0ad5746 Mon Sep 17 00:00:00 2001 From: jun Date: Fri, 26 Jul 2024 16:20:23 +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 --- .../serviceimpl/print/strategy/AionPrintStrategy.java | 10 +++++----- .../serviceimpl/print/strategy/GqaaPrintStrategy.java | 12 ++++++------ .../serviceimpl/print/strategy/GqxnyPrintStrategy.java | 9 ++++----- .../serviceimpl/print/strategy/NoSortBarCodeGzStrategy.java | 9 ++++----- .../serviceimpl/print/strategy/XiaoPengNewPrintStrategy.java | 7 +++---- .../serviceimpl/print/strategy/XiaoPengPrintStrategy.java | 9 ++++----- 6 files changed, 26 insertions(+), 30 deletions(-) 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 e372027..36b0171 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 @@ -8,6 +8,7 @@ import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesProduceSnPrintModel; import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords; import cn.estsh.i3plus.mes.pcn.api.iservice.base.IConfigService; import cn.estsh.i3plus.mes.pcn.api.iservice.busi.ISyncFuncService; +import cn.estsh.i3plus.mes.pcn.util.DateUtil; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.TimeTool; @@ -71,7 +72,6 @@ public class AionPrintStrategy implements IPrintTemplateStrategyService { } //获取工厂名称 String organizeName = mesConfig.getCfgValue(); - String format ="yyyy/MM/dd"; MesCustomerPart mesCustomerPart = getMesCustomerPart(mesProduceSnPrintModel); String custPartNo = mesCustomerPart == null ? "" : mesCustomerPart.getCustPartNo(); //物料信息 @@ -89,7 +89,7 @@ public class AionPrintStrategy implements IPrintTemplateStrategyService { serialNo34 = stringFormat(serialNo34, 4, false, "0"); sn = snPrefix + serialNo34 + snSuffix; //保存条码信息 - MesProduceSn produceSn = generateMesProduceSn(mesPart, sn, mesProduceSnPrintModel.getUserName(), mesProduceSnPrintModel.getQty(), format); + MesProduceSn produceSn = generateMesProduceSn(mesPart, sn, mesProduceSnPrintModel.getUserName(), mesProduceSnPrintModel.getQty()); //封装打印信息 MesProduceSnPrintDataModel printDataModel = getModel(produceSn, serialNo, custPartNo, organizeName); mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(printDataModel); @@ -134,7 +134,7 @@ public class AionPrintStrategy implements IPrintTemplateStrategyService { mesProduceSnPrintDataModel.setNo(no); mesProduceSnPrintDataModel.setBarcode(produceSn.getProductSn()); mesProduceSnPrintDataModel.setCustPartNo(custPartNo); - mesProduceSnPrintDataModel.setProductDate(produceSn.getLotNo()); + mesProduceSnPrintDataModel.setProductDate(TimeTool.parseStringFormat(produceSn.getLotNo(), DateUtil.SHORT_FORMAT,"yyyy/MM/dd")); return mesProduceSnPrintDataModel; } private MesNumberRule getNumberRule(String organizeCode, MesPart part) { @@ -187,7 +187,7 @@ public class AionPrintStrategy implements IPrintTemplateStrategyService { return dataBuffer.toString(); } - private MesProduceSn generateMesProduceSn(MesPart mesPart, String sn, String userName, Double qty, String format) { + private MesProduceSn generateMesProduceSn(MesPart mesPart, String sn, String userName, Double qty) { MesProduceSn mesProduceSn = new MesProduceSn(); mesProduceSn.setSerialNumber(snowflakeIdMaker.nextId() + ""); mesProduceSn.setProductSn(sn); @@ -200,7 +200,7 @@ public class AionPrintStrategy implements IPrintTemplateStrategyService { mesProduceSn.setQty(qty); mesProduceSn.setSnStatus(MesExtEnumUtil.PRODUCE_SN_STATUS.CREATE.getValue()); mesProduceSn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue()); - mesProduceSn.setLotNo(TimeTool.getNowTime(format)); + mesProduceSn.setLotNo(TimeTool.getToday()); mesProduceSn.setPrintCount(MesPcnExtConstWords.ONE); mesProduceSn.setPrintStatus(MesExtEnumUtil.PRINT_STATUS.PRINTED.getValue()); mesProduceSn.setOrganizeCode(mesPart.getOrganizeCode()); 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 00c742b..eec752d 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 @@ -8,6 +8,7 @@ import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesProduceSnPrintModel; import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords; import cn.estsh.i3plus.mes.pcn.api.iservice.base.IConfigService; import cn.estsh.i3plus.mes.pcn.api.iservice.busi.ISyncFuncService; +import cn.estsh.i3plus.mes.pcn.util.DateUtil; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.TimeTool; @@ -70,7 +71,6 @@ public class GqaaPrintStrategy implements IPrintTemplateStrategyService { } //获取工厂名称 String organizeName = mesConfig.getCfgValue(); - String format ="yyyy/MM/dd"; MesCustomerPart mesCustomerPart = getMesCustomerPart(mesProduceSnPrintModel); //物料信息 MesPart mesPart = mesPartService.getMesPartByPartNo(mesProduceSnPrintModel.getPartNo(), organizeCode); @@ -87,7 +87,7 @@ public class GqaaPrintStrategy implements IPrintTemplateStrategyService { serialNo34 = stringFormat(serialNo34, 4, false, "0"); sn = snPrefix + serialNo34 + snSuffix; //保存条码信息 - MesProduceSn produceSn = generateMesProduceSn(mesPart, sn, mesProduceSnPrintModel.getUserName(), mesProduceSnPrintModel.getQty(), format); + MesProduceSn produceSn = generateMesProduceSn(mesPart, sn, mesProduceSnPrintModel.getUserName(), mesProduceSnPrintModel.getQty()); //封装打印信息 MesProduceSnPrintDataModel printDataModel = getModel(produceSn, serialNo, mesCustomerPart.getCustPartNo(), organizeName); mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(printDataModel); @@ -120,7 +120,7 @@ public class GqaaPrintStrategy implements IPrintTemplateStrategyService { ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName()); BeanUtil.copyProperties(printDataModel,snLog); mesProduceSnPrintModel.getMesPrintedSnLogList().add(snLog); - } + } return mesProduceSnPrintModel; } @@ -132,7 +132,7 @@ public class GqaaPrintStrategy implements IPrintTemplateStrategyService { mesProduceSnPrintDataModel.setNo(no); mesProduceSnPrintDataModel.setBarcode(produceSn.getProductSn()); mesProduceSnPrintDataModel.setCustPartNo(custPartNo); - mesProduceSnPrintDataModel.setProductDate(produceSn.getLotNo()); + mesProduceSnPrintDataModel.setProductDate(TimeTool.parseStringFormat(produceSn.getLotNo(),DateUtil.SHORT_FORMAT,"yyyy/MM/dd")); return mesProduceSnPrintDataModel; } private MesNumberRule getNumberRule(String organizeCode, MesPart part) { @@ -185,7 +185,7 @@ public class GqaaPrintStrategy implements IPrintTemplateStrategyService { return dataBuffer.toString(); } - private MesProduceSn generateMesProduceSn(MesPart mesPart, String sn, String userName, Double qty, String format) { + private MesProduceSn generateMesProduceSn(MesPart mesPart, String sn, String userName, Double qty) { MesProduceSn mesProduceSn = new MesProduceSn(); mesProduceSn.setSerialNumber(snowflakeIdMaker.nextId() + ""); mesProduceSn.setProductSn(sn); @@ -198,7 +198,7 @@ public class GqaaPrintStrategy implements IPrintTemplateStrategyService { mesProduceSn.setQty(qty); mesProduceSn.setSnStatus(MesExtEnumUtil.PRODUCE_SN_STATUS.CREATE.getValue()); mesProduceSn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue()); - mesProduceSn.setLotNo(TimeTool.getNowTime(format)); + mesProduceSn.setLotNo(TimeTool.getToday()); mesProduceSn.setPrintCount(MesPcnExtConstWords.ONE); mesProduceSn.setPrintStatus(MesExtEnumUtil.PRINT_STATUS.PRINTED.getValue()); mesProduceSn.setOrganizeCode(mesPart.getOrganizeCode()); 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 0a93ee3..a14bfdc 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 @@ -64,7 +64,6 @@ public class GqxnyPrintStrategy implements IPrintTemplateStrategyService { public MesProduceSnPrintModel execute(GenSerialNoModel genSerialNoModel, MesProduceSnPrintModel mesProduceSnPrintModel, MesNumberRule numberRule,StepResult stepResult, StationRequestBean reqBean,Boolean isStep) { //获取客户零件号 String custPartNo = getMesCustomerPart(mesProduceSnPrintModel).getCustPartNo(); - String format = "yyyy/MM/dd"; // 获取工厂名称 String organizeCode = mesProduceSnPrintModel.getOrganizeCode(); MesConfig mesConfig = configService.getMesConfigByCfgCode(MesPcnExtConstWords.ORGANIZE_NAME, organizeCode); @@ -120,7 +119,7 @@ public class GqxnyPrintStrategy implements IPrintTemplateStrategyService { // serialNo34 = stringFormat(serialNo34, 4, false, "0"); // sn = snPrefix + serialNo34 + snSuffix; //保存条码信息 - MesProduceSn produceSn = generateMesProduceSn(mesPart, sn, mesProduceSnPrintModel.getUserName(), mesProduceSnPrintModel.getQty(), format); + MesProduceSn produceSn = generateMesProduceSn(mesPart, sn, mesProduceSnPrintModel.getUserName(), mesProduceSnPrintModel.getQty()); //封装打印信息 MesProduceSnPrintDataModel printDataModel = getModel(produceSn, serialNo, custPartNo, organizeName); printDataModel.setSupplierCode(supplierCode); @@ -217,7 +216,7 @@ public class GqxnyPrintStrategy implements IPrintTemplateStrategyService { return sb.reverse().toString(); } - private MesProduceSn generateMesProduceSn(MesPart mesPart, String sn, String userName, Double qty, String format) { + private MesProduceSn generateMesProduceSn(MesPart mesPart, String sn, String userName, Double qty) { MesProduceSn mesProduceSn = new MesProduceSn(); mesProduceSn.setSerialNumber(snowflakeIdMaker.nextId() + ""); mesProduceSn.setProductSn(sn); @@ -230,7 +229,7 @@ public class GqxnyPrintStrategy implements IPrintTemplateStrategyService { mesProduceSn.setQty(qty); mesProduceSn.setSnStatus(MesExtEnumUtil.PRODUCE_SN_STATUS.CREATE.getValue()); mesProduceSn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue()); - mesProduceSn.setLotNo(TimeTool.getNowTime(format)); + mesProduceSn.setLotNo(TimeTool.getToday()); mesProduceSn.setPrintCount(MesPcnExtConstWords.ONE); mesProduceSn.setPrintStatus(MesExtEnumUtil.PRINT_STATUS.PRINTED.getValue()); mesProduceSn.setOrganizeCode(mesPart.getOrganizeCode()); @@ -246,7 +245,7 @@ public class GqxnyPrintStrategy implements IPrintTemplateStrategyService { mesProduceSnPrintDataModel.setNo(no); mesProduceSnPrintDataModel.setBarcode(produceSn.getProductSn()); mesProduceSnPrintDataModel.setCustPartNo(custPartNo); - mesProduceSnPrintDataModel.setProductDate(produceSn.getLotNo()); + mesProduceSnPrintDataModel.setProductDate(TimeTool.parseStringFormat(produceSn.getLotNo(),DateUtil.SHORT_FORMAT,"yyyy/MM/dd")); return mesProduceSnPrintDataModel; } 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 41a8e96..5364b9c 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 @@ -58,7 +58,6 @@ public class NoSortBarCodeGzStrategy implements IPrintTemplateStrategyService { @Override public MesProduceSnPrintModel execute(GenSerialNoModel genSerialNoModel, MesProduceSnPrintModel mesProduceSnPrintModel, MesNumberRule numberRule,StepResult stepResult, StationRequestBean reqBean,Boolean isStep) { // noSortBarCodeGz - String format = "yyyy/MM/dd"; //{partNo}{year}{month}{day}{serialNo} String organizeCode = mesProduceSnPrintModel.getOrganizeCode(); MesPart mesPart = mesPartService.getMesPartByPartNo(mesProduceSnPrintModel.getPartNo(), organizeCode); @@ -79,7 +78,7 @@ public class NoSortBarCodeGzStrategy implements IPrintTemplateStrategyService { Integer serialNoLength = numberRule.getSerialnoLength(); String serialNo = sn.substring(sn.length() - serialNoLength); //保存条码信息 - MesProduceSn produceSn = generateMesProduceSn(mesPart, sn, mesProduceSnPrintModel.getUserName(), mesProduceSnPrintModel.getQty(), format); + MesProduceSn produceSn = generateMesProduceSn(mesPart, sn, mesProduceSnPrintModel.getUserName(), mesProduceSnPrintModel.getQty()); //封装打印信息 MesProduceSnPrintDataModel printDataModel = getModel(produceSn, serialNo, mesProduceSnPrintModel.getCustPartNo(), organizeName); mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(printDataModel); @@ -113,7 +112,7 @@ public class NoSortBarCodeGzStrategy implements IPrintTemplateStrategyService { return mesProduceSnPrintModel; } - private MesProduceSn generateMesProduceSn(MesPart mesPart, String sn, String userName, Double qty, String format) { + private MesProduceSn generateMesProduceSn(MesPart mesPart, String sn, String userName, Double qty) { MesProduceSn mesProduceSn = new MesProduceSn(); mesProduceSn.setSerialNumber(snowflakeIdMaker.nextId() + ""); mesProduceSn.setProductSn(sn); @@ -126,7 +125,7 @@ public class NoSortBarCodeGzStrategy implements IPrintTemplateStrategyService { mesProduceSn.setQty(qty); mesProduceSn.setSnStatus(MesExtEnumUtil.PRODUCE_SN_STATUS.CREATE.getValue()); mesProduceSn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue()); - mesProduceSn.setLotNo(TimeTool.getNowTime(format)); + mesProduceSn.setLotNo(TimeTool.getToday()); mesProduceSn.setPrintCount(MesPcnExtConstWords.ONE); mesProduceSn.setPrintStatus(MesExtEnumUtil.PRINT_STATUS.PRINTED.getValue()); mesProduceSn.setOrganizeCode(mesPart.getOrganizeCode()); @@ -141,7 +140,7 @@ public class NoSortBarCodeGzStrategy implements IPrintTemplateStrategyService { mesProduceSnPrintDataModel.setNo(no); mesProduceSnPrintDataModel.setBarcode(produceSn.getProductSn()); mesProduceSnPrintDataModel.setCustPartNo(custPartNo); - mesProduceSnPrintDataModel.setProductDate(produceSn.getLotNo()); + mesProduceSnPrintDataModel.setProductDate(TimeTool.parseStringFormat(produceSn.getLotNo(),DateUtil.SHORT_FORMAT,"yyyy/MM/dd")); return mesProduceSnPrintDataModel; } } 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 f631063..14f0c95 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 @@ -62,7 +62,6 @@ public class XiaoPengNewPrintStrategy implements IPrintTemplateStrategyService { @Override public MesProduceSnPrintModel execute(GenSerialNoModel genSerialNoModel, MesProduceSnPrintModel mesProduceSnPrintModel, MesNumberRule numberRule, StepResult stepResult, StationRequestBean reqBean, Boolean isStep) { - String format = DateUtil.SHORT_FORMAT; Date date = new Date(); String organizeCode = mesProduceSnPrintModel.getOrganizeCode(); //gz-xiaopeng @@ -88,7 +87,7 @@ public class XiaoPengNewPrintStrategy implements IPrintTemplateStrategyService { Integer serialNoLength = numberRule.getSerialnoLength(); String serialNo = sn.substring(sn.length() - serialNoLength); //保存条码信息 - MesProduceSn produceSn = generateMesProduceSn(mesPart, sn, mesProduceSnPrintModel.getUserName(), mesProduceSnPrintModel.getQty(), format); + MesProduceSn produceSn = generateMesProduceSn(mesPart, sn, mesProduceSnPrintModel.getUserName(), mesProduceSnPrintModel.getQty()); produceSn.setCustPartNo(custPartNo); //封装打印信息 MesProduceSnPrintDataModel printDataModel = getModel(produceSn, serialNo, custPartNo, organizeName); @@ -161,7 +160,7 @@ public class XiaoPengNewPrintStrategy implements IPrintTemplateStrategyService { return day; } - private MesProduceSn generateMesProduceSn(MesPart mesPart, String sn, String userName, Double qty, String format) { + private MesProduceSn generateMesProduceSn(MesPart mesPart, String sn, String userName, Double qty) { MesProduceSn mesProduceSn = new MesProduceSn(); mesProduceSn.setSerialNumber(snowflakeIdMaker.nextId() + ""); mesProduceSn.setProductSn(sn); @@ -174,7 +173,7 @@ public class XiaoPengNewPrintStrategy implements IPrintTemplateStrategyService { mesProduceSn.setQty(qty); mesProduceSn.setSnStatus(MesExtEnumUtil.PRODUCE_SN_STATUS.CREATE.getValue()); mesProduceSn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue()); - mesProduceSn.setLotNo(TimeTool.getNowTime(format)); + mesProduceSn.setLotNo(TimeTool.getToday()); mesProduceSn.setPrintCount(MesPcnExtConstWords.ONE); mesProduceSn.setPrintStatus(MesExtEnumUtil.PRINT_STATUS.PRINTED.getValue()); mesProduceSn.setOrganizeCode(mesPart.getOrganizeCode()); 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 a3b748c..8f58aad 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 @@ -62,7 +62,6 @@ public class XiaoPengPrintStrategy implements IPrintTemplateStrategyService { @Override public MesProduceSnPrintModel execute(GenSerialNoModel genSerialNoModel, MesProduceSnPrintModel mesProduceSnPrintModel, MesNumberRule numberRule, StepResult stepResult, StationRequestBean reqBean, Boolean isStep) { - String format = DateUtil.BASE_FORMAT; Date date = new Date(); String organizeCode = mesProduceSnPrintModel.getOrganizeCode(); //gz-xiaopeng @@ -90,7 +89,7 @@ public class XiaoPengPrintStrategy implements IPrintTemplateStrategyService { Integer serialNoLength = numberRule.getSerialnoLength(); String serialNo = sn.substring(sn.length() - serialNoLength); //保存条码信息 - MesProduceSn produceSn = generateMesProduceSn(mesPart, sn, mesProduceSnPrintModel.getUserName(), mesProduceSnPrintModel.getQty(), format); + MesProduceSn produceSn = generateMesProduceSn(mesPart, sn, mesProduceSnPrintModel.getUserName(), mesProduceSnPrintModel.getQty()); produceSn.setCustPartNo(custPartNo); //封装打印信息 MesProduceSnPrintDataModel printDataModel = getModel(produceSn, serialNo, custPartNo, organizeName); @@ -163,7 +162,7 @@ public class XiaoPengPrintStrategy implements IPrintTemplateStrategyService { return day; } - private MesProduceSn generateMesProduceSn(MesPart mesPart, String sn, String userName, Double qty, String format) { + private MesProduceSn generateMesProduceSn(MesPart mesPart, String sn, String userName, Double qty) { MesProduceSn mesProduceSn = new MesProduceSn(); mesProduceSn.setSerialNumber(snowflakeIdMaker.nextId() + ""); mesProduceSn.setProductSn(sn); @@ -176,7 +175,7 @@ public class XiaoPengPrintStrategy implements IPrintTemplateStrategyService { mesProduceSn.setQty(qty); mesProduceSn.setSnStatus(MesExtEnumUtil.PRODUCE_SN_STATUS.CREATE.getValue()); mesProduceSn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue()); - mesProduceSn.setLotNo(TimeTool.getNowTime(format)); + mesProduceSn.setLotNo(TimeTool.getToday()); mesProduceSn.setPrintCount(MesPcnExtConstWords.ONE); mesProduceSn.setPrintStatus(MesExtEnumUtil.PRINT_STATUS.PRINTED.getValue()); mesProduceSn.setOrganizeCode(mesPart.getOrganizeCode()); @@ -191,7 +190,7 @@ public class XiaoPengPrintStrategy implements IPrintTemplateStrategyService { mesProduceSnPrintDataModel.setNo(no); mesProduceSnPrintDataModel.setBarcode(produceSn.getProductSn()); mesProduceSnPrintDataModel.setCustPartNo(custPartNo); - mesProduceSnPrintDataModel.setProductDate(produceSn.getLotNo()); + mesProduceSnPrintDataModel.setProductDate(produceSn.getCreateDatetime()); return mesProduceSnPrintDataModel; }