lhq/FT517-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改入库管理显示

Browse Source
This commit is contained in:
liuhanqing
2025-09-15 14:33:34 +08:00
parent 6cf3d4220f
commit cfcfbb57c4
9 changed files with 353 additions and 822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml
View File

@@ -32,9 +32,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="spare9" column="spare9" />
<result property="scanNum" column="scan_num" />
<result property="scanNumX" column="scan_num_x" />
<result property="scanNumJ" column="scan_num_j" />
</resultMap>
<resultMap type="InStockinDetail" id="InStockinDetailResult">
<result property="stockinDetailId" column="stockin_detail_id" />
@@ -64,10 +68,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="spare9" column="spare9" />
<result property="scanNum" column="scan_num" />
<result property="scanNumX" column="scan_num_x" />
<result property="scanNumJ" column="scan_num_j" />
<association property="extraField" javaType="ExtraField">
<result property="productName" column="product_name" />
<!--<association property="extraField" javaType="ExtraField">
<result property="productId" column="product_id" />
<result property="materialDesc" column="product_name" />
<result property="englishDesc" column="englishDesc" />
@@ -76,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="height" column="height" />
<result property="volume" column="volume" />
<result property="netWeight" column="netWeight" />
</association>
</association>-->
</resultMap>
<sql id="selectInStockinDetailFinishVo">
select
@@ -85,8 +94,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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
bp.product_name,
isd.spare7,isd.spare8,isd.spare9
from in_stockin_detail_finish isd
left join bas_product bp on bp.product_id = isd.product_id
</sql>

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

@@ -32,21 +32,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="spare9" column="spare9" />
<result property="scanNum" column="scan_num" />
<result property="scanNumX" column="scan_num_x" />
<result property="scanNumJ" column="scan_num_j" />
<result property="warehouseName" column="warehouse_name" />
<result property="warehouseId" column="warehouse_id" />
<association property="extraField" javaType="ExtraField">
<result property="productId" column="product_id" />
<result property="materialDesc" column="product_name" />
<result property="englishDesc" column="englishDesc" />
<result property="length" column="length" />
<result property="width" column="width" />
<result property="height" column="height" />
<result property="volume" column="volume" />
<result property="netWeight" column="netWeight" />
</association>
<result property="productName" column="product_name" />
<!-- <association property="extraField" javaType="ExtraField">-->
<!-- <result property="productId" column="product_id" />-->
<!-- <result property="materialDesc" column="product_name" />-->
<!-- <result property="englishDesc" column="englishDesc" />-->
<!-- <result property="length" column="length" />-->
<!-- <result property="width" column="width" />-->
<!-- <result property="height" column="height" />-->
<!-- <result property="volume" column="volume" />-->
<!-- <result property="netWeight" column="netWeight" />-->
<!-- </association>-->
</resultMap>
<sql id="selectInStockinDetailVo">
@@ -56,8 +60,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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
bp.product_name,
isd.spare7,isd.spare8,isd.spare9
from in_stockin_detail isd
left join bas_product bp on bp.product_id = isd.product_id
</sql>

161
ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml
View File

@@ -32,55 +32,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="pickQuantity" column="pick_quantity" />
<association property="extraField" javaType="ExtraField">
<result property="productId" column="product_id" />
<result property="materialDesc" column="product_name" />
<result property="englishDesc" column="englishDesc" />
<result property="length" column="length" />
<result property="width" column="width" />
<result property="height" column="height" />
<result property="volume" column="volume" />
<result property="netWeight" column="netWeight" />
</association>
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="spare9" column="spare9" />
<result property="spec" column="spec" />
</resultMap>
<sql id="selectMydoJobDetailFinishVo">
select mjd.job_detail_id,
mjd.job_id,
mjd.stock_id,
mjd.lot_no,
mjd.in_date,
mjd.in_or_out_id,
mjd.in_or_out_d_id,
mjd.product_guid,
mjd.product_id,
mjd.stock_status,
mjd.in_quantity,
mjd.stock_quantity,
mjd.out_quantity,
mjd.layer_quantity,
mjd.out_layer_quantity,
mjd.give_num,
mjd.stockin_id,
mjd.stacking_id,
mjd.exit_id,
mjd.print_date,
mjd.customer_id,
mjd.supplier_id,
mjd.spare1,
mjd.spare2,
mjd.spare3,
mjd.spare4,
mjd.pick_quantity,
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 mydo_job_detail_finish mjd
left join bas_product bp on mjd.product_id = bp.product_id
</sql>
<select id="selectMydoJobDetailFinishList" parameterType="MydoJobDetailFinish" resultMap="MydoJobDetailFinishResult">
<include refid="selectMydoJobDetailFinishVo"/>
select mjd.job_detail_id,
mjd.job_id,
mjd.stock_id,
mjd.lot_no,
mjd.in_date,
mjd.in_or_out_id,
mjd.in_or_out_d_id,
mjd.product_guid,
mjd.product_id,
mjd.stock_status,
mjd.in_quantity,
mjd.stock_quantity,
mjd.out_quantity,
mjd.layer_quantity,
mjd.out_layer_quantity,
mjd.give_num,
mjd.stockin_id,
mjd.stacking_id,
mjd.exit_id,
mjd.print_date,
mjd.customer_id,
mjd.supplier_id,
mjd.spare1,
mjd.spare2,
mjd.spare3,
mjd.spare4,
mjd.pick_quantity,
bp.product_name,
mjd.spare5,
mjd.spare6,
mjd.spare7,
mjd.spare8,
mjd.spare9,
mjd.spec
from mydo_job_detail_finish mjd
left join bas_product bp on mjd.product_id = bp.product_id
<where>
<if test="jobDetailId != null and jobDetailId != ''"> and mjd.job_detail_id = #{jobDetailId}</if>
<if test="jobId != null and jobId != ''"> and mjd.job_id = #{jobId}</if>
@@ -112,12 +109,82 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectMydoJobDetailFinishListByJobId" parameterType="String" resultMap="MydoJobDetailFinishResult">
<include refid="selectMydoJobDetailFinishVo"/>
select mjd.job_detail_id,
mjd.job_id,
mjd.stock_id,
mjd.lot_no,
mjd.in_date,
mjd.in_or_out_id,
mjd.in_or_out_d_id,
mjd.product_guid,
mjd.product_id,
mjd.stock_status,
mjd.in_quantity,
mjd.stock_quantity,
mjd.out_quantity,
mjd.layer_quantity,
mjd.out_layer_quantity,
mjd.give_num,
mjd.stockin_id,
mjd.stacking_id,
mjd.exit_id,
mjd.print_date,
mjd.customer_id,
mjd.supplier_id,
mjd.spare1,
mjd.spare2,
mjd.spare3,
mjd.spare4,
mjd.pick_quantity,
bp.product_name,
mjd.spare5,
mjd.spare6,
mjd.spare7,
mjd.spare8,
mjd.spare9,
mjd.spec
from mydo_job_detail_finish mjd
left join bas_product bp on mjd.product_id = bp.product_id
where job_id = #{jobId}
</select>
<select id="selectMydoJobDetailFinishByJobDetailId" parameterType="String" resultMap="MydoJobDetailFinishResult">
<include refid="selectMydoJobDetailFinishVo"/>
select mjd.job_detail_id,
mjd.job_id,
mjd.stock_id,
mjd.lot_no,
mjd.in_date,
mjd.in_or_out_id,
mjd.in_or_out_d_id,
mjd.product_guid,
mjd.product_id,
mjd.stock_status,
mjd.in_quantity,
mjd.stock_quantity,
mjd.out_quantity,
mjd.layer_quantity,
mjd.out_layer_quantity,
mjd.give_num,
mjd.stockin_id,
mjd.stacking_id,
mjd.exit_id,
mjd.print_date,
mjd.customer_id,
mjd.supplier_id,
mjd.spare1,
mjd.spare2,
mjd.spare3,
mjd.spare4,
mjd.pick_quantity,
bp.product_name,
mjd.spare5,
mjd.spare6,
mjd.spare7,
mjd.spare8,
mjd.spare9,
mjd.spec
from mydo_job_detail_finish mjd
left join bas_product bp on mjd.product_id = bp.product_id
where job_detail_id = #{jobDetailId}
</select>

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

@@ -33,58 +33,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare4" column="spare4" />
<result property="pickQuantity" column="pick_quantity" />
<result property="pickQuantityReal" column="pick_quantity_real" />
<association property="extraField" javaType="ExtraField">
<result property="productId" column="product_id" />
<result property="materialDesc" column="product_name" />
<result property="englishDesc" column="englishDesc" />
<result property="length" column="length" />
<result property="width" column="width" />
<result property="height" column="height" />
<result property="volume" column="volume" />
<result property="netWeight" column="netWeight" />
</association>
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="spare9" column="spare9" />
<result property="spec" column="spec" />
</resultMap>
<sql id="selectMydoJobDetailVo">
<select id="selectMydoJobDetailList" parameterType="MydoJobDetail" resultMap="MydoJobDetailResult">
select mjd.job_detail_id,
mjd.job_id,
mjd.stock_id,
mjd.lot_no,
mjd.in_date,
mjd.in_or_out_id,
mjd.in_or_out_d_id,
mjd.product_guid,
mjd.product_id,
mjd.stock_status,
mjd.in_quantity,
mjd.stock_quantity,
mjd.out_quantity,
mjd.layer_quantity,
mjd.out_layer_quantity,
mjd.give_num,
mjd.stockin_id,
mjd.stacking_id,
mjd.exit_id,
mjd.print_date,
mjd.customer_id,
mjd.supplier_id,
mjd.spare1,
mjd.spare2,
mjd.spare3,
mjd.spare4,
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
mjd.job_id,
mjd.stock_id,
mjd.lot_no,
mjd.in_date,
mjd.in_or_out_id,
mjd.in_or_out_d_id,
mjd.product_guid,
mjd.product_id,
mjd.stock_status,
mjd.in_quantity,
mjd.stock_quantity,
mjd.out_quantity,
mjd.layer_quantity,
mjd.out_layer_quantity,
mjd.give_num,
mjd.stockin_id,
mjd.stacking_id,
mjd.exit_id,
mjd.print_date,
mjd.customer_id,
mjd.supplier_id,
mjd.spare1,
mjd.spare2,
mjd.spare3,
mjd.spare4,
mjd.pick_quantity,
mjd.out_quantity-mjd.pick_quantity as pick_quantity_real,
bp.product_name,
mjd.spare5,
mjd.spare6,
mjd.spare7,
mjd.spare8,
mjd.spare9,
mjd.spec
from mydo_job_detail mjd
left join bas_product bp on mjd.product_id = bp.product_id
</sql>
<select id="selectMydoJobDetailList" parameterType="MydoJobDetail" resultMap="MydoJobDetailResult">
<include refid="selectMydoJobDetailVo"/>
<where>
<if test="jobDetailId != null and jobDetailId != ''"> and mjd.job_detail_id = #{jobDetailId}</if>
<if test="jobId != null and jobId != ''"> and mjd.job_id = #{jobId}</if>
@@ -117,11 +112,85 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectMydoJobDetailByJobDetailId" parameterType="String" resultMap="MydoJobDetailResult">
<include refid="selectMydoJobDetailVo"/>
select mjd.job_detail_id,
mjd.job_id,
mjd.stock_id,
mjd.lot_no,
mjd.in_date,
mjd.in_or_out_id,
mjd.in_or_out_d_id,
mjd.product_guid,
mjd.product_id,
mjd.stock_status,
mjd.in_quantity,
mjd.stock_quantity,
mjd.out_quantity,
mjd.layer_quantity,
mjd.out_layer_quantity,
mjd.give_num,
mjd.stockin_id,
mjd.stacking_id,
mjd.exit_id,
mjd.print_date,
mjd.customer_id,
mjd.supplier_id,
mjd.spare1,
mjd.spare2,
mjd.spare3,
mjd.spare4,
mjd.pick_quantity,
mjd.out_quantity-mjd.pick_quantity as pick_quantity_real,
bp.product_name,
mjd.spare5,
mjd.spare6,
mjd.spare7,
mjd.spare8,
mjd.spare9,
mjd.spec
from mydo_job_detail mjd
left join bas_product bp on mjd.product_id = bp.product_id
where job_detail_id = #{jobDetailId}
</select>
<select id="selectMydoJobDetailListByJobId" resultMap="MydoJobDetailResult">
<include refid="selectMydoJobDetailVo"/>
select mjd.job_detail_id,
mjd.job_id,
mjd.stock_id,
mjd.lot_no,
mjd.in_date,
mjd.in_or_out_id,
mjd.in_or_out_d_id,
mjd.product_guid,
mjd.product_id,
mjd.stock_status,
mjd.in_quantity,
mjd.stock_quantity,
mjd.out_quantity,
mjd.layer_quantity,
mjd.out_layer_quantity,
mjd.give_num,
mjd.stockin_id,
mjd.stacking_id,
mjd.exit_id,
mjd.print_date,
mjd.customer_id,
mjd.supplier_id,
mjd.spare1,
mjd.spare2,
mjd.spare3,
mjd.spare4,
mjd.pick_quantity,
mjd.out_quantity-mjd.pick_quantity as pick_quantity_real,
bp.product_name,
mjd.spare5,
mjd.spare6,
mjd.spare7,
mjd.spare8,
mjd.spare9,
mjd.spec
from mydo_job_detail mjd
left join bas_product bp on mjd.product_id = bp.product_id
where mjd.job_id = #{jobId}
</select>