From f72dbdeef42e32d760912ccd2399d652bd551ee7 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Thu, 14 Nov 2024 16:05:16 +0800 Subject: [PATCH] =?UTF-8?q?bom=E4=B8=8D=E7=94=9F=E6=95=88=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E7=94=9F=E6=88=90=E5=B7=A5=E5=8D=95=E4=B8=8D?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=A3=85=E9=85=8D=E4=BB=B6=E5=8F=8A=E7=89=A9?= =?UTF-8?q?=E6=96=99=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/roundness/MesPackageRoundnessService.java | 8 ++++---- .../serviceimpl/busi/MesSortRuleCfgOfflineServiceImpl.java | 13 ++++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java index 0ca8e34..29044cd 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java @@ -186,13 +186,13 @@ public class MesPackageRoundnessService implements IRoundnessStrategy { } /** * 2024/11/14 - * 生产零件号用于拆分bom - * 零件号是erp零件号 + * 不带z的零件号是装配费 + * 零件号带z是erp零件号 生产零件号 */ - MesPartSap mesPart = this.getMesPart(mesPartProdGroupDetail.getPartNo(), partProdGroup.getOrganizeCode()); + MesPartSap mesPart = this.getMesPart(mesPartProdGroupDetail.getProductPartNo(), partProdGroup.getOrganizeCode()); if (mesPart == null) { - log.info("{}工厂没有,零件:{}信息", partProdGroup.getOrganizeCode(), mesPartProdGroupDetail.getPartNo()); + log.info("{}工厂没有,零件:{}信息", partProdGroup.getOrganizeCode(), mesPartProdGroupDetail.getProductPartNo()); return; } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSortRuleCfgOfflineServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSortRuleCfgOfflineServiceImpl.java index a5c5049..a6caee2 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSortRuleCfgOfflineServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSortRuleCfgOfflineServiceImpl.java @@ -80,7 +80,7 @@ public class MesSortRuleCfgOfflineServiceImpl implements IMesSortRuleCfgOfflineS @Override public void doCreateSortRuleOffline(String custPartNo, String erpPartNo, String productPartNo, String organizeCode, MesPartProdGroup mesPartProdGroup, MesPartProdGroupDetail detail) { - MesProductVersion mesProductVersion = getMesProductVersion(erpPartNo, organizeCode); + MesProductVersion mesProductVersion = getMesProductVersion(productPartNo, organizeCode); //4.总成零件号打散bom String bomVersion = mesProductVersion.getAlternativePartList(); MesBom bom = mesBomService.findBom(organizeCode, bomVersion, productPartNo); @@ -88,6 +88,9 @@ public class MesSortRuleCfgOfflineServiceImpl implements IMesSortRuleCfgOfflineS return; } //5.5 获取客户零件号对应的车型配置 + /** + * 客户零件号 对应的 erp零件号 不带z + */ MesCustomerPart mesCustomerPart = getMesCustomerPart(custPartNo, erpPartNo, organizeCode); if (mesCustomerPart == null) { return; @@ -102,7 +105,7 @@ public class MesSortRuleCfgOfflineServiceImpl implements IMesSortRuleCfgOfflineS } //5.6 获取零件信息 DdlPackBean partPackBean = DdlPackBean.getDdlPackBean(organizeCode); - DdlPreparedPack.getStringEqualPack(erpPartNo,"partNo", partPackBean); + DdlPreparedPack.getStringEqualPack(productPartNo,"partNo", partPackBean); List partSapList = partSapRao.findByHqlWhere(partPackBean); //7.获取车型 @@ -147,10 +150,10 @@ public class MesSortRuleCfgOfflineServiceImpl implements IMesSortRuleCfgOfflineS @Override public void doCreatePullOffline(String custPartNo, String erpPartNo,String productPartNo, String organizeCode, MesPartProdGroup mesPartProdGroup, MesPartProdGroupDetail detail, MesPartPull partPull, List pullDetailList) { - MesProductVersion mesProductVersion = getMesProductVersion(erpPartNo, organizeCode); + MesProductVersion mesProductVersion = getMesProductVersion(productPartNo, organizeCode); //4.总成零件号打散bom String bomVersion = mesProductVersion.getAlternativePartList(); - MesBom bom = mesBomService.findBom(organizeCode, bomVersion, erpPartNo); + MesBom bom = mesBomService.findBom(organizeCode, bomVersion, productPartNo); if (bom == null) { return; } @@ -161,7 +164,7 @@ public class MesSortRuleCfgOfflineServiceImpl implements IMesSortRuleCfgOfflineS } //5.6 获取零件信息 DdlPackBean partPackBean = DdlPackBean.getDdlPackBean(organizeCode); - DdlPreparedPack.getStringEqualPack(erpPartNo,"partNo", partPackBean); + DdlPreparedPack.getStringEqualPack(productPartNo,"partNo", partPackBean); List partSapList = partSapRao.findByHqlWhere(partPackBean); //5.打散的bom 获取排序加工规则