产线入库流程修改

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

@@ -117,9 +117,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yph != null">yph = #{yph},</if>
             <if test="ylh != null">ylh = #{ylh},</if>
             <if test="ych != null">ych = #{ych},</if>
-            <if test="mbph != null">mbp = #{mbph},</if>
-            <if test="mblh != null">mbl = #{mblh},</if>
-            <if test="mbch != null">mbc = #{mbch},</if>
+            <if test="mbph != null">mbph = #{mbph},</if>
+            <if test="mblh != null">mblh = #{mblh},</if>
+            <if test="mbch != null">mbch = #{mbch},</if>
             <if test="xtxh != null">xtxh = #{xtxh},</if>
             <if test="dqxd != null">dqxd = #{dqxd},</if>
             <if test="hczt != null">hczt = #{hczt},</if>

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

@@ -67,6 +67,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where rwlx = #{rwlx} and dev_id = #{devId}
 
     </select>
+    <select id="selectDdjDeviceExecutionQueueByRwhAndXd"
+            resultMap="DdjDeviceExecutionQueueResult">
+        <include refid="selectDdjDeviceExecutionQueueVo"/>
+        where rwh = #{rwh} and dev_id = #{devId}
+    </select>
 
 
     <insert id="insertDdjDeviceExecutionQueue" parameterType="DdjDeviceExecutionQueue">