现场修改

ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml

@@ -208,7 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bs.product_name
         from bas_cargo_space bcs
                  left join bas_stock bs on bcs.cargo_space_id = bs.cargo_space_id
-        where bcs.status in ('1', '2','4')
+        where bcs.status in ( '2')
     </select>
     <select id="selectBasCargoSpaceListByRoadway" parameterType="BasCargoSpace" resultMap="BasCargoSpaceResult">
         select bcs.cargo_space_id, bcs.warehouse_id, bcs.roadway_id, bcs.cargo_space_name,

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

@@ -205,12 +205,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where job_id = #{jobId}
     </update>
-    <update id="ykCompleted">
+    <select id="ykCompleted" parameterType="java.util.Map" statementType="CALLABLE">
         {call proc_yk_complete(
                 #{v_job_id,jdbcType=VARCHAR,mode=IN},
                 #{v_result,mode=OUT,jdbcType=INTEGER}
               )}
-    </update>
+    </select>
 
     <delete id="deleteMydoJobByJobId" parameterType="String">
         delete from mydo_job where job_id = #{jobId}
@@ -266,6 +266,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select * from mydo_job where tray_code = #{trayCode}
     </select>
 
+    <select id="selectInJobByTaskNo" parameterType="String" resultMap="MydoJobResult">
+        select * from mydo_job where task_no = #{taskNo}
+    </select>
+
+
     <select id="allotInJobSpace" parameterType="java.util.Map"  statementType="CALLABLE">
         {call proc_allot_space(
                 #{v_tray_code,jdbcType=VARCHAR,mode=IN},