From e73b501e70aec0231287707d5e8b2ecc0de17d75 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 12 Jun 2025 10:17:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=93=E5=8C=85=20=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E8=A7=84=E5=88=99=20=E7=AD=96=E7=95=A5=E5=8F=98=E6=9B=B4=20?= =?UTF-8?q?=E6=B5=81=E6=B0=B4=E5=8F=B7=E9=80=92=E5=A2=9E=E4=B8=8D=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E9=9B=B6=E4=BB=B6=E7=BB=B4=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/numberrule/YfaiPackageNumberRuleStrategyService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/YfaiPackageNumberRuleStrategyService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/YfaiPackageNumberRuleStrategyService.java index 073d2c0..1a0abc7 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/YfaiPackageNumberRuleStrategyService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/YfaiPackageNumberRuleStrategyService.java @@ -33,7 +33,7 @@ public class YfaiPackageNumberRuleStrategyService implements INumberRulePackAttr //| {SPILTRULE} //C901 {ORG} //| {SPILTRULE} -//401007574AAABN {PARTNO} +//401007574AAABN {PARTNO} ----- 20250612调整 wms会扫描 packageOneCode, 这个里面没有零件号, 所以变更 此段内容 为 {DYNAMICRULE} //| {SPILTRULE} //9.0 {DYNAMICRULE} 标包 一位小数 //| {SPILTRULE} @@ -45,6 +45,7 @@ public class YfaiPackageNumberRuleStrategyService implements INumberRulePackAttr //| {SPILTRULE} private final static String DR_QTY = "DR_QTY"; + private final static String DR_PARTNO = "DR_PARTNO"; @Override public GenSerialNoModel execute(GenSerialNoModel genSerialNoModel) { @@ -59,6 +60,7 @@ public class YfaiPackageNumberRuleStrategyService implements INumberRulePackAttr genSerialNoModel.setDynamicRule( new StringJoiner(MesPcnExtConstWords.COMMA) .add(((new SimpleDateFormat(MesPcnExtConstWords.DATE_FORMAT_SHORT)).format(new Date()))) + .add(DR_PARTNO) //.add(String.format("%.1f", qty)) .add(DR_QTY) .add(unit) @@ -87,6 +89,7 @@ public class YfaiPackageNumberRuleStrategyService implements INumberRulePackAttr Double qty = (!CollectionUtils.isEmpty(dataMap) && dataMap.containsKey(MesPcnExtConstWords.QTY)) ? (Double) dataMap.get(MesPcnExtConstWords.QTY) : null; if (StringUtils.isEmpty(qty)) qty = null != packageRuleContext ? packageRuleContext.getPackSpecQty() : new Double(1); serialNo = serialNo.replace(DR_QTY, String.format("%.1f", qty)); + serialNo = serialNo.replace(DR_PARTNO, genSerialNoModel.getPartNo()); genSerialNoModel.putDataMap(serialNo, packageOneCode); return serialNo; } From ece6e4f88dd5a2a1c7477b5d92d2ba6006d66fa8 Mon Sep 17 00:00:00 2001 From: jason Date: Thu, 12 Jun 2025 11:02:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=88=90=E9=83=BD?= =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E7=AB=AF=E6=89=93=E5=8D=B0DataMatrix?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../print/strategy/ChengDuSplitFixCharPrintStrategy.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/ChengDuSplitFixCharPrintStrategy.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/ChengDuSplitFixCharPrintStrategy.java index e2a2358..5b7b2a7 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/ChengDuSplitFixCharPrintStrategy.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/ChengDuSplitFixCharPrintStrategy.java @@ -77,7 +77,7 @@ public class ChengDuSplitFixCharPrintStrategy implements IPrintTemplateStrategyS MesProduceSnPrintDataModel printDataModel = getModel(produceSn, custPartNo); mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().clear(); mesProduceSnPrintModel.getMesProduceSnList().add(produceSn); - Map printTemplateData = new HashMap<>(getPrintContextMap(produceSn, custPartNo)); + Map printTemplateData = new HashMap<>(getPrintContextMap(produceSn, custPartNo, isStep)); mesProduceSnPrintModel.getPrintContextList().add(printTemplateData); //保存打印记录 mesProduceSnPrintModel.getMesPrintedSnLogList().add(mesPrintedSnLogService.getMesCustomPrintedSnLog(mesProduceSnPrintModel.getUserName(), organizeCode, printDataModel, printTemplateData)); @@ -87,7 +87,7 @@ public class ChengDuSplitFixCharPrintStrategy implements IPrintTemplateStrategyS //封装打印信息 MesProduceSnPrintDataModel printDataModel = getModel(mesProduceSn, custPartNo); mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().clear(); - Map printTemplateData = new HashMap<>(getPrintContextMap(mesProduceSn, custPartNo)); + Map printTemplateData = new HashMap<>(getPrintContextMap(mesProduceSn, custPartNo, isStep)); List> printDataMapList = new ArrayList<>(); printDataMapList.add(printTemplateData); mesProduceSnPrintModel.getPrintContextList().add(packResultMap(mesProduceSnPrintModel, printDataMapList)); @@ -131,7 +131,7 @@ public class ChengDuSplitFixCharPrintStrategy implements IPrintTemplateStrategyS return mesProduceSnPrintDataModel; } - private Map getPrintContextMap(MesProduceSn produceSn, String custPartNo) { + private Map getPrintContextMap(MesProduceSn produceSn, String custPartNo, boolean isStep) { Map result = new HashMap<>(); String[] splitSn = produceSn.getProductSn().split("#"); if (splitSn.length < 3) { @@ -173,7 +173,11 @@ public class ChengDuSplitFixCharPrintStrategy implements IPrintTemplateStrategyS log.error("ChengDuSplitFixCharPrintStrategy --- execute --- 报错:{}", e.getMessage()); return result; } - result.put(MesPcnExtConstWords.CUST_SN_DATA_MATRIX, "data:image/jpeg;base64," + Base64.getEncoder().encodeToString(dataMatrixCode.toByteArray())); + String encoderCode = Base64.getEncoder().encodeToString(dataMatrixCode.toByteArray()); + if (!isStep) { + encoderCode = "data:image/jpeg;base64," + encoderCode; + } + result.put(MesPcnExtConstWords.CUST_SN_DATA_MATRIX, encoderCode); return result; }