aps-冲突bug修复

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsProcessOperationProcessEquDao.java

@@ -122,8 +122,6 @@ public interface ApsProcessOperationProcessEquDao extends BaseMapper<ApsProcessO
 
     @Select("select apope.PLANSTARTDATE from aps_process_operation apo LEFT JOIN aps_process_operation_process_equ apope ON apo.ID = apope.PROCESSID AND apope.DELETED = 0 WHERE apo.DELETED = 0 AND apo.BLANKID = #{blankid} AND apo.PROCESS != '铸轧' ORDER BY apope.PLANSTARTDATE limit 1")
     Date getEarltPlanStartDate(@Param("blankid") String blankid);
-
-    List<String> selectEquByProcessId(@Param("processid") String processid);
 }
 
 

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

@@ -602,8 +602,10 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
          */
         //工序作业ID
         String processid = apsProcessOperationProcessEquDo.getProcessid();
+        //查询工序作业详情
+        ApsProcessOperationDo apsProcessOperationDo = apsProcessOperationService.getById(processid);
         //查询工艺步骤指定的可选设备
-        List<String> processOperationEquList = this.baseMapper.selectEquByProcessId(processid);
+        List<String> processOperationEquList = Arrays.asList(apsProcessOperationDo.getCanchoosedeviceid().split(","));
 //        List<ApsProcessOperationEquDo> processOperationEquDos = apsProcessOperationEquService.list(new LambdaQueryWrapper<ApsProcessOperationEquDo>().eq(ApsProcessOperationEquDo::getMainid, processid));
         long count = processOperationEquList.stream().filter(item -> item.equals(apsProcessOperationProcessEquDo.getProcessdeviceid())).count();
         String newConflictdes = apsProcessOperationProcessEquDo.getConflictdes();
@@ -617,8 +619,8 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                     apsProcessOperationProcessEquDo.getProcessdeviceid(), NO_NEED_EQU, 2, null);
             newConflictdes = removeConflictsDesc(newConflictdes, NO_NEED_EQU);
         }
-        //查询工序作业详情
-        ApsProcessOperationDo apsProcessOperationDo = apsProcessOperationService.getById(apsProcessOperationProcessEquDo.getProcessid());
+//        //查询工序作业详情
+//        ApsProcessOperationDo apsProcessOperationDo = apsProcessOperationService.getById(apsProcessOperationProcessEquDo.getProcessid());
 
         //存在前道工序作业明细
         if (StringUtils.isNotBlank(apsProcessOperationProcessEquDo.getPreviousprocessesids())) {

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

@@ -577,8 +577,4 @@
             AND apope.PLANSTARTDATE > #{date1}
             AND apope.PLANENDDATE < #{date2}
     </select>
-    <select id="selectEquByProcessId" resultType="java.lang.String">
-        select DISTINCT IF(apoe.RESOURCETYPE = '设备',apoe.RESOURCEID,a.EQUIPMENTID) AS 'EQUIPMENTID' from aps_process_operation_equ apoe LEFT JOIN (select arg.ID,are.EQUIPMENTID from aps_resource_group arg LEFT JOIN aps_resources_equipment are ON arg.ID = are.MAINID AND arg.DELETED = 0 where arg.DELETED = 0) a ON apoe.RESOURCEID = a.ID
-        where apoe.MAINID = #{processid}
-    </select>
 </mapper>