盘点测试修改

ruoyi-admin/src/main/java/com/ruoyi/job/mapper/MydoJobMapper.java

@@ -79,4 +79,6 @@ public interface MydoJobMapper
     MydoJob selectMydoJobByEntranceList(@Param("entranceList") List<String> entranceList);
 
     List<MydoJob> selectMydoJobFinishList(MydoJob mydoJob);
+
+    MydoJob selectRunningMydoJobByExitList(@Param("exitList") List<String> exitList);
 }

ruoyi-admin/src/main/java/com/ruoyi/job/service/IMydoJobService.java

@@ -74,4 +74,6 @@ public interface IMydoJobService
     MydoJob selectMydoJobByEntranceList(List<String> entranceList);
 
     List<MydoJob> selectMydoJobFinishList(MydoJob mydoJob);
+
+    MydoJob selectRunningMydoJobByExitList(List<String> strings);
 }

ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java

@@ -152,4 +152,9 @@ public class MydoJobServiceImpl implements IMydoJobService
     public List<MydoJob> selectMydoJobFinishList(MydoJob mydoJob) {
         return mydoJobMapper.selectMydoJobFinishList(mydoJob);
     }
+
+    @Override
+    public MydoJob selectRunningMydoJobByExitList(List<String> exitList) {
+        return mydoJobMapper.selectRunningMydoJobByExitList(exitList);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1BothWayInSsjThread.java

@@ -136,7 +136,7 @@ public class Floor1BothWayInSsjThread implements Runnable {
     private void dispatch2(DeviceSsj ssj) {
         if (ssj.getDw() == 1 && ssj.getTaskNo() > 0 && ssj.getTaskNo() < 1000 && ssj.getTraySize() != 0) {
             //先检测有没有出库作业，有出库作业直接退回
-            MydoJob outMydoJob = mydoJobService.selectMydoJobByExitList(Collections.singletonList(ssj.getDeviceCode()));
+            MydoJob outMydoJob = mydoJobService.selectRunningMydoJobByExitList(Collections.singletonList(ssj.getDeviceCode()));
             String l2012WriteAddress = "DB501.20";
             String l2013WriteAddress = "DB501.30";
             if (ObjUtil.isNotNull(outMydoJob) || StrUtil.isEmpty(ssj.getTrayCode())) {

ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1SingleSsjThread.java

@@ -159,7 +159,7 @@ public class Floor1SingleSsjThread implements Runnable {
                     log.error("货位不存在 cargoSpaceId{}", mydoJob.getCargoSpaceId());
                 } else {
                     //生成队列
-                    List<DdjDeviceExecutionQueue> list = ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueListByRwlx(DDJ_RWLX_2, Convert.toInt(mydoJob));
+                    List<DdjDeviceExecutionQueue> list = ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueListByRwlx(DDJ_RWLX_2, Convert.toInt(mydoJob.getRoadwayId()));
                     List<Integer> pclList = roadwayMap.get(ssj.getDeviceCode());
                     if (CollUtil.isEmpty(list) && CollUtil.isNotEmpty(pclList)) {
                         DdjDeviceExecutionQueue ddjDeviceExecutionQueue = new DdjDeviceExecutionQueue();

ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml

@@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
         and in_or_out > 20
         and status = 1 and execution_phase= 0
-        order by priority desc,create_time desc
+        order by priority desc,create_time
     </select>
 
     <insert id="insertMydoJob" parameterType="MydoJob">
@@ -220,4 +220,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="faultFlag != null  and faultFlag != ''"> and fault_flag = #{faultFlag}</if>
         </where>
     </select>
+    <select id="selectRunningMydoJobByExitList" resultMap="MydoJobResult">
+        select TOP 1 job_id, status, task_no, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id, priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id, exit_id, warehouse_id, fault_flag from mydo_job_wcs
+        where exit_id in
+        <foreach item="item" index="index" collection="exitList" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        and in_or_out > 20
+        and status = 3
+        order by priority desc,create_time
+    </select>
 </mapper>