zyr/FT546MWS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2026.4.27

Browse Source 
大更新
This commit is contained in:
1009473166@qq.com
2026-04-27 16:02:27 +08:00
parent 52ce9135da
commit 6ce9f469e0
184 changed files with 16502 additions and 2016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailFinishMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
@@ -87,31 +87,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectReceiveStockinDetailFinishList" parameterType="ReceiveStockinDetailFinish" resultMap="ReceiveStockinDetailFinishResult">
<include refid="selectReceiveStockinDetailFinishVo"/>
<where>
<if test="stockinGuid != null and stockinGuid != ''"> and rsd.stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and rsd.stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and rsd.lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and rsd.product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and rsd.product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and rsd.quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and rsd.quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and rsd.quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and rsd.price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and rsd.cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and rsd.assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and rsd.assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and rsd.assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and rsd.print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and rsd.stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and rsd.supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and rsd.customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and rsd.unit = #{unit}</if>
<if test="spec != null and spec != ''"> and rsd.spec = #{spec}</if>
<if test="spare1 != null and spare1 != ''"> and rsd.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and rsd.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and rsd.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and rsd.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and rsd.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and rsd.spare6 = #{spare6}</if>
<if test="stockinGuid != null and stockinGuid != ''"> and rsd.stockin_guid like concat('%', #{stockinGuid}, '%')</if>
<if test="stockinId != null and stockinId != ''"> and rsd.stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="lotNo != null and lotNo != ''"> and rsd.lot_no like concat('%', #{lotNo}, '%')</if>
<if test="productGuid != null and productGuid != ''"> and rsd.product_guid like concat('%', #{productGuid}, '%')</if>
<if test="productId != null and productId != ''"> and rsd.product_id like concat('%', #{productId}, '%')</if>
<if test="quantity != null and quantity != ''"> and rsd.quantity like concat('%', #{quantity}, '%')</if>
<if test="quantityX != null and quantityX != ''"> and rsd.quantity_x like concat('%', #{quantityX}, '%')</if>
<if test="quantityJ != null and quantityJ != ''"> and rsd.quantity_j like concat('%', #{quantityJ}, '%')</if>
<if test="price != null and price != ''"> and rsd.price like concat('%', #{price}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and rsd.cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="assignNum != null and assignNum != ''"> and rsd.assign_num like concat('%', #{assignNum}, '%')</if>
<if test="assignNumX != null and assignNumX != ''"> and rsd.assign_num_x like concat('%', #{assignNumX}, '%')</if>
<if test="assignNumJ != null and assignNumJ != ''"> and rsd.assign_num_j like concat('%', #{assignNumJ}, '%')</if>
<if test="printDate != null and printDate != ''"> and rsd.print_date like concat('%', #{printDate}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and rsd.stock_status like concat('%', #{stockStatus}, '%')</if>
<if test="supplierId != null and supplierId != ''"> and rsd.supplier_id like concat('%', #{supplierId}, '%')</if>
<if test="customerId != null and customerId != ''"> and rsd.customer_id like concat('%', #{customerId}, '%')</if>
<if test="unit != null and unit != ''"> and rsd.unit like concat('%', #{unit}, '%')</if>
<if test="spec != null and spec != ''"> and rsd.spec like concat('%', #{spec}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and rsd.spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and rsd.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and rsd.spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and rsd.spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and rsd.spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and rsd.spare6 like concat('%', #{spare6}, '%')</if>
</where>
</select>
@@ -123,31 +123,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
resultMap="ReceiveStockinDetailResult">
<include refid="selectReceiveStockinDetailFinishVo"/>
<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="stockinGuid != null and stockinGuid != ''"> and stockin_guid like concat('%', #{stockinGuid}, '%')</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="lotNo != null and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
<if test="productGuid != null and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
<if test="productId != null and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
<if test="quantity != null and quantity != ''"> and quantity like concat('%', #{quantity}, '%')</if>
<if test="quantityX != null and quantityX != ''"> and quantity_x like concat('%', #{quantityX}, '%')</if>
<if test="quantityJ != null and quantityJ != ''"> and quantity_j like concat('%', #{quantityJ}, '%')</if>
<if test="price != null and price != ''"> and price like concat('%', #{price}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="assignNum != null and assignNum != ''"> and assign_num like concat('%', #{assignNum}, '%')</if>
<if test="assignNumX != null and assignNumX != ''"> and assign_num_x like concat('%', #{assignNumX}, '%')</if>
<if test="assignNumJ != null and assignNumJ != ''"> and assign_num_j like concat('%', #{assignNumJ}, '%')</if>
<if test="printDate != null and printDate != ''"> and print_date like concat('%', #{printDate}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status like concat('%', #{stockStatus}, '%')</if>
<if test="supplierId != null and supplierId != ''"> and supplier_id like concat('%', #{supplierId}, '%')</if>
<if test="customerId != null and customerId != ''"> and customer_id like concat('%', #{customerId}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="spec != null and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
</where>
</select>
@@ -257,3 +257,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
</mapper>

53
ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
@@ -58,31 +58,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectReceiveStockinDetailList" parameterType="ReceiveStockinDetail" resultMap="ReceiveStockinDetailResult">
<include refid="selectReceiveStockinDetailVo"/>
<where>
<if test="stockinGuid != null and stockinGuid != ''"> and rsd.stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and rsd.stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and rsd.lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and rsd.product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and rsd.product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and rsd.quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and rsd.quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and rsd.quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and rsd.price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and rsd.cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and rsd.assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and rsd.assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and rsd.assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and rsd.print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and rsd.stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and rsd.supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and rsd.customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and rsd.unit = #{unit}</if>
<if test="spec != null and spec != ''"> and rsd.spec = #{spec}</if>
<if test="spare1 != null and spare1 != ''"> and rsd.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and rsd.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and rsd.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and rsd.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and rsd.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and rsd.spare6 = #{spare6}</if>
<if test="stockinGuid != null and stockinGuid != ''"> and rsd.stockin_guid like concat('%', #{stockinGuid}, '%')</if>
<if test="stockinId != null and stockinId != ''"> and rsd.stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="lotNo != null and lotNo != ''"> and rsd.lot_no like concat('%', #{lotNo}, '%')</if>
<if test="productGuid != null and productGuid != ''"> and rsd.product_guid like concat('%', #{productGuid}, '%')</if>
<if test="productId != null and productId != ''"> and rsd.product_id like concat('%', #{productId}, '%')</if>
<if test="quantity != null and quantity != ''"> and rsd.quantity like concat('%', #{quantity}, '%')</if>
<if test="quantityX != null and quantityX != ''"> and rsd.quantity_x like concat('%', #{quantityX}, '%')</if>
<if test="quantityJ != null and quantityJ != ''"> and rsd.quantity_j like concat('%', #{quantityJ}, '%')</if>
<if test="price != null and price != ''"> and rsd.price like concat('%', #{price}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and rsd.cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="assignNum != null and assignNum != ''"> and rsd.assign_num like concat('%', #{assignNum}, '%')</if>
<if test="assignNumX != null and assignNumX != ''"> and rsd.assign_num_x like concat('%', #{assignNumX}, '%')</if>
<if test="assignNumJ != null and assignNumJ != ''"> and rsd.assign_num_j like concat('%', #{assignNumJ}, '%')</if>
<if test="printDate != null and printDate != ''"> and rsd.print_date like concat('%', #{printDate}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and rsd.stock_status like concat('%', #{stockStatus}, '%')</if>
<if test="supplierId != null and supplierId != ''"> and rsd.supplier_id like concat('%', #{supplierId}, '%')</if>
<if test="customerId != null and customerId != ''"> and rsd.customer_id like concat('%', #{customerId}, '%')</if>
<if test="unit != null and unit != ''"> and rsd.unit like concat('%', #{unit}, '%')</if>
<if test="spec != null and spec != ''"> and rsd.spec like concat('%', #{spec}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and rsd.spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and rsd.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and rsd.spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and rsd.spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and rsd.spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and rsd.spare6 like concat('%', #{spare6}, '%')</if>
</where>
</select>
@@ -202,3 +202,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
</mapper>

75
ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinFinishMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
@@ -86,24 +86,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectReceiveStockinFinishList" parameterType="ReceiveStockinFinish" resultMap="ReceiveStockinFinishResult">
<include refid="selectReceiveStockinFinishVo"/>
<where>
<if test="stockinId != null and stockinId != ''"> and rs.stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and rs.in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and rs.create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and rs.create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and rs.status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and rs.warehouse_id = #{warehouseId}</if>
<if test="spare5 != null and spare5 != ''"> and rs.spare5 = #{spare5}</if>
<if test="spare4 != null and spare4 != ''"> and rs.spare4 = #{spare4}</if>
<if test="spare3 != null and spare3 != ''"> and rs.spare3 = #{spare3}</if>
<if test="finishDate != null and finishDate != ''"> and rs.finish_date = #{finishDate}</if>
<if test="spare2 != null and spare2 != ''"> and rs.spare2 = #{spare2}</if>
<if test="spare1 != null and spare1 != ''"> and rs.spare1 = #{spare1}</if>
<if test="erpBill != null and erpBill != ''"> and rs.erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and rs.stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and rs.department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and rs.customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and rs.class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and rs.supplier_no = #{supplierNo}</if>
<if test="stockinId != null and stockinId != ''"> and rs.stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="inType != null and inType != ''"> and rs.in_type like concat('%', #{inType}, '%')</if>
<if test="createDate != null and createDate != ''"> and rs.create_date like concat('%', #{createDate}, '%')</if>
<if test="createManId != null and createManId != ''"> and rs.create_man_id like concat('%', #{createManId}, '%')</if>
<if test="status != null and status != ''"> and rs.status like concat('%', #{status}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and rs.warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and rs.spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and rs.spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and rs.spare3 like concat('%', #{spare3}, '%')</if>
<if test="finishDate != null and finishDate != ''"> and rs.finish_date like concat('%', #{finishDate}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and rs.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and rs.spare1 like concat('%', #{spare1}, '%')</if>
<if test="erpBill != null and erpBill != ''"> and rs.erp_bill like concat('%', #{erpBill}, '%')</if>
<if test="stockSource != null and stockSource != ''"> and rs.stock_source like concat('%', #{stockSource}, '%')</if>
<if test="departmentNo != null and departmentNo != ''"> and rs.department_no like concat('%', #{departmentNo}, '%')</if>
<if test="customerNo != null and customerNo != ''"> and rs.customer_no like concat('%', #{customerNo}, '%')</if>
<if test="classNo != null and classNo != ''"> and rs.class_no like concat('%', #{classNo}, '%')</if>
<if test="supplierNo != null and supplierNo != ''"> and rs.supplier_no like concat('%', #{supplierNo}, '%')</if>
</where>
</select>
@@ -114,24 +114,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectReceiveStockinList" resultMap="ReceiveStockinResult">
<include refid="selectReceiveStockinFinishVo"/>
<where>
<if test="stockinId != null and stockinId != ''"> and rs.stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and rs.in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and rs.create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and rs.create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and rs.status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and rs.warehouse_id = #{warehouseId}</if>
<if test="spare5 != null and spare5 != ''"> and rs.spare5 = #{spare5}</if>
<if test="spare4 != null and spare4 != ''"> and rs.spare4 = #{spare4}</if>
<if test="spare3 != null and spare3 != ''"> and rs.spare3 = #{spare3}</if>
<if test="finishDate != null and finishDate != ''"> and rs.finish_date = #{finishDate}</if>
<if test="spare2 != null and spare2 != ''"> and rs.spare2 = #{spare2}</if>
<if test="spare1 != null and spare1 != ''"> and rs.spare1 = #{spare1}</if>
<if test="erpBill != null and erpBill != ''"> and rs.erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and rs.stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and rs.department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and rs.customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and rs.class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and rs.supplier_no = #{supplierNo}</if>
<if test="stockinId != null and stockinId != ''"> and rs.stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="inType != null and inType != ''"> and rs.in_type like concat('%', #{inType}, '%')</if>
<if test="createDate != null and createDate != ''"> and rs.create_date like concat('%', #{createDate}, '%')</if>
<if test="createManId != null and createManId != ''"> and rs.create_man_id like concat('%', #{createManId}, '%')</if>
<if test="status != null and status != ''"> and rs.status like concat('%', #{status}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and rs.warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and rs.spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and rs.spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and rs.spare3 like concat('%', #{spare3}, '%')</if>
<if test="finishDate != null and finishDate != ''"> and rs.finish_date like concat('%', #{finishDate}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and rs.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and rs.spare1 like concat('%', #{spare1}, '%')</if>
<if test="erpBill != null and erpBill != ''"> and rs.erp_bill like concat('%', #{erpBill}, '%')</if>
<if test="stockSource != null and stockSource != ''"> and rs.stock_source like concat('%', #{stockSource}, '%')</if>
<if test="departmentNo != null and departmentNo != ''"> and rs.department_no like concat('%', #{departmentNo}, '%')</if>
<if test="customerNo != null and customerNo != ''"> and rs.customer_no like concat('%', #{customerNo}, '%')</if>
<if test="classNo != null and classNo != ''"> and rs.class_no like concat('%', #{classNo}, '%')</if>
<if test="supplierNo != null and supplierNo != ''"> and rs.supplier_no like concat('%', #{supplierNo}, '%')</if>
<if test="materialDesc !=null and materialDesc!=''">
and rs.stockin_id in (
select distinct stockin_id from receive_stockin_detail_finish rsd
@@ -234,3 +234,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
</mapper>

39
ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
@@ -66,24 +66,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectReceiveStockinList" parameterType="ReceiveStockin" resultMap="ReceiveStockinResult">
<include refid="selectReceiveStockinVo"/>
<where>
<if test="stockinId != null and stockinId != ''"> and rs.stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and rs.in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and rs.create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and rs.create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and rs.status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and rs.warehouse_id = #{warehouseId}</if>
<if test="spare5 != null and spare5 != ''"> and rs.spare5 = #{spare5}</if>
<if test="spare4 != null and spare4 != ''"> and rs.spare4 = #{spare4}</if>
<if test="spare3 != null and spare3 != ''"> and rs.spare3 = #{spare3}</if>
<if test="finishDate != null and finishDate != ''"> and rs.finish_date = #{finishDate}</if>
<if test="spare2 != null and spare2 != ''"> and rs.spare2 = #{spare2}</if>
<if test="spare1 != null and spare1 != ''"> and rs.spare1 = #{spare1}</if>
<if test="erpBill != null and erpBill != ''"> and rs.erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and rs.stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and rs.department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and rs.customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and rs.class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and rs.supplier_no = #{supplierNo}</if>
<if test="stockinId != null and stockinId != ''"> and rs.stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="inType != null and inType != ''"> and rs.in_type like concat('%', #{inType}, '%')</if>
<if test="createDate != null and createDate != ''"> and rs.create_date like concat('%', #{createDate}, '%')</if>
<if test="createManId != null and createManId != ''"> and rs.create_man_id like concat('%', #{createManId}, '%')</if>
<if test="status != null and status != ''"> and rs.status like concat('%', #{status}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and rs.warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and rs.spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and rs.spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and rs.spare3 like concat('%', #{spare3}, '%')</if>
<if test="finishDate != null and finishDate != ''"> and rs.finish_date like concat('%', #{finishDate}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and rs.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and rs.spare1 like concat('%', #{spare1}, '%')</if>
<if test="erpBill != null and erpBill != ''"> and rs.erp_bill like concat('%', #{erpBill}, '%')</if>
<if test="stockSource != null and stockSource != ''"> and rs.stock_source like concat('%', #{stockSource}, '%')</if>
<if test="departmentNo != null and departmentNo != ''"> and rs.department_no like concat('%', #{departmentNo}, '%')</if>
<if test="customerNo != null and customerNo != ''"> and rs.customer_no like concat('%', #{customerNo}, '%')</if>
<if test="classNo != null and classNo != ''"> and rs.class_no like concat('%', #{classNo}, '%')</if>
<if test="supplierNo != null and supplierNo != ''"> and rs.supplier_no like concat('%', #{supplierNo}, '%')</if>
<if test="materialDesc !=null and materialDesc!=''">
and rs.stockin_id in (
select distinct stockin_id from receive_stockin_detail rsd
@@ -195,3 +195,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
</mapper>