手持机

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

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="jobDetailId"    column="job_detail_id"    />
         <result property="jobId"    column="job_id"    />
         <result property="stockId"    column="stock_id"    />
+        <result property="warehouseId"    column="warehouse_id"    />
         <result property="lotNo"    column="lot_no"    />
         <result property="inDate"    column="in_date"    />
         <result property="inOrOutId"    column="in_or_out_id"    />
@@ -75,10 +76,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                mjd.pick_quantity,
                mjd.out_quantity-mjd.pick_quantity as pick_quantity_real,
                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
+               bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume,
+               mj.warehouse_id
 
         from mydo_job_detail mjd
         left join bas_product bp on mjd.product_id = bp.product_id
+         left join mydo_job mj on mjd.job_id = mj.job_id
 
 
     </sql>

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

@@ -7,6 +7,7 @@
         {call proc_out_makesure(
                 #{v_tray_code,mode=IN,jdbcType=VARCHAR},
                 #{v_type,mode=IN,jdbcType=VARCHAR},
+                #{v_entrance_id,mode=IN,jdbcType=VARCHAR},
                 #{v_result,mode=OUT,jdbcType=INTEGER},
                 #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
         )}