From 1d346854cc225bfff196c48c0702aee3128f6b3c Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Wed, 12 Mar 2025 22:10:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?45631=20=E5=B9=BF=E5=B7=9E=E6=9C=892?= =?UTF-8?q?=E5=A5=97=E4=B8=8D=E5=90=8C=E7=94=9F=E4=BA=A7=E7=89=88=E6=9C=AC?= =?UTF-8?q?bom=E5=AF=BC=E8=87=B4=E5=A4=9A=E6=8A=A5=E5=B7=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/serviceimpl/base/MesBomService.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java index 993d5d1..dc2d534 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java @@ -177,14 +177,8 @@ public class MesBomService extends BaseMesService implements IMesBomServ if (CollectionUtils.isEmpty(mesBoms)) { MesException.throwMesBusiException("物料【%s】生产版本【%s】对应bom信息不存在", partNo, bomVersion); } - MesBom mesBom = mesBoms.get(0); - String bomCode = mesBom.getBomCode(); - String effStartTime = mesBom.getEffStartTime(); - DdlPackBean ddlPackBean1= DdlPackBean.getDdlPackBean(organizeCode); - DdlPreparedPack.getStringEqualPack(partNo, MesExtConstWords.PART_NO, ddlPackBean1); - DdlPreparedPack.getStringEqualPack(bomCode, MesExtConstWords.BOM_CODE, ddlPackBean1); - DdlPreparedPack.getStringSmallerPack(effStartTime, MesExtConstWords.EFF_START_TIME, ddlPackBean1); - return baseRDao.findByHqlWhere(ddlPackBean1); + + return mesBoms; } @Override From c2c9b5bc753c61831c19e477fab342bb98295a40 Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Thu, 13 Mar 2025 16:50:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?45631=20=E5=B9=BF=E5=B7=9E=E6=9C=892?= =?UTF-8?q?=E5=A5=97=E4=B8=8D=E5=90=8C=E7=94=9F=E4=BA=A7=E7=89=88=E6=9C=AC?= =?UTF-8?q?bom=E5=AF=BC=E8=87=B4=E5=A4=9A=E6=8A=A5=E5=B7=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java index dc2d534..f385cf3 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java @@ -173,7 +173,7 @@ public class MesBomService extends BaseMesService implements IMesBomServ DdlPreparedPack.getStringSmallerPack(TimeTool.getNowTime(true), MesExtConstWords.EFF_START_TIME, ddlPackBean); if (isWithEffEndTime) DdlPreparedPack.getStringBiggerPack(TimeTool.getNowTime(true), MesExtConstWords.EFF_END_TIME, ddlPackBean); DdlPreparedPack.getOrderBy(MesExtConstWords.EFF_START_TIME, CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), ddlPackBean); - List mesBoms = baseRDao.findByHqlTopWhere(ddlPackBean,1); + List mesBoms = baseRDao.findByHqlWhere(ddlPackBean); if (CollectionUtils.isEmpty(mesBoms)) { MesException.throwMesBusiException("物料【%s】生产版本【%s】对应bom信息不存在", partNo, bomVersion); } From c99e80085dc8f743a0541f38d974e81bda63f73c Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Thu, 13 Mar 2025 16:52:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?45631=20=E5=B9=BF=E5=B7=9E=E6=9C=892?= =?UTF-8?q?=E5=A5=97=E4=B8=8D=E5=90=8C=E7=94=9F=E4=BA=A7=E7=89=88=E6=9C=AC?= =?UTF-8?q?bom=E5=AF=BC=E8=87=B4=E5=A4=9A=E6=8A=A5=E5=B7=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java index f385cf3..704a8a2 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java @@ -177,7 +177,6 @@ public class MesBomService extends BaseMesService implements IMesBomServ if (CollectionUtils.isEmpty(mesBoms)) { MesException.throwMesBusiException("物料【%s】生产版本【%s】对应bom信息不存在", partNo, bomVersion); } - return mesBoms; }