feature 解锁加锁通过 工序作业明细的加工开始时间和结束时间作为查询条件

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

@@ -151,7 +151,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         int i = this.baseMapper.checkConflictByBlankId(blankIds);
         if (i != 0) {
             logger.error("所选坯料计划:{}存在冲突", blankIds);
-            return R.error("所选坯料计划存在冲突");
+            return R.error("请先解决排程冲突在发布");
         }
         // 判断是否存在已发布的工序作业
         List<ApsBlankOrderDo> apsBlankOrderDos = this.baseMapper.selectBatchIds(blankIds);
@@ -351,7 +351,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         }
         if(blackOrderId.isEmpty()){
             log.debug("暂无需要锁定或者解锁的批量计划");
-            return R.ok();
+            return R.ok("暂无需要锁定或者解锁的批量计划");
         }
         // 组装待更新坯料计划实体
         List<ApsBlankOrderDo> blankOrderDos = new ArrayList<>();

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

@@ -150,11 +150,12 @@
     <select id="getIdByLockTime" resultType="java.lang.String">
         select DISTINCT abo.ID from  aps_blank_order abo
         left join aps_process_operation apo on abo.ID= apo.BLANKID AND APO.DELETED='0'
+        left join aps_process_operation_process_equ apope on apope.PROCESSID=apo.ID and apope.DELETED='0'
         <where>
             abo.DELETED ='0'
             <choose>
-                <when test='lockMark=="y"'> and apo.PLANSTARTDATE &lt; #{lockTime} </when>
-                <otherwise>and apo.PLANSTARTDATE &gt; #{lockTime}</otherwise>
+                <when test='lockMark=="y"'> and apope.PLANSTARTDATE &lt; #{lockTime} </when>
+                <otherwise>and apope.PLANSTARTDATE &gt; #{lockTime}</otherwise>
             </choose>
         </where>
     </select>