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

修改入库管理 盘点管理联查

Browse Source
This commit is contained in:
liuhanqing
2025-06-10 10:50:24 +08:00
parent be72a0ac13
commit a87bc77cf3
30 changed files with 561 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailFinishMapper.xml
View File

@@ -67,10 +67,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<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="selectCheckStockinDetailVo">
select stock_check_detail_id, stock_check_guid, stock_check_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, scan_num, scan_num_x, scan_num_j, spare1, spare2, spare3, spare4, spare5, spare6 from check_stockin_detail_finish
select csd.stock_check_detail_id, csd.stock_check_guid, csd.stock_check_id, csd.lot_no, csd.product_guid, csd.product_id,
csd.quantity, csd.quantity_x, csd.quantity_j, csd.price, csd.cargo_no, csd.remark, csd.assign_num, csd.assign_num_x,
csd.assign_num_j, csd.print_date, csd.stock_status, csd.supplier_id, csd.customer_id, csd.unit, csd.spec,
csd.scan_num, csd.scan_num_x, csd.scan_num_j, csd.spare1, csd.spare2, csd.spare3, csd.spare4,csd.spare5, csd.spare6,
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 check_stockin_detail_finish csd
left join bas_product bp on csd.product_id = bp.product_id
</sql>
<sql id="selectCheckStockinDetailFinishVo">
@@ -119,34 +136,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
resultMap="CheckStockinDetailResult">
<include refid="selectCheckStockinDetailVo"/>
<where>
<if test="stockCheckGuid != null and stockCheckGuid != ''"> and stock_check_guid = #{stockCheckGuid}</if>
<if test="stockCheckId != null and stockCheckId != ''"> and stock_check_id = #{stockCheckId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="spec != null and spec != ''"> and spec = #{spec}</if>
<if test="scanNum != null and scanNum != ''"> and scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and scan_num_j = #{scanNumJ}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and spare6 = #{spare6}</if>
<if test="stockCheckGuid != null and stockCheckGuid != ''"> and csd.stock_check_guid = #{stockCheckGuid}</if>
<if test="stockCheckId != null and stockCheckId != ''"> and csd.stock_check_id = #{stockCheckId}</if>
<if test="lotNo != null and lotNo != ''"> and csd.lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and csd.product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and csd.product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and csd.quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and csd.quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and csd.quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and csd.price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and csd.cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and csd.assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and csd.assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and csd.assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and csd.print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and csd.stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and csd.supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and csd.customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and csd.unit = #{unit}</if>
<if test="spec != null and spec != ''"> and csd.spec = #{spec}</if>
<if test="scanNum != null and scanNum != ''"> and csd.scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and csd.scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and csd.scan_num_j = #{scanNumJ}</if>
<if test="spare1 != null and spare1 != ''"> and csd.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and csd.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and csd.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and csd.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and csd.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and csd.spare6 = #{spare6}</if>
</where>
</select>

75
ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml
View File

@@ -35,43 +35,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<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="selectCheckStockinDetailVo">
select stock_check_detail_id, stock_check_guid, stock_check_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, scan_num, scan_num_x, scan_num_j, spare1, spare2, spare3, spare4, spare5, spare6 from check_stockin_detail
select csd.stock_check_detail_id, csd.stock_check_guid, csd.stock_check_id, csd.lot_no, csd.product_guid, csd.product_id,
csd.quantity, csd.quantity_x, csd.quantity_j, csd.price, csd.cargo_no, csd.remark, csd.assign_num, csd.assign_num_x,
csd.assign_num_j, csd.print_date, csd.stock_status, csd.supplier_id, csd.customer_id, csd.unit, csd.spec,
csd.scan_num, csd.scan_num_x, csd.scan_num_j, csd.spare1, csd.spare2, csd.spare3, csd.spare4,csd.spare5, csd.spare6,
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 check_stockin_detail csd
left join bas_product bp on csd.product_id = bp.product_id
</sql>
<select id="selectCheckStockinDetailList" parameterType="CheckStockinDetail" resultMap="CheckStockinDetailResult">
<include refid="selectCheckStockinDetailVo"/>
<where>
<if test="stockCheckGuid != null and stockCheckGuid != ''"> and stock_check_guid = #{stockCheckGuid}</if>
<if test="stockCheckId != null and stockCheckId != ''"> and stock_check_id = #{stockCheckId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="spec != null and spec != ''"> and spec = #{spec}</if>
<if test="scanNum != null and scanNum != ''"> and scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and scan_num_j = #{scanNumJ}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and spare6 = #{spare6}</if>
<if test="stockCheckGuid != null and stockCheckGuid != ''"> and csd.stock_check_guid = #{stockCheckGuid}</if>
<if test="stockCheckId != null and stockCheckId != ''"> and csd.stock_check_id = #{stockCheckId}</if>
<if test="lotNo != null and lotNo != ''"> and csd.lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and csd.product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and csd.product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and csd.quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and csd.quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and csd.quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and csd.price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and csd.cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and csd.assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and csd.assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and csd.assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and csd.print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and csd.stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and csd.supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and csd.customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and csd.unit = #{unit}</if>
<if test="spec != null and spec != ''"> and csd.spec = #{spec}</if>
<if test="scanNum != null and scanNum != ''"> and csd.scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and csd.scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and csd.scan_num_j = #{scanNumJ}</if>
<if test="spare1 != null and spare1 != ''"> and csd.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and csd.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and csd.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and csd.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and csd.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and csd.spare6 = #{spare6}</if>
</where>
</select>

7
ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml
View File

@@ -45,9 +45,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="warehouseName" column="warehouse_name" />
</resultMap>
<sql id="selectCheckStockinVo">
select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 from check_stockin_finish
select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, csf.warehouse_id,warehouse_name, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5
from check_stockin_finish csf
left join bas_warehouse bw on bw.warehouse_id= csf.warehouse_id
</sql>
<sql id="selectCheckStockinFinishVo">
select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no from check_stockin_finish
@@ -89,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createDate != null and createDate != ''"> and create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
<if test="warehouseId != null and warehouseId != ''"> and csf.warehouse_id = #{warehouseId}</if>
<if test="finishDate != null and finishDate != ''"> and finish_date = #{finishDate}</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and stock_source = #{stockSource}</if>

8
ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml
View File

@@ -24,10 +24,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="warehouseName" column="warehouse_name" />
</resultMap>
<sql id="selectCheckStockinVo">
select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 from check_stockin
select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, cs.warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 ,
bw.warehouse_name
from check_stockin cs
left join bas_warehouse bw on cs.warehouse_id = bw.warehouse_id
</sql>
<select id="selectCheckStockinList" parameterType="CheckStockin" resultMap="CheckStockinResult">
@@ -38,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createDate != null and createDate != ''"> and create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
<if test="warehouseId != null and warehouseId != ''"> and cs.warehouse_id = #{warehouseId}</if>
<if test="finishDate != null and finishDate != ''"> and finish_date = #{finishDate}</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and stock_source = #{stockSource}</if>