Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp

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

@@ -94,7 +94,7 @@ public class MesAssemblyExtService implements IMesAssemblyExtService {
         if (CollectionUtils.isEmpty(workOrderAssemblyList)) return null;
 
         //获取装配件绑定记录
-        Map<Long, List<MesProductionAssembly>> productionAssemblyMap = groupProductionAssembly(getProductionAssemblyList(prodRuleContext.getOrganizeCode(), prodRuleContext.getProductSn()));
+        Map<Long, List<MesProductionAssembly>> productionAssemblyMap = groupProductionAssembly(getProductionAssemblySortList(prodRuleContext.getOrganizeCode(), prodRuleContext.getProductSn()));
 
         List<MesProductionAssemblySortContext> productionAssemblySortContextList = new ArrayList<>();
 
@@ -280,7 +280,7 @@ public class MesAssemblyExtService implements IMesAssemblyExtService {
 
     //根据装配件清单ID获取装配件绑定记录
     private MesProductionAssembly getProductionAssembly(Map<Long, List<MesProductionAssembly>> productionAssemblyMap, Long id) {
-        return CollectionUtils.isEmpty(productionAssemblyMap) ? null : productionAssemblyMap.get(id).get(0);
+        return (CollectionUtils.isEmpty(productionAssemblyMap) || !productionAssemblyMap.containsKey(id)) ? null : productionAssemblyMap.get(id).get(0);
     }
 
     //获取工位

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesManyCellIsVerificationStepService.java

@@ -24,7 +24,7 @@ import java.util.List;
  **/
 @Slf4j
 @Service("mesManyCellIsVerificationStepService")
-public class MesManyCellNoticeNextStepService extends BaseStepService {
+public class MesManyCellIsVerificationStepService extends BaseStepService {
 
     @Autowired
     private IMesProdOrgExtService prodOrgExtService;