退火调度排程优化

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/service/impl/DdApsServiceImpl.java

@@ -1036,17 +1036,17 @@ public class DdApsServiceImpl implements DdApsService {
             for (ProductionProcesses process : orderpss) {
                 if("成退".equals(process.getProcessType()) || "中退".equals(process.getProcessType()) || "小卷成退".equals(process.getProcessType())){
                     // 锁定的不参与合并
-                    /*if(process.getIfLock()){
+                    if(process.getIfLock()){
                         mergeprocesses.add(process);
-                    }else{*/
-                    String bsproid = process.getBsProcessesId().get(0);
-                    List<ProductionProcesses> bsprocess = thproMap.get(bsproid);
-                    if(bsprocess == null){
-                        bsprocess = new ArrayList<>();
+                    }else{
+                        String bsproid = process.getBsProcessesId().get(0);
+                        List<ProductionProcesses> bsprocess = thproMap.get(bsproid);
+                        if(bsprocess == null){
+                            bsprocess = new ArrayList<>();
+                        }
+                        bsprocess.add(process);
+                        thproMap.put(bsproid,bsprocess);
                     }
-                    bsprocess.add(process);
-                    thproMap.put(bsproid,bsprocess);
-//                    }
                 }else{
                     mergeprocesses.add(process);
 
@@ -1070,6 +1070,9 @@ public class DdApsServiceImpl implements DdApsService {
                         if(equipments != null && equipments.size()>0){
                             Equipment equipment = equipments.get(0);
                             // 根据承重计算最大几卷
+                            if(equipment.getEquipmentParameter().getEquipmentBearing() == null || v.get(0).getSinglerollweight() == null){
+                                int a = 1;
+                            }
                             int a = equipment.getEquipmentParameter().getEquipmentBearing().divide(v.get(0).getSinglerollweight(), 2, RoundingMode.HALF_UP).intValue();
                             // 根据宽度计算最大几卷
                             if("成退".equals(v.get(0).getProcessType()) || "中退".equals(v.get(0).getProcessType())){