From 1e010f0b71d79a8c6b98aca497064b37c64a3af3 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 28 Nov 2024 17:40:50 +0800 Subject: [PATCH] =?UTF-8?q?pcn=20=E6=AD=A6=E6=B1=89=20=E9=9D=9E=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=20=E7=94=9F=E4=BA=A7=E9=80=9A=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E5=8D=95=E4=BB=B6=E6=9D=A1=E7=A0=81=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=20=E7=94=9F=E6=88=90=E5=90=8E=E5=86=8D?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MesNoSortCustSnNumberRuleStrategyService.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/MesNoSortCustSnNumberRuleStrategyService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/MesNoSortCustSnNumberRuleStrategyService.java index 6f9e8ab..fd0c4ce 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/MesNoSortCustSnNumberRuleStrategyService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/MesNoSortCustSnNumberRuleStrategyService.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.numberrule; import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesCustomerPartService; +import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesCustomerSnTransformService; import cn.estsh.i3plus.ext.mes.pcn.apiservice.util.MesPcnException; import cn.estsh.i3plus.mes.pcn.api.iservice.busi.INumberRulePackAttributeStrategyService; import cn.estsh.i3plus.pojo.mes.bean.MesCustomerPart; @@ -8,6 +9,7 @@ import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import java.util.Calendar; import java.util.Date; @@ -24,13 +26,16 @@ import java.util.Map; public class MesNoSortCustSnNumberRuleStrategyService implements INumberRulePackAttributeStrategyService { @Autowired - private IMesCustomerPartService mesCustomerPartService; + private IMesCustomerPartService customerPartService; + + @Autowired + private IMesCustomerSnTransformService customerSnTransformService; @Override public GenSerialNoModel execute(GenSerialNoModel genSerialNoModel) { Map dataMap = genSerialNoModel.getDataMap(); MesCustomerPart customerPart = (!CollectionUtils.isEmpty(dataMap) && dataMap.containsKey(MesCustomerPart.class.getSimpleName())) ? - (MesCustomerPart)dataMap.get(MesCustomerPart.class.getSimpleName()) : mesCustomerPartService.getMesCustomerPart(genSerialNoModel.getOrganizeCode(), genSerialNoModel.getPartNo()); + (MesCustomerPart)dataMap.get(MesCustomerPart.class.getSimpleName()) : customerPartService.getMesCustomerPart(genSerialNoModel.getOrganizeCode(), genSerialNoModel.getPartNo()); if (null != customerPart) { genSerialNoModel.setCustPartNo(customerPart.getCustPartNo()); }else { @@ -47,4 +52,11 @@ public class MesNoSortCustSnNumberRuleStrategyService implements INumberRulePack genSerialNoModel.setDay(String.format("%03d",custCalendar.get(Calendar.DAY_OF_YEAR))); return genSerialNoModel; } + + @Override + public String transform(String serialNo) { + if (StringUtils.isEmpty(serialNo)) return serialNo; + return customerSnTransformService.transformBarCodeGm(serialNo); + } + }