|
|
|
@ -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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//【非排序线】获取产品加工规则对应的装配件信息 -同时- 关联不可用规则
|
|
|
|
|