优化

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

@@ -62,6 +62,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where task_code = #{taskCode}
     </select>
 
+    <select id="selectAgvQueueByWmsTask" parameterType="Integer"  resultMap="AgvQueueResult">
+        <include refid="selectAgvQueueVo"/>
+        where wms_task_no = #{wmsTaskNo}
+    </select>
+
     <insert id="insertAgvQueue" parameterType="AgvQueue">
         insert into agv_queue
         <trim prefix="(" suffix=")" suffixOverrides=",">

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

@@ -105,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="exception != null">exception = #{exception},</if>
             <if test="traySize != null">tray_size = #{traySize},</if>
             <if test="allowPut != null">allow_put = #{allowPut},</if>
+            <if test="sszt != null">sszt = #{sszt},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -72,10 +72,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where job_id = #{jobId}
     </select>
 
-    <select id="selectMydoJobByTaskNo" parameterType="String" resultMap="MydoJobResult">
-            <include refid="selectMydoJobVo"/>
-            where task_no = #{taskNo}
+    <select id="selectJobByTaskNo" parameterType="String" resultMap="MydoJobResult">
+        select job_id, a.status, task_no, a.roadway_id, b.cargo_space_name as 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, a.warehouse_id, fault_flag,
+               flag,a.tray_code,tray_size
+        from mydo_job_wcs a,bas_cargo_space b
+        where a.cargo_space_id = b.cargo_space_id
+        and task_no = #{taskNo}
     </select>
+
+    <select id="selectMydoJobByTaskNo" parameterType="String" resultMap="MydoJobResult">
+        <include refid="selectMydoJobVo"/>
+        where task_no = #{taskNo}
+    </select>
+
     <select id="ddjTaskFinish" parameterType="java.util.Map" statementType="CALLABLE">
         {call proc_mydojob_finish(
                 #{v_rwh,mode=IN,jdbcType=INTEGER},
@@ -98,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <foreach item="item" index="index" collection="exitList" separator="," open="(" close=")">
             #{item}
         </foreach>
-        and in_or_out > 20
+        and in_or_out &gt; 20
         and status = 1 and execution_phase= 0
         order by priority desc,create_time
     </select>
@@ -257,8 +268,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <foreach item="item" index="index" collection="exitList" separator="," open="(" close=")">
             #{item}
         </foreach>
-        and in_or_out > 20
+        and in_or_out &gt; 20
         and status = 3
         order by priority desc,create_time
     </select>
+
+    <select id="getInJobByEntrance" resultMap="MydoJobResult">
+        select 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_size,tray_code from mydo_job_wcs
+        where entrance_id in
+        <foreach item="item" index="index" collection="exitList" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        and in_or_out &lt; 20
+        and status in (1,3)
+    </select>
 </mapper>