bom不生效时，只生成工单不生产装配件及物料清单

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;
                 }
 

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<MesPartSap> 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<MesPartPullDetail> 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<MesPartSap> partSapList = partSapRao.findByHqlWhere(partPackBean);
 
         //5.打散的bom 获取排序加工规则