优化0120

ruoyi-admin/src/main/resources/mapper/device/AgvQueueMapper.xml

@@ -26,7 +26,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectAgvQueueVo">
-        select req_code, req_time, position_code_1, position_code_2, task_type, ctnr_type, ctnr_code, ctnr_num, task_mode, priority, agv_type, request, finish_time, wms_traycode, wms_task_no,status,task_code,wms_task_type from agv_queue
+        select req_code, req_time, position_code_1, position_code_2, task_type, ctnr_type, ctnr_code,
+               ctnr_num, task_mode, priority, agv_type, request, finish_time, wms_traycode, wms_task_no,
+               status,task_code,wms_task_type from agv_queue
     </sql>
 
     <select id="selectAgvQueueList" parameterType="AgvQueue" resultMap="AgvQueueResult">
@@ -53,6 +55,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
              order by req_time desc
     </select>
 
+    <select id="selectAgvQueueList1" parameterType="AgvQueue" resultMap="AgvQueueResult">
+        select * from agv_queue where status=#{status} and  position_code_2 like concat('%',#{positionCode2},'%')
+    </select>
     <select id="selectAgvQueueByReqCode" parameterType="String" resultMap="AgvQueueResult">
         <include refid="selectAgvQueueVo"/>
         where req_code = #{reqCode}

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

@@ -255,6 +255,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectMydoJobByEntranceList1"  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,flag, tray_code from mydo_job_wcs
         where entrance_id = #{entranceId}
+
         and in_or_out &lt;= 20 and status = 3
         order by priority desc,create_time desc
     </select>

ruoyi-admin/src/main/resources/mapper/queue/DdjDeviceExecutionQueueMapper.xml

@@ -148,6 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where uuid = #{uuid}
     </update>
 
+
     <delete id="deleteDdjDeviceExecutionQueueByUuid" parameterType="String">
         delete from ddj_device_execution_queue where uuid = #{uuid}
     </delete>