feature 修改清空冲突的逻辑

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

@@ -566,7 +566,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         updateConflictVos.forEach(data -> {
             ApsProcessOperationProcessEquDo apsProcessOperationProcessEquDo = data.getApsProcessOperationProcessEquDo();
             affectedIdList.addAll(checkProcessingTimeConflict(apsProcessOperationProcessEquDo,
-                    data.getOldPlanStartdate(), data.getOldPlanEnddate(),data.getOldEquId(), data.getCurrentProcessWay()));
+                    data.getOldPlanStartdate(), data.getOldPlanEnddate(), data.getOldEquId(), data.getCurrentProcessWay()));
             // 判断是否存在设备不可用
             inspectionEquipmentIsAvailable(apsProcessOperationProcessEquDo,
                     apsProcessOperationProcessEquDo.getProcessdeviceid(),
@@ -837,11 +837,14 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
 //                        StringUtils.isBlank(info.getSoftconflictdes()) ?
 //                        LOCKMARK_N : LOCKMARK_Y);
 //            }
-            if(info.getPlanstartdate().equals(newPlanStartDate)){
+            if (info.getPlanstartdate().equals(newPlanStartDate) && PROCESS_WAY_MERGE.equals(processway)) {
                 info.setConflictdes(removeConflictsDesc(info.getConflictdes(), removeConflictsDesc));
                 info.setHasconflict(StringUtils.isBlank(info.getConflictdes()) &&
                         StringUtils.isBlank(info.getSoftconflictdes()) ?
                         LOCKMARK_N : LOCKMARK_Y);
+            } else {
+                info.setConflictdes(addNewConflictsDesc(info.getConflictdes(), removeConflictsDesc));
+                info.setHasconflict(LOCKMARK_Y);
             }
         });
         this.updateBatchById(beforeUpdatingConflictId);

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProcessOperationProcessEquDao.xml

@@ -459,6 +459,7 @@
             and  app.PROCESSWAY='合并加工'
             and ( #{oldStartDate} BETWEEN apope.PLANSTARTDATE AND  apope.PLANENDDATE
             OR  #{oldEndDate} BETWEEN apope.PLANSTARTDATE AND  apope.PLANENDDATE )
+            and #{oldStartDate} != apope.PLANSTARTDATE
         </where>
     </select>
 </mapper>