退货入库、其它入库逻辑修改

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

@@ -229,6 +229,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectMydoJobByEntranceId" parameterType="MydoJob" resultMap="MydoJobResult">
-        select top(1)* from mydo_job mj where in_or_out&lt;20 and mj.entrance_id = #{entranceId} and mj.status = #{status} order by mj.create_time
+        select top(1)* from mydo_job mj
+        where in_or_out&lt;20 and mj.entrance_id = #{entranceId}
+          and mj.status = #{status}
+        <if test="lineId != null  and lineId != ''"> and mj.line_id = #{lineId}</if>
+        order by mj.create_time
     </select>
 </mapper>