约束冲突描述调整

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/util/ApsConstants.java

@@ -14,15 +14,15 @@ public class ApsConstants {
     public final static List<String> hardConstraint = new ArrayList<>();
 
     static {
-        constraintDesc.put("eqTypeSame","工序作业所需的设备必须在工序的可选设备之内");
-        constraintDesc.put("noPreGbAfterNow","第一步工序作业要小于开始排程时间");
-        constraintDesc.put("hasOnePreGbAfterNow","当前工序作业开始时间违反上一步工序作业最大等待时间限制");
-        constraintDesc.put("equipmentRunTime","设备已排产时间段不可排产其它工序作业");
-        constraintDesc.put("lzTimeLessMaxWait","上一工序作业流转时间不能大于上一工序作业最大等待时间");
-        constraintDesc.put("eqTimeCross","排程过程中出现相同设备排产时间段有交叉");
-        constraintDesc.put("seriesProduceTimeWait","非连续生产时间差不满足上机准备时间和下机收尾时间");
-        constraintDesc.put("deliveryDate","订单交货期不满足");
-        constraintDesc.put("seriesProduce","订单的连续生产要求不满足");
+        constraintDesc.put("eqTypeSame","加工设备不是工艺要求的可选设备");
+        constraintDesc.put("noPreGbAfterNow","{开始排程时间}之前不可再排程");
+        constraintDesc.put("hasOnePreGbAfterNow","开工时间超出上道工序作业最大等待时间限制");
+        constraintDesc.put("equipmentRunTime","加工设备该加工时间段不可用");
+        constraintDesc.put("lzTimeLessMaxWait","作业流转时间超出上道工序作业最大等待时间限制");
+        constraintDesc.put("eqTimeCross","与加工设备其他作业加工时间重叠");
+        constraintDesc.put("seriesProduceTimeWait","没有预留足够的上机准备时间和下机收尾时间");
+        constraintDesc.put("deliveryDate","不满足订单交货期");
+        constraintDesc.put("seriesProduce","与上道工序作业不能连续生产");
 
         hardConstraint.add("eqTypeSame");
         hardConstraint.add("noPreGbAfterNow");