排产多设备问题修改

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskServiceImpl.java

@@ -318,10 +318,10 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
                     taskList.add(task);
 
                     if (bomProcedure.getProductionresourceList().size() > 0){
-                        Machine machine = new Machine();
-                        CandidateProcess candidateProcess = new CandidateProcess();
-                        for(BomProcedureProductionresource bomProcedureProductionresource : bomProcedure.getProductionresourceList()){
 
+                        for(BomProcedureProductionresource bomProcedureProductionresource : bomProcedure.getProductionresourceList()){
+                            Machine machine = new Machine();
+                            CandidateProcess candidateProcess = new CandidateProcess();
                             // TODO 工艺模板还是需要工序类型，先用名称判断
                             if(bomProcedure.getName().contains("上料") || bomProcedure.getName().contains("下料")){
                                 if("0".equals(stationGaSwitchFlag)){
@@ -425,7 +425,8 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
             machineMap.put("M" + bomProcedureProductionresource.getResourceId(), machine);
         }
 
-        if (!candidateProMap.containsKey(workpiece.getCompleteBatchNo() + "_" + bomProcedure.getNo())) {
+        // 解析判断工件可加工设备
+//        if (!candidateProMap.containsKey(workpiece.getCompleteBatchNo() + "_" + bomProcedure.getNo())) {
             candidateProcess.setMachineId(bomProcedureProductionresource.getResourceId());
             LbqWrapper<BomProcedureProgram> bomProcedureProgramWrapper = new LbqWrapper<BomProcedureProgram>().eq(BomProcedureProgram::getResourceId, bomProcedureProductionresource.getResourceId()).eq(BomProcedureProgram::getProcedureId, bomProcedureProductionresource.getProcedureId());
             List<BomProcedureProgram> bomProcedureProgramList = bomProcedureProgramMapper.selectList(bomProcedureProgramWrapper);
@@ -450,7 +451,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
                 candidateProcesses.add(candidateProcess);
             }
             candidateProMap.put(workpiece.getCompleteBatchNo() + "_" + bomProcedure.getNo(), candidateProcesses);
-        }
+//        }
     }
 
 //    private List<TTask> preHandMatlab(List<TTask> taskList,List<TTask> tList){