排程提示信息优化

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/controller/ApsSchedulingController.java

@@ -39,6 +39,8 @@ public class ApsSchedulingController {
             productionScheduleRetVo.setCode("500");
             productionScheduleRetVo.setMsg(ae.getMessage());
         }catch(Exception e){
+            e.printStackTrace();
+            log.error("排程平台异常：",e);
             productionScheduleRetVo = new ProductionScheduleRetVo();
             productionScheduleRetVo.setCode("500");
             productionScheduleRetVo.setMsg("排程异常，请联系管理员");

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/score/ApsConstraintProvider.java

@@ -516,8 +516,8 @@ public class ApsConstraintProvider implements ConstraintProvider {
                             pp.setEndTime(equipmentRunTime.getEndRunTime());
                             pp.setSeriesProduceMark(equipmentRunTime.getSeriesProduceMark());
                             pp.setProcessType(equipmentRunTime.getProcessType());
-                            pp.setPrepressworkmin(equipmentRunTime.getPrepressworkmin());
-                            pp.setCutfinishmin(equipmentRunTime.getCutfinishmin());
+                            pp.setPrepressworkmin(equipmentRunTime.getPrepressworkmin() == null ? 0 : equipmentRunTime.getPrepressworkmin());
+                            pp.setCutfinishmin(equipmentRunTime.getCutfinishmin() == null ? 0 : equipmentRunTime.getCutfinishmin());
                             hasStartTimeProcess.add(pp);
                         }
                     }
@@ -530,7 +530,7 @@ public class ApsConstraintProvider implements ConstraintProvider {
                             ProductionProcesses pp = new ProductionProcesses();
                             pp.setSeriesProduceMark(equipment.getLastSeriesProduceMark());
                             pp.setProcessType(equipment.getLastProcessType());
-                            pp.setCutfinishmin(equipment.getLastProcessCutfinishmin());
+                            pp.setCutfinishmin(equipment.getLastProcessCutfinishmin() == null ? 0 : equipment.getLastProcessCutfinishmin());
                             pp.setEndTime(equipment.getLastProcessEndTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
                             hasStartTimeProcess.add(0,pp);
                         }
@@ -597,8 +597,8 @@ public class ApsConstraintProvider implements ConstraintProvider {
                             pp.setEndTime(equipmentRunTime.getEndRunTime());
                             pp.setSeriesProduceMark(equipmentRunTime.getSeriesProduceMark());
                             pp.setProcessType(equipmentRunTime.getProcessType());
-                            pp.setPrepressworkmin(equipmentRunTime.getPrepressworkmin());
-                            pp.setCutfinishmin(equipmentRunTime.getCutfinishmin());
+                            pp.setPrepressworkmin(equipmentRunTime.getPrepressworkmin() == null ? 0 : equipmentRunTime.getPrepressworkmin());
+                            pp.setCutfinishmin(equipmentRunTime.getCutfinishmin() == null ? 0 : equipmentRunTime.getCutfinishmin());
                             hasStartTimeProcess.add(pp);
                         }
                     }
@@ -609,7 +609,7 @@ public class ApsConstraintProvider implements ConstraintProvider {
                         ProductionProcesses pp = new ProductionProcesses();
                         pp.setSeriesProduceMark(equipment.getLastSeriesProduceMark());
                         pp.setProcessType(equipment.getLastProcessType());
-                        pp.setCutfinishmin(equipment.getLastProcessCutfinishmin());
+                        pp.setCutfinishmin(equipment.getLastProcessCutfinishmin() == null ? 0 : equipment.getLastProcessCutfinishmin());
                         pp.setEndTime(equipment.getLastProcessEndTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
                         hasStartTimeProcess.add(0,pp);
                     }