Merge branch 'mes-uat-changshu0609' into mes-uat-changshu0609-temp-wj-250616-xisu

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProdRuleCfgExtService.java

@@ -84,7 +84,7 @@ public class MesProdRuleCfgExtService implements IMesProdRuleCfgExtService {
     public List<MesProdRuleNosortCfg> getProdRuleNosortCfgList(List<MesProdRuleNosortCfg> prodRuleNosortCfgList, Map<String, List<MesProdRuleIgnoreCfg>> prodRuleIgnoreCfgMap) {
         if (CollectionUtils.isEmpty(prodRuleNosortCfgList) || CollectionUtils.isEmpty(prodRuleIgnoreCfgMap)) return prodRuleNosortCfgList;
         prodRuleNosortCfgList.stream().forEach(o -> o.setProdRuleIgnoreCfg(assemblyExtService.getProdRuleIgnoreCfg(prodRuleIgnoreCfgMap, o.getId(), o.getEquipmentCode(), MesExtEnumUtil.PROD_RULE_IGNORE_DATA_SOURCE.DATA_SOURCE20.getValueStr())));
-        return null;
+        return prodRuleNosortCfgList;
     }
 
     //【非排序线】获取产品加工规则对应的装配件信息 -同时- 关联不可用规则

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CustCodeWhqrPrintStrategy.java

@@ -69,9 +69,6 @@ public class CustCodeWhqrPrintStrategy implements IPrintTemplateStrategyService
         MesCustomerPart customerPart = (!Objects.isNull(genSerialNoModel) && !CollectionUtils.isEmpty(genSerialNoModel.getDataMap()) && genSerialNoModel.getDataMap().containsKey(MesCustomerPart.class.getSimpleName())) ? (MesCustomerPart) genSerialNoModel.getDataMap().get(MesCustomerPart.class.getSimpleName()) : mesCustomerPartService.getMesCustomerPart(organizeCode, mesProduceSnPrintModel.getPartNo());
         numberRule = !Objects.isNull(numberRule) ? numberRule : getMesNumberRule(mesPart);
         String supplierCode = !Objects.isNull(numberRule) && !StringUtil.isEmpty(numberRule.getSpiltRule()) ? numberRule.getSpiltRule().split(MesPcnExtConstWords.COMMA)[2] : "";
-        if (Objects.isNull(customerPart)) {
-            MesPcnException.throwMesBusiException("请检查客户零件信息,零件[%s]客户零件关系未维护", mesProduceSnPrintModel.getPartNo());
-        }
         final String custPartNo = mesCustomerPartService.getCustPartNo(organizeCode, mesProduceSnPrintModel.getPartNo());
         if (StringUtil.isEmpty(custPartNo)) {
             MesPcnException.throwMesBusiException("请检查客户零件信息,零件[%s]客户零件关系未维护", mesProduceSnPrintModel.getPartNo());