手持机部分

ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml

@@ -293,4 +293,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <delete id="deleteInStockinDetailByStockinGuid">
         delete from in_stockin_detail where stockin_guid = #{stockinGuid}
     </delete>
+    <select id="selectStockinByDetailById" parameterType="string" resultMap="InStockinDetailResult">
+        select
+            isd.stockin_detail_id, isd.stockin_guid, isd.stockin_id, isd.lot_no, isd.product_guid,
+            isd.product_id, isd.quantity-isd.scan_num as quantity, isd.quantity_x, isd.quantity_j, isd.price, isd.cargo_no, isd.remark,
+            isd.assign_num, isd.assign_num_x, isd.assign_num_j, isd.print_date, isd.stock_status,
+            isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4,
+            isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j,
+            bp.product_name, bp.spare1 as englishDesc,
+            bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume
+            from in_stockin_detail isd
+            left join bas_product bp on bp.product_id = isd.product_id
+        left join in_stockin ist on ist.stockin_guid = isd.stockin_guid
+        <where>
+        <if  test="stockinDetailId != null and stockinDetailId != '' ">
+            isd.stockin_detail_id = #{stockinDetailId}
+        </if>
+        </where>
+        order by ist.create_date desc
+    </select>
 </mapper>

ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml

@@ -41,4 +41,25 @@
                 #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
         )}
     </select>
+
+    <select id="bindTrayMsg" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_bind_tray_msg(
+                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
+                #{v_stockin_detail_id,mode=IN,jdbcType=VARCHAR},
+                #{v_quantity,mode=IN,jdbcType=INTEGER},
+                #{v_result,mode=OUT,jdbcType=INTEGER},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+        )}
+    </select>
+
+    <select id="addInJob" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_add_in_job(
+                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
+                #{v_warehouse_id,mode=IN,jdbcType=VARCHAR},
+                #{v_cargo_space_id,mode=IN,jdbcType=VARCHAR},
+                #{v_entrance_id,mode=IN,jdbcType=VARCHAR},
+                #{v_result,mode=OUT,jdbcType=INTEGER},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+        )}
+    </select>
 </mapper>

ruoyi-admin/src/main/resources/mapper/pda/TrayMsgMapper.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.pda.trayMsg.mapper.TrayMsgMapper">
+    
+    <resultMap type="TrayMsg" id="TrayMsgResult">
+        <result property="id"    column="id"    />
+        <result property="trayCode"    column="tray_code"    />
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="productName"    column="product_name"    />
+    </resultMap>
+
+    <sql id="selectTrayMsgVo">
+        select id, tray_code, stockin_detail_id, quantity from tray_msg
+    </sql>
+
+    <select id="selectTrayMsgList" parameterType="TrayMsg" resultMap="TrayMsgResult">
+        select t.id, t.tray_code, t.stockin_detail_id, t.quantity,p.product_name from tray_msg t
+            left join in_stockin_detail d on t.stockin_detail_id = d.stockin_detail_id
+            left join bas_product p on d.product_id=p.product_id
+        <where>  
+            <if test="trayCode != null  and trayCode != ''"> and t.tray_code = #{trayCode}</if>
+            <if test="stockinDetailId != null  and stockinDetailId != ''"> and t.stockin_detail_id = #{stockinDetailId}</if>
+            <if test="quantity != null  and quantity != ''"> and t.quantity = #{quantity}</if>
+        </where>
+    </select>
+    
+    <select id="selectTrayMsgById" parameterType="String" resultMap="TrayMsgResult">
+        <include refid="selectTrayMsgVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertTrayMsg" parameterType="TrayMsg">
+        insert into tray_msg
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="trayCode != null">tray_code,</if>
+            <if test="stockinDetailId != null">stockin_detail_id,</if>
+            <if test="quantity != null">quantity,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="trayCode != null">#{trayCode},</if>
+            <if test="stockinDetailId != null">#{stockinDetailId},</if>
+            <if test="quantity != null">#{quantity},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTrayMsg" parameterType="TrayMsg">
+        update tray_msg
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTrayMsgById" parameterType="String">
+        delete from tray_msg where id = #{id}
+    </delete>
+
+    <delete id="deleteTrayMsgByIds" parameterType="String">
+        delete from tray_msg where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>