From 7ea9817b277d642a68884069374445c60ae3a5a2 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 20 Jan 2025 14:19:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/print/strategy/WuhuPackageNoPrintStrategy.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/WuhuPackageNoPrintStrategy.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/WuhuPackageNoPrintStrategy.java index 63318e3..4740beb 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/WuhuPackageNoPrintStrategy.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/WuhuPackageNoPrintStrategy.java @@ -92,7 +92,15 @@ public class WuhuPackageNoPrintStrategy implements IPrintTemplateStrategyService resultMap.put(MesPcnExtConstWords.LOT_NO, packageDb.getLotNo().replaceAll(MesPcnExtConstWords.SEPARATOR, MesPcnExtConstWords.SLANT_R)); // YFWHU|YFNSC901C241223042722|C901|401007574AAABN|9.0|EA|C901|20241223| // YFNSC901C241223042722 截取原始条码的 第7位到27位 - resultMap.put(MesPcnExtConstWords.BAR_CODE, packageDb.getPackageNo().length() >= 27 ? packageDb.getPackageNo().substring(6, 27) : packageDb.getPackageNo()); +// resultMap.put(MesPcnExtConstWords.BAR_CODE, packageDb.getPackageNo().length() >= 27 ? packageDb.getPackageNo().substring(6, 27) : packageDb.getPackageNo()); + try { + //截取前2个 "|" 之间的字符串 + Integer indexVerticalBar = packageDb.getPackageNo().indexOf(MesPcnExtConstWords.VERTICAL_BAR) + 1; + resultMap.put(MesPcnExtConstWords.BAR_CODE, packageDb.getPackageNo().substring(indexVerticalBar, packageDb.getPackageNo().indexOf(MesPcnExtConstWords.VERTICAL_BAR, indexVerticalBar))); + } catch (Exception e) { + resultMap.put(MesPcnExtConstWords.BAR_CODE, packageDb.getPackageNo()); + } + resultMap.put(MesPcnExtConstWords.MODIFY_DATE_TIME, packageDb.getModifyDatetime().replaceAll(MesPcnExtConstWords.SEPARATOR, MesPcnExtConstWords.SLANT_R)); model.getMesPrintedSnLogList().add(getMesPrintedSnLog(packageDb, model.getUserName(), JSONObject.toJSONString(resultMap))); return resultMap;