From 44a3b7c7ded8e5dc8a0a24d1903954b3ea40a9a7 Mon Sep 17 00:00:00 2001 From: jason Date: Mon, 17 Feb 2025 09:37:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=94=9F=E6=88=90=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustPartSnNumberRuleStrategyService.java | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/CustPartSnNumberRuleStrategyService.java diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/CustPartSnNumberRuleStrategyService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/CustPartSnNumberRuleStrategyService.java new file mode 100644 index 0000000..99d1593 --- /dev/null +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/CustPartSnNumberRuleStrategyService.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.numberrule; + +import cn.estsh.i3plus.ext.mes.pcn.apiservice.util.MesPcnException; +import cn.estsh.i3plus.mes.pcn.api.iservice.base.IPartService; +import cn.estsh.i3plus.mes.pcn.api.iservice.busi.INumberRulePackAttributeStrategyService; +import cn.estsh.i3plus.platform.common.tool.TimeTool; +import cn.estsh.i3plus.pojo.mes.bean.MesPart; +import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel; +import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; +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.Date; +import java.util.Map; + +@Component +public class CustPartSnNumberRuleStrategyService implements INumberRulePackAttributeStrategyService { + @Autowired + private IPartService partService; + + @Override + public GenSerialNoModel execute(GenSerialNoModel genSerialNoModel) { + if (null == genSerialNoModel) { + MesPcnException.throwBusiException("入参缺少[GenSerialNoModel]!"); + } + + Map dataMap = genSerialNoModel.getDataMap(); + MesPart part = (!CollectionUtils.isEmpty(dataMap) && dataMap.containsKey(MesPart.class.getSimpleName())) ? + (MesPart)dataMap.get(MesPart.class.getSimpleName()) : partService.getPartByNo(genSerialNoModel.getOrganizeCode(), genSerialNoModel.getPartNo()); + if (null == part) { + MesPcnException.throwBusiException("请检查零件信息,零件号[%s]信息不存在!", genSerialNoModel.getPartNo()); + } + if (StringUtils.isEmpty(part.getPartSnParam())) { + MesPcnException.throwBusiException("请检查零件信息,零件号[%s]未维护零件条码参数!", part.getPartNo()); + } + + genSerialNoModel.partSnParam(part.getPartSnParam()); + //年月日缩写 + Date date = new Date(); + genSerialNoModel.setYear(getYearShort(date)); + genSerialNoModel.setMonth(getMonthShort(date)); + genSerialNoModel.setDay(getDayShort(date)); + return genSerialNoModel; + } + + private String getYearShort(Date date) { + return MesExtEnumUtil.YEAR_SHORT.valueOfDescription(Integer.parseInt(TimeTool.getYear(date))); + } + + private String getMonthShort(Date date) { + return MesExtEnumUtil.MONTH_SHORT.valueOfDescription(Integer.parseInt(TimeTool.getMonth(date))); + } + + private String getDayShort(Date date) { + return MesExtEnumUtil.DAY_SHORT.valueOfDescription(Integer.parseInt(TimeTool.getDay(date))); + } +} From 76f10afa8076948b43f3a4ffd651985f28e23f56 Mon Sep 17 00:00:00 2001 From: jason Date: Wed, 5 Mar 2025 10:22:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E8=A7=84=E5=88=99=E7=9A=84=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E5=8F=82=E6=95=B0=E5=8D=A1=E6=8E=A7=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/numberrule/CustPartSnNumberRuleStrategyService.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/CustPartSnNumberRuleStrategyService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/CustPartSnNumberRuleStrategyService.java index 99d1593..e82842f 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/CustPartSnNumberRuleStrategyService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/CustPartSnNumberRuleStrategyService.java @@ -32,9 +32,6 @@ public class CustPartSnNumberRuleStrategyService implements INumberRulePackAttri if (null == part) { MesPcnException.throwBusiException("请检查零件信息,零件号[%s]信息不存在!", genSerialNoModel.getPartNo()); } - if (StringUtils.isEmpty(part.getPartSnParam())) { - MesPcnException.throwBusiException("请检查零件信息,零件号[%s]未维护零件条码参数!", part.getPartNo()); - } genSerialNoModel.partSnParam(part.getPartSnParam()); //年月日缩写