feature 修改描述信息

bs-common/src/main/java/com/rongwei/safecommon/utils/SaveConstans.java

@@ -715,14 +715,6 @@ public class SaveConstans {
          */
         public static final String EQ_TIME_CROSS="排程过程中出现相同设备排产时间段有交叉";
 
-        /**
-         * 加工时间冲突描述
-         */
-        public static final String CONFLICTING_PROCESSING_TIMES = "与其他作业加工时间重叠";
-        /**
-         * 设备时间不可用
-         */
-        public static final String DEVICE_TIME_IS_NOT_AVAILABLE ="设备时间不可用";
     }
 
     /**

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

@@ -33,8 +33,8 @@ import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
-import static com.rongwei.safecommon.utils.SaveConstans.ForcedConflictsDescription.CONFLICTING_PROCESSING_TIMES;
-import static com.rongwei.safecommon.utils.SaveConstans.ForcedConflictsDescription.DEVICE_TIME_IS_NOT_AVAILABLE;
+import static com.rongwei.safecommon.utils.SaveConstans.ForcedConflictsDescription.EQ_TIME_CROSS;
+import static com.rongwei.safecommon.utils.SaveConstans.ForcedConflictsDescription.EQUIPMENT_RUN_TIME;
 import static com.rongwei.safecommon.utils.SaveConstans.JobStatus.*;
 import static com.rongwei.safecommon.utils.SaveConstans.LockmarkType.LOCKMARK_N;
 import static com.rongwei.safecommon.utils.SaveConstans.LockmarkType.LOCKMARK_Y;
@@ -403,17 +403,17 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                     changeStartTimeVo.getPlanStartTime(), changeStartTimeVo.getPlanEndTime());
 
             if (!beforeUpdatingConflictId.isEmpty()) {
-                updateProcessEquBeforeAddConflictsDesc(beforeUpdatingConflictId,CONFLICTING_PROCESSING_TIMES);
+                updateProcessEquBeforeAddConflictsDesc(beforeUpdatingConflictId,EQ_TIME_CROSS);
             }
 
             if (!afterTheUpdateConflictId.isEmpty()) {
                 processEquDo.setHasconflict(LOCKMARK_Y);
                 // 更当前工序作业增加新的冲突
-                String newConflictsDesc = addNewConflictsDesc(processEquDo.getConflictdes(), CONFLICTING_PROCESSING_TIMES);
+                String newConflictsDesc = addNewConflictsDesc(processEquDo.getConflictdes(), EQ_TIME_CROSS);
                 processEquDo.setConflictdes(newConflictsDesc);
-                updateProcessEquAfterAddConflictsDesc(afterTheUpdateConflictId,CONFLICTING_PROCESSING_TIMES);
+                updateProcessEquAfterAddConflictsDesc(afterTheUpdateConflictId,EQ_TIME_CROSS);
             }else{
-                String newConflictsDesc = removeConflictsDesc(processEquDo.getConflictdes(), CONFLICTING_PROCESSING_TIMES);
+                String newConflictsDesc = removeConflictsDesc(processEquDo.getConflictdes(), EQ_TIME_CROSS);
                 processEquDo.setConflictdes(newConflictsDesc);
                 processEquDo.setHasconflict(StringUtils.isBlank(processEquDo.getConflictdes()) &&
                         StringUtils.isBlank(processEquDo.getSoftconflictdes()) ?
@@ -496,19 +496,19 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                     apsProcessOperationProcessEquDo.getPlanstartdate(), apsProcessOperationProcessEquDo.getPlanenddate());
 
             if (!beforeUpdatingConflictId.isEmpty()) {
-                updateProcessEquBeforeAddConflictsDesc(beforeUpdatingConflictId,CONFLICTING_PROCESSING_TIMES);
+                updateProcessEquBeforeAddConflictsDesc(beforeUpdatingConflictId,EQ_TIME_CROSS);
             }
 
             if (!afterTheUpdateConflictId.isEmpty()) {
                 apsProcessOperationProcessEquDo.setHasconflict(LOCKMARK_Y);
                 // 更当前工序作业增加新的冲突
-                String newConflictsDesc = addNewConflictsDesc(apsProcessOperationProcessEquDo.getConflictdes(), CONFLICTING_PROCESSING_TIMES);
+                String newConflictsDesc = addNewConflictsDesc(apsProcessOperationProcessEquDo.getConflictdes(), EQ_TIME_CROSS);
                 apsProcessOperationProcessEquDo.setConflictdes(newConflictsDesc);
-                updateProcessEquAfterAddConflictsDesc(afterTheUpdateConflictId,CONFLICTING_PROCESSING_TIMES);
+                updateProcessEquAfterAddConflictsDesc(afterTheUpdateConflictId,EQ_TIME_CROSS);
                 this.updateBatchById(afterTheUpdateConflictId);
             }else{
                 // 更当前工序作业增加新的冲突
-                String newConflictsDesc = removeConflictsDesc(apsProcessOperationProcessEquDo.getConflictdes(), CONFLICTING_PROCESSING_TIMES);
+                String newConflictsDesc = removeConflictsDesc(apsProcessOperationProcessEquDo.getConflictdes(), EQ_TIME_CROSS);
                 apsProcessOperationProcessEquDo.setConflictdes(newConflictsDesc);
                 apsProcessOperationProcessEquDo.setHasconflict(StringUtils.isBlank(apsProcessOperationProcessEquDo.getConflictdes()) &&
                         StringUtils.isBlank(apsProcessOperationProcessEquDo.getSoftconflictdes()) ?
@@ -771,9 +771,9 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                );
         String newConflictdes;
         if(list.isEmpty()){
-            newConflictdes=removeConflictsDesc(processEquDo.getConflictdes(), DEVICE_TIME_IS_NOT_AVAILABLE);
+            newConflictdes=removeConflictsDesc(processEquDo.getConflictdes(), EQUIPMENT_RUN_TIME);
         }else{
-            newConflictdes= addNewConflictsDesc(processEquDo.getConflictdes(), DEVICE_TIME_IS_NOT_AVAILABLE);
+            newConflictdes= addNewConflictsDesc(processEquDo.getConflictdes(), EQUIPMENT_RUN_TIME);
         }
         processEquDo.setConflictdes(newConflictdes);
         processEquDo.setHasconflict(StringUtils.isBlank(newConflictdes) && StringUtils.isBlank(processEquDo.getSoftconflictdes()) ?LOCKMARK_N:LOCKMARK_Y);