修改电子标签修改前置条件

ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml

@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="erpBill"    column="erp_bill"    />
         <result property="stockSource"    column="stock_source"    />
         <result property="departmentNo"    column="department_no"    />
+        <result property="departmentName"    column="department_name"    />
         <result property="customerNo"    column="customer_no"    />
         <result property="classNo"    column="class_no"    />
         <result property="supplierNo"    column="supplier_no"    />
@@ -29,9 +30,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectCheckStockinVo">
         select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, cs.warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 ,
-               bw.warehouse_name
+               bw.warehouse_name, sd.dept_name as department_name
         from check_stockin cs
         left join bas_warehouse bw on cs.warehouse_id = bw.warehouse_id
+        left join sys_dept sd on cs.department_no = sd.dept_id
     </sql>
 
     <select id="selectCheckStockinList" parameterType="CheckStockin" resultMap="CheckStockinResult">

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

@@ -120,6 +120,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectMydoJobDetailVo"/>
         where job_detail_id = #{jobDetailId}
     </select>
+    <select id="selectMydoJobDetailListByJobId" resultMap="MydoJobDetailResult">
+        <include refid="selectMydoJobDetailVo"/>
+        where mjd.job_id = #{jobId}
+    </select>
 
     <insert id="insertMydoJobDetail" parameterType="MydoJobDetail">
         insert into mydo_job_detail

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

@@ -225,4 +225,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
         )}
     </select>
+    <select id="selectByTrayCode" resultMap="MydoJobResult">
+        <include refid="selectMydoJobVo"/>
+        where tray_code = #{trayCode}
+    </select>
 </mapper>