From b76a98727bac6d090fe807a72082db606df6280d Mon Sep 17 00:00:00 2001 From: jun Date: Tue, 25 Jun 2024 16:56:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=92=E5=BD=92=E6=9F=A5=E8=AF=A2bom?= =?UTF-8?q?=E6=A0=91=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesDaoImpl.java | 4 ++-- .../i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesDaoImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesDaoImpl.java index 8783528..ac974cb 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesDaoImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesDaoImpl.java @@ -39,8 +39,8 @@ public class MesDaoImpl implements IMesBomDao { @Override public List findBomCodeByPartNoAndBomVersion(String partNo, String bomVersion, String organizeCode) { - StringBuilder sql = new StringBuilder(" select distinct bomCode from MesBom where partNo = :partNo and bomVersion = :bomVersion" + - "and isDeleted=:isDeleted and isValid = :isValid and organizeCode = :organizeCode order by createDatetime desc"); + StringBuilder sql = new StringBuilder(" select distinct bomCode from MesBom where partNo = :partNo and bomVersion = :bomVersion " + + " and isDeleted=:isDeleted and isValid = :isValid and organizeCode = :organizeCode order by createDatetime desc"); Query query = entityManager.createQuery(sql.toString(), String.class); query.setParameter("partNo", partNo); query.setParameter("bomVersion", bomVersion); 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 129d184..d86541b 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 @@ -207,7 +207,7 @@ public class MesBomService extends BaseMesService implements IMesBomServ if (!CollectionUtils.isEmpty(bomList)) { for (MesBom bom : bomList) { if (Objects.equals("X", bom.getPartType())) { - List resultList = findMesBomByPartNoAndBomVersion(bom.getPartNo(), bom.getOrganizeCode(), bom.getBomVersion(), bom.getBomCode(), effStartTime); + List resultList = findMesBomByPartNoAndBomVersion(bom.getItemPartNo(), bom.getOrganizeCode(), bom.getBomVersion(), bom.getBomCode(), effStartTime); bom.setChildTreeList(resultList); recursionBomList(resultList,effStartTime); }