连续约束规则变更

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -750,16 +750,8 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                                         equipment.setLastProcessType(lastop.getProcess());
                                         equipment.setLastProcessEndTime(lastpro.getPlanenddate());
                                         equipment.setLastProcessCutfinishmin(lastop.getCutfinishmin() == null ? null : lastop.getCutfinishmin().intValue());
-                                        // 铸轧
-                                        if ("铸轧".equals(lastop.getProcess())) {
-                                            // 合金+宽度
-                                            equipment.setLastSeriesProduceMark(lastop.getMetal() + "^_^" + lastop.getProwidth());
-                                        }
-                                        // 冷轧
-                                        else if ("冷轧".equals(lastop.getProcess())) {
-                                            // 合金+输入物料+宽度
-                                            equipment.setLastSeriesProduceMark(lastop.getMetal() + "^_^" + lastop.getPlaninput() + "^_^" + lastop.getProwidth());
-                                        }
+                                        // 合金+输入物料+宽度
+                                        equipment.setLastSeriesProduceMark(lastop.getMetal() + "^_^" + lastop.getPlaninput() + "^_^" + lastop.getProwidth());
                                         equipment.setLastProcessCutfinishmin(lastop.getCutfinishmin() == null ? null : lastop.getCutfinishmin().intValue());
                                     }
                                     // 查询相关工序作业
@@ -785,16 +777,8 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                                                 if (pos != null && pos.size() > 0) {
                                                     ApsProcessOperationDo processesDo = pos.get(0);
                                                     er.setProcessType(processesDo.getProcess());
-                                                    // 铸轧
-                                                    if ("铸轧".equals(processesDo.getProcess())) {
-                                                        // 合金+宽度
-                                                        er.setSeriesProduceMark(operationDo.getMetal() + "^_^" + operationDo.getProwidth());
-                                                    }
-                                                    // 冷轧
-                                                    else if ("冷轧".equals(processesDo.getProcess())) {
-                                                        // 合金+输入物料+宽度
-                                                        er.setSeriesProduceMark(operationDo.getMetal() + "^_^" + operationDo.getPlaninput() + "^_^" + operationDo.getProwidth());
-                                                    }
+                                                    // 合金+输入物料+宽度
+                                                    er.setSeriesProduceMark(operationDo.getMetal() + "^_^" + operationDo.getPlaninput() + "^_^" + operationDo.getProwidth());
                                                     er.setPrepressworkmin(processesDo.getPrepressworkmin() == null ? null : processesDo.getPrepressworkmin().intValue());
                                                     er.setCutfinishmin(processesDo.getCutfinishmin() == null ? null : processesDo.getCutfinishmin().intValue());
                                                 }
@@ -938,16 +922,8 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                             processes.setNextProcessesIds(Arrays.asList(operationDo.getNextprocessid().split(",")));
                         }
                         // 连续生产标识设置
-                        // 铸轧
-                        if ("铸轧".equals(processes.getProcessType())) {
-                            // 合金+宽度
-                            processes.setSeriesProduceMark(operationDo.getMetal() + "^_^" + operationDo.getProwidth());
-                        }
-                        // 冷轧
-                        else if ("冷轧".equals(processes.getProcessType())) {
-                            // 合金+输入物料+宽度
-                            processes.setSeriesProduceMark(operationDo.getMetal() + "^_^" + operationDo.getPlaninput() + "^_^" + operationDo.getProwidth());
-                        }
+                        // 合金+输入物料+宽度
+                        processes.setSeriesProduceMark(operationDo.getMetal() + "^_^" + operationDo.getPlaninput() + "^_^" + operationDo.getProwidth());
                         processes.setPrepressworkmin(operationDo.getPrepressworkmin() == null ? null : operationDo.getPrepressworkmin().intValue());
                         processes.setCutfinishmin(operationDo.getCutfinishmin() == null ? null : operationDo.getCutfinishmin().intValue());
                         // 锁定的作业加上锁定标识