|
@@ -323,7 +323,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
|
|
|
Machine machine = new Machine();
|
|
|
CandidateProcess candidateProcess = new CandidateProcess();
|
|
|
// TODO 工艺模板还是需要工序类型,先用名称判断
|
|
|
- if(bomProcedure.getName().contains("上料") || bomProcedure.getName().contains("下料")){
|
|
|
+ if(bomProcedure.getType().contains("上料") || bomProcedure.getType().contains("下料") || bomProcedure.getType().contains("翻面")){
|
|
|
if("0".equals(stationGaSwitchFlag)){
|
|
|
assemblingCandidate(candidateProMap, machineMap, workpiece, candidateProcesses, bomProcedure, machine, candidateProcess, bomProcedureProductionresource);
|
|
|
}else if("1".equals(stationGaSwitchFlag)){
|