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

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

@@ -67,42 +67,61 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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="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="selectInStockinDetailFinishVo">
select stockin_detail_id, stockin_guid, stockin_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, spare1, spare2, spare3, spare4, spare5, spare6, scan_num, scan_num_x, scan_num_j from in_stockin_detail_finish
select
isd.stockin_detail_id, isd.stockin_guid, isd.stockin_id, isd.lot_no, isd.product_guid,
isd.product_id, isd.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_finish isd
left join bas_product bp on bp.product_id = isd.product_id
</sql>
<select id="selectInStockinDetailFinishList" parameterType="InStockinDetailFinish" resultMap="InStockinDetailFinishResult">
<include refid="selectInStockinDetailFinishVo"/>
<where>
<if test="stockinGuid != null and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</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="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="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="stockinGuid != null and stockinGuid != ''"> and isd.stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and isd.stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and isd.lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and isd.product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and isd.product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and isd.quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and isd.quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and isd.price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and isd.assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and isd.print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and isd.stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and isd.supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and isd.customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and isd.unit = #{unit}</if>
<if test="spec != null and spec != ''"> and isd.spec = #{spec}</if>
<if test="spare1 != null and spare1 != ''"> and isd.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and isd.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and isd.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and isd.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and isd.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and isd.spare6 = #{spare6}</if>
<if test="scanNum != null and scanNum != ''"> and isd.scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j = #{scanNumJ}</if>
</where>
</select>
@@ -114,34 +133,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
resultMap="InStockinDetailResult">
<include refid="selectInStockinDetailFinishVo"/>
<where>
<if test="stockinGuid != null and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</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="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="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="stockinGuid != null and stockinGuid != ''"> and isd.stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and isd.stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and isd.lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and isd.product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and isd.product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and isd.quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and isd.quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and isd.price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and isd.assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and isd.print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and isd.stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and isd.supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and isd.customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and isd.unit = #{unit}</if>
<if test="spec != null and spec != ''"> and isd.spec = #{spec}</if>
<if test="spare1 != null and spare1 != ''"> and isd.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and isd.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and isd.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and isd.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and isd.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and isd.spare6 = #{spare6}</if>
<if test="scanNum != null and scanNum != ''"> and isd.scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j = #{scanNumJ}</if>
</where>
</select>

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

@@ -35,14 +35,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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="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">
select stockin_detail_id, stockin_guid, stockin_id, lot_no, isd.product_guid,
isd.product_id, quantity, quantity_x, quantity_j, isd.price, isd.cargo_no, isd.remark,
assign_num, assign_num_x, assign_num_j, print_date, stock_status,
supplier_id, customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4,
isd.spare5, isd.spare6, scan_num, scan_num_x, scan_num_j
select
isd.stockin_detail_id, isd.stockin_guid, isd.stockin_id, isd.lot_no, isd.product_guid,
isd.product_id, isd.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
</sql>
@@ -50,34 +63,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectInStockinDetailList" parameterType="InStockinDetail" resultMap="InStockinDetailResult">
<include refid="selectInStockinDetailVo"/>
<where>
<if test="stockinGuid != null and stockinGuid != ''"> and isd.stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and isd.stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and isd.lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and isd.product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and isd.product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and isd.quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and isd.quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and isd.price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and isd.assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and isd.print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and isd.stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and isd.supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and isd.customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and isd.unit = #{unit}</if>
<if test="spec != null and spec != ''"> and isd.spec = #{spec}</if>
<if test="spare1 != null and spare1 != ''"> and isd.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and isd.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and isd.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and isd.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and isd.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and isd.spare6 = #{spare6}</if>
<if test="scanNum != null and scanNum != ''"> and isd.scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j = #{scanNumJ}</if>
<if test="stockinGuid != null and stockinGuid != ''"> and isd.stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and isd.stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and isd.lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and isd.product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and isd.product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and isd.quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and isd.quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and isd.price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and isd.assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and isd.print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and isd.stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and isd.supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and isd.customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and isd.unit = #{unit}</if>
<if test="spec != null and spec != ''"> and isd.spec = #{spec}</if>
<if test="spare1 != null and spare1 != ''"> and isd.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and isd.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and isd.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and isd.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and isd.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and isd.spare6 = #{spare6}</if>
<if test="scanNum != null and scanNum != ''"> and isd.scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j = #{scanNumJ}</if>
</where>
</select>