作业取消逻辑调整

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

@@ -86,8 +86,8 @@ public interface ApsProcessOperationDao extends BaseMapper<ApsProcessOperationDo
     @Select("SELECT * FROM aps_process_operation_process_equ WHERE DELETED = 0 AND PROCESSID = #{processid} ${euqwhr} order by PLANSTARTDATE desc")
     List<ApsProcessOperationProcessEquDo> getProcessOperationProcessEqus(@Param("processid") String processid, @Param("euqwhr") String euqwhr);
 
-    @Select("SELECT * FROM aps_process_operation_process_equ WHERE DELETED = 0 AND ID in ('${nextIds}') and CLOSESTATUS='未完工' and PLANPROCESSRALL-STARTINGROLL-CANCELROLL>0")
-    List<ApsProcessOperationProcessEquDo> getNextProcessOperationEqus(@Param("nextIds") String nextIds);
+    @Select("SELECT * FROM aps_process_operation_process_equ WHERE DELETED = 0 AND PREVIOUSPROCESSESIDS=#{equId} and CLOSESTATUS='未完工' and PLANPROCESSRALL-STARTINGROLL-CANCELROLL>0")
+    List<ApsProcessOperationProcessEquDo> getNextProcessOperationEqus(@Param("equId") String equId);
 
     @Update("update aps_process_operation_process_equ set BACHMATERIALPROCESS = IF(BACHMATERIALPROCESS is null || BACHMATERIALPROCESS = '',#{batchnumber},concat(BACHMATERIALPROCESS,',',#{batchnumber})) where DELETED = 0 AND PREVIOUSPROCESSESIDS = #{previousprocessesids}")
     void updateBatchNumberByPrevious(@Param("batchnumber") String batchnumber, @Param("previousprocessesids") String previousprocessesids);

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

@@ -2421,8 +2421,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
         processOperationProcessEquDo.setLeavewaitjobroll(leaveWaitJobRoll);
 
         //取消和更新该作业明细每个后道作业明细
-        if (StringUtils.isNotBlank(processOperationProcessEquDo.getNextprocessesids()) && curEquCancelRoll > 0) {
-            List<ApsProcessOperationProcessEquDo> processOperationProcessEquDos = apsProcessOperationDao.getNextProcessOperationEqus(processOperationProcessEquDo.getNextprocessesids().replace(",", "','"));
+        List<ApsProcessOperationProcessEquDo> processOperationProcessEquDos = apsProcessOperationDao.getNextProcessOperationEqus(processOperationProcessEquDo.getId());
+        if (processOperationProcessEquDos.size() > 0 && curEquCancelRoll > 0) {
             for (ApsProcessOperationProcessEquDo processOperationEquDo : processOperationProcessEquDos) {
                 //1-借调或取消 2-输入取消  3-输入不合格
                 if (!cancelreason.equals("3")) {