手持机部分

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

@@ -140,4 +140,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{cargoSpaceId}
         </foreach>
     </delete>
+
 </mapper>

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

@@ -188,4 +188,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{stockinGuid}
         </foreach>
     </delete>
+
+     <select id="selectStockinByDetail" parameterType="string" resultMap="InStockinResult">
+         select distinct is2.stockin_guid,
+         is2.stockin_id,
+         is2.in_type,
+         is2.create_date,
+         is2.create_man_id,
+         is2.status,
+         is2.warehouse_id,
+         is2.finish_date,
+         is2.erp_bill,
+         is2.stock_source,
+         is2.department_no,
+         is2.customer_no,
+         is2.class_no,
+         is2.supplier_no,
+         is2.spare1,
+         is2.spare2,
+         is2.spare4,
+         is2.spare3,
+         is2.spare5,
+         bw.warehouse_name,
+         bs.supplier_name,
+         sd.dept_name ,
+         su.user_name
+         from in_stockin is2
+         left join bas_warehouse bw on is2.warehouse_id = bw.warehouse_id
+         left join bas_supplier bs on bs.supplier_no = is2.supplier_no
+         left join sys_dept sd on is2.department_no = sd.dept_id
+         left join sys_user su on su.user_id = is2.create_man_id
+         left join in_stockin_detail isd on isd.stockin_id = is2.stockin_id
+         <where>
+             <if  test="stockinDetailId != null and stockinDetailId !=''">  stockin_detail_id=#{stockinDetailId}</if>
+         </where>
+     </select>
 </mapper>

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

@@ -11,17 +11,34 @@
                 #{v_tray_code,mode=IN,jdbcType=VARCHAR},
                 #{v_warehouse_id,mode=IN,jdbcType=VARCHAR},
                 #{v_quantity,mode=IN,jdbcType=VARCHAR},
+                #{v_cargo_space_id,mode=IN,jdbcType=VARCHAR},
                 #{v_result,mode=OUT,jdbcType=INTEGER},
                 #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
               )}
     </select>
-
     <select id="emptyBoxIn" parameterType="java.util.Map" statementType="CALLABLE">
         {call proc_box_in(
                 #{v_tray_code,mode=IN,jdbcType=VARCHAR},
+                #{v_warehouse_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>
+    <select id="emptyTrayOut" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_tray_out(
+                #{v_warehouse_id,mode=IN,jdbcType=VARCHAR},
+                #{v_cargo_space_id,mode=IN,jdbcType=VARCHAR},
+                #{v_result,mode=OUT,jdbcType=INTEGER},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+        )}
+    </select>
+    <select id="emptyBoxOut" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_box_out(
+                #{v_warehouse_id,mode=IN,jdbcType=VARCHAR},
+                #{v_exit_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/stock/BasStockMapper.xml

@@ -247,4 +247,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{stockId}
         </foreach>
     </delete>
+
+    <select id="selectKtpStock" parameterType="string" resultMap="BasStockResult">
+        select b.cargo_space_name, b.cargo_space_id  from bas_stock s,bas_cargo_space b where s.warehouse_id=#{warehouseId}
+         and s.cargo_space_id=b.cargo_space_id and b.warehouse_id= s.warehouse_id and b.status='2' and s.product_id='KTP0001'
+        order by b.the_platoon,b.the_floor,b.the_column asc
+    </select>
 </mapper>