From 75d5a9bed7378b6b7360b3ebd67e392f08be614a Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Wed, 24 Jul 2024 14:38:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E7=85=A7=E5=B9=BF=E5=B7=9E=E7=8E=B0?= =?UTF-8?q?=E5=9C=BA=E6=9D=A1=E7=A0=81=E4=BF=AE=E6=94=B9=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../print/strategy/GqxnyPrintStrategy.java | 34 +++++++++++++++------- .../print/strategy/NoSortBarCodeGzStrategy.java | 2 +- .../print/strategy/XiaoPengNewPrintStrategy.java | 2 +- .../print/strategy/XiaoPengPrintStrategy.java | 2 +- 4 files changed, 26 insertions(+), 14 deletions(-) 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 7749f8b..2618ad0 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 @@ -62,7 +62,7 @@ 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 = DateUtil.BASE_FORMAT; + String format = "yyyy/MM/dd"; // 获取工厂名称 String organizeCode = mesProduceSnPrintModel.getOrganizeCode(); MesConfig mesConfig = configService.getMesConfigByCfgCode(MesPcnExtConstWords.ORGANIZE_NAME, organizeCode); @@ -78,10 +78,16 @@ public class GqxnyPrintStrategy implements IPrintTemplateStrategyService { //----广乘 45位 GQXNY //{custPartNo}{SPILTURE}{custCode}{spiltrure}{spiltrule}{year}{serialNo}{spilture}{spiltrule} //客户零件号-扩展位-客户代码-预留位000-产线1-年月日-条码-扩展0000-追溯位+ - //零件长号---17位,不足17位 右边补* + //零件长号---17位,不足17位 右边补- genSerialNoModel.setRuleCode(numberRule.getRuleCode()); - String custPartNoFormat = stringFormat(custPartNo, 17); - genSerialNoModel.setCustPartNo(custPartNoFormat); + /** + * 2024/7/24 + * 按照广州现场条码修改,逻辑由文档中 格式化客户零件号，不满足17位 后边补充 横杠 + * 改为 + * 客户零件号 + 固定三位横杠 + */ + //String custPartNoFormat = stringFormat(custPartNo, 17); + genSerialNoModel.setCustPartNo(custPartNo); //拓展位 2位 00 包含0~9,A~Z 不使用时，补“0”填充 {SPILTRULE} //供应商代码 7位 供应商代码 0~9,A~Z;不足7位 右测补* MesConfig supplierConfig = configService.getMesConfigByCfgCodeKeyOrg(MesPcnExtConstWords.SUPPLIER_CODE, MesExtEnumUtil.MES_PRINT_TEMPLATE.GQXNY.getValue(), organizeCode); @@ -99,12 +105,18 @@ public class GqxnyPrintStrategy implements IPrintTemplateStrategyService { for (int i = 0; i < mesProduceSnPrintModel.getPrintQty(); i++) { ResultBean resultBean = syncFuncService.syncSerialNo(genSerialNoModel, mesProduceSnPrintModel.getUserName(), organizeCode, 1); String sn = resultBean.getResultList().get(0).toString(); - String snPrefix = sn.substring(0, sn.length() - 12); - String snSuffix = sn.substring(sn.length() - 5); - String serialNo = sn.substring(sn.length() - 12, sn.length() - 5); - String serialNo34 = toBase34(Integer.parseInt(serialNo)); - serialNo34 = stringFormat(serialNo34, 4, false, "0"); - sn = snPrefix + serialNo34 + snSuffix; + /** + * 2024/7/24 + * 按照广州现场条码修改,逻辑由文档中 流水码需要转换位34进制 + * 改为 + * 保留十进制 + */ +// String snPrefix = sn.substring(0, sn.length() - 9); +// String snSuffix = sn.substring(sn.length() - 5); + String serialNo = sn.substring(sn.length() - 9, sn.length() - 5); +// String serialNo34 = toBase34(Integer.parseInt(serialNo)); +// serialNo34 = stringFormat(serialNo34, 4, false, "0"); +// sn = snPrefix + serialNo34 + snSuffix; //保存条码信息 MesProduceSn produceSn = generateMesProduceSn(mesPart, sn, mesProduceSnPrintModel.getUserName(), mesProduceSnPrintModel.getQty(), format); //封装打印信息 @@ -154,7 +166,7 @@ public class GqxnyPrintStrategy implements IPrintTemplateStrategyService { } private String stringFormat(String data, Integer length) { - return stringFormat(data, length, true, "*"); + return stringFormat(data, length, true, "-"); } private String stringFormat(String data, Integer length, boolean left, String symbol) { 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 e3d596c..41a8e96 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,7 @@ public class NoSortBarCodeGzStrategy implements IPrintTemplateStrategyService { @Override public MesProduceSnPrintModel execute(GenSerialNoModel genSerialNoModel, MesProduceSnPrintModel mesProduceSnPrintModel, MesNumberRule numberRule,StepResult stepResult, StationRequestBean reqBean,Boolean isStep) { // noSortBarCodeGz - String format = DateUtil.BASE_FORMAT; + String format = "yyyy/MM/dd"; //{partNo}{year}{month}{day}{serialNo} String organizeCode = mesProduceSnPrintModel.getOrganizeCode(); MesPart mesPart = mesPartService.getMesPartByPartNo(mesProduceSnPrintModel.getPartNo(), organizeCode); 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 81de828..a23767f 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 @@ -57,7 +57,7 @@ public class XiaoPengNewPrintStrategy implements IPrintTemplateStrategyService { @Override public MesProduceSnPrintModel execute(GenSerialNoModel genSerialNoModel, MesProduceSnPrintModel mesProduceSnPrintModel, MesNumberRule numberRule, StepResult stepResult, StationRequestBean reqBean, Boolean isStep) { - String format = DateUtil.BASE_FORMAT; + String format = "yyyy/MM/dd"; Date date = new Date(); String organizeCode = mesProduceSnPrintModel.getOrganizeCode(); //gz-xiaopeng 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 0e99e90..c1a8321 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,7 @@ 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; + String format = "yyyy/MM/dd"; Date date = new Date(); String organizeCode = mesProduceSnPrintModel.getOrganizeCode(); //gz-xiaopeng