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

本地最新代码:同步所有修改及新增模块

Browse Source
This commit is contained in:
local
2026-08-11 13:34:15 +08:00
parent 2b86d14f56
commit 916ac6bda3
172 changed files with 13896 additions and 1774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
ruoyi-admin/src/main/resources/mapper/in/InStockinBackMapper.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">
@@ -27,38 +27,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="sendStatus" column="send_status"/>
<result property="sendTime" column="send_time"/>
<result property="msg" column="msg"/>
<result property="companyShortName" column="company_short_name"/>
<result property="accountSetNo" column="account_set_no"/>
</resultMap>
<sql id="selectInStockinBackVo">
select stockin_guid, stockin_id, in_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,send_status,send_time,msg from in_stockin_back
customer_no, class_no, supplier_no,send_status,send_time,msg,company_short_name,account_set_no from in_stockin_back
</sql>
<select id="selectInStockinBackList" parameterType="InStockinBack" resultMap="InStockinBackResult">
<include refid="selectInStockinBackVo"/>
<where>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and in_type = #{inType}</if>
<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="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="finishDate != null and finishDate != ''"> and finish_date = #{finishDate}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
<if test="sendStatus != null and sendStatus != ''"> and send_status = #{sendStatus}</if>
<if test="sendTime != null and sendTime != ''"> and send_time = #{sendTime}</if>
<if test="msg != null and msg != ''"> and msg = #{msg}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="inType != null and inType != ''"> and in_type like concat('%', #{inType}, '%')</if>
<if test="createDate != null and createDate != ''"> and create_date like concat('%', #{createDate}, '%')</if>
<if test="createManId != null and createManId != ''"> and create_man_id like concat('%', #{createManId}, '%')</if>
<if test="status != null and status != ''"> and status like concat('%', #{status}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
<if test="finishDate != null and finishDate != ''"> and finish_date like concat('%', #{finishDate}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill like concat('%', #{erpBill}, '%')</if>
<if test="stockSource != null and stockSource != ''"> and stock_source like concat('%', #{stockSource}, '%')</if>
<if test="departmentNo != null and departmentNo != ''"> and department_no like concat('%', #{departmentNo}, '%')</if>
<if test="customerNo != null and customerNo != ''"> and customer_no like concat('%', #{customerNo}, '%')</if>
<if test="classNo != null and classNo != ''"> and class_no like concat('%', #{classNo}, '%')</if>
<if test="supplierNo != null and supplierNo != ''"> and supplier_no like concat('%', #{supplierNo}, '%')</if>
<if test="sendStatus != null and sendStatus != ''"> and send_status like concat('%', #{sendStatus}, '%')</if>
<if test="sendTime != null and sendTime != ''"> and send_time like concat('%', #{sendTime}, '%')</if>
<if test="msg != null and msg != ''"> and msg like concat('%', #{msg}, '%')</if>
</where>
</select>
@@ -146,7 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="classNo != null">class_no = #{classNo},</if>
<if test="supplierNo != null">supplier_no = #{supplierNo},</if>
<if test="sendStatus != null">send_status = #{sendStatus},</if>
<if test="senTime != null">send_time = #{senTime},</if>
<if test="sendTime != null">send_time = #{sendTime},</if>
<if test="msg != null">msg = #{msg},</if>
</trim>
where stockin_guid = #{stockinGuid}
@@ -165,7 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTopInStockin" resultMap="InStockinBackResult">
select top(1) *
from in_stockin_back where status= 0
from in_stockin_back where send_status= 0 and stock_source =1
</select>
</mapper>
</mapper>

145
ruoyi-admin/src/main/resources/mapper/in/InStockinDetailBackMapper.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">
@@ -42,53 +42,95 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="sendStatus" column="send_status"/>
<result property="sendTime" column="send_time"/>
<result property="msg" column="msg"/>
<result property="sourceLineId" column="source_line_id"/>
<result property="barCode" column="bar_code"/>
<result property="isBatchManage" column="is_batch_manage"/>
<result property="oldProjectNo" column="old_project_no"/>
</resultMap>
<sql id="selectInStockinDetailBackVo">
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, spare7, spare8, spare9, product_name,send_status,send_time,msg from in_stockin_detail_back
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,
spare7,
spare8,
spare9,
product_name,
send_status,
send_time,
msg,
source_line_id,
bar_code,
is_batch_manage,
old_project_no
from in_stockin_detail_back
</sql>
<select id="selectInStockinDetailBackList" parameterType="InStockinDetailBack" resultMap="InStockinDetailBackResult">
<include refid="selectInStockinDetailBackVo"/>
<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="spare7 != null and spare7 != ''"> and spare7 = #{spare7}</if>
<if test="spare8 != null and spare8 != ''"> and spare8 = #{spare8}</if>
<if test="spare9 != null and spare9 != ''"> and spare9 = #{spare9}</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>
<if test="scanNum != null and scanNum != ''"> and scan_num like concat('%', #{scanNum}, '%')</if>
<if test="scanNumX != null and scanNumX != ''"> and scan_num_x like concat('%', #{scanNumX}, '%')</if>
<if test="scanNumJ != null and scanNumJ != ''"> and scan_num_j like concat('%', #{scanNumJ}, '%')</if>
<if test="spare7 != null and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
<if test="spare8 != null and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
<if test="spare9 != null and spare9 != ''"> and spare9 like concat('%', #{spare9}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="sendStatus != null and sendStatus != ''"> and send_status = #{sendStatus}</if>
<if test="sendTime != null and sendTime != ''"> and send_time = #{sendTime}</if>
<if test="msg != null and msg != ''"> and msg = #{msg}</if>
<if test="sendStatus != null and sendStatus != ''"> and send_status like concat('%', #{sendStatus}, '%')</if>
<if test="sendTime != null and sendTime != ''"> and send_time like concat('%', #{sendTime}, '%')</if>
<if test="msg != null and msg != ''"> and msg like concat('%', #{msg}, '%')</if>
</where>
</select>
@@ -189,7 +231,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update in_stockin_detail_back
<trim prefix="SET" suffixOverrides=",">
<if test="stockinGuid != null and stockinGuid != ''">stockin_guid = #{stockinGuid},</if>
<if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
<if test="lotNo != null">lot_no = #{lotNo},</if>
<if test="productGuid != null">product_guid = #{productGuid},</if>
<if test="productId != null and productId != ''">product_id = #{productId},</if>
@@ -222,10 +264,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare9 != null">spare9 = #{spare9},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="sendStatus != null">send_status = #{sendStatus},</if>
<if test="senTime != null">send_time = #{senTime},</if>
<if test="sendTime != null">send_time = #{sendTime},</if>
<if test="msg != null">msg = #{msg},</if>
</trim>
where stockin_detail_id = #{stockinDetailId}
where stockin_id = #{stockinId}
</update>
<delete id="deleteInStockinDetailBackByStockinDetailId" parameterType="String">
@@ -238,4 +280,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{stockinDetailId}
</foreach>
</delete>
</mapper>
<insert id="insertInStockInDetailBackFinish" parameterType="java.util.List">
INSERT INTO in_stockin_detail_back_finish
<foreach collection="list" item="item" separator="UNION ALL">
SELECT * FROM in_stockin_detail_back
WHERE stockin_detail_id = #{item.stockinDetailId}
</foreach>
</insert>
<delete id="deleteInStockInDetailList">
DELETE FROM in_stockin_detail_back
WHERE stockin_detail_id IN
<foreach collection="idList" item="item" open="(" separator="," close=")">
#{item.stockinDetailId}
</foreach>
</delete>
</mapper>

115
ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.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">
@@ -103,34 +103,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectInStockinDetailFinishList" parameterType="InStockinDetailFinish" resultMap="InStockinDetailFinishResult">
<include refid="selectInStockinDetailFinishVo"/>
<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 like concat('%', #{stockinGuid}, '%')</if>
<if test="stockinId != null and stockinId != ''"> and isd.stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="lotNo != null and lotNo != ''"> and isd.lot_no like concat('%', #{lotNo}, '%')</if>
<if test="productGuid != null and productGuid != ''"> and isd.product_guid like concat('%', #{productGuid}, '%')</if>
<if test="productId != null and productId != ''"> and isd.product_id like concat('%', #{productId}, '%')</if>
<if test="quantity != null and quantity != ''"> and isd.quantity like concat('%', #{quantity}, '%')</if>
<if test="quantityX != null and quantityX != ''"> and isd.quantity_x like concat('%', #{quantityX}, '%')</if>
<if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j like concat('%', #{quantityJ}, '%')</if>
<if test="price != null and price != ''"> and isd.price like concat('%', #{price}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="assignNum != null and assignNum != ''"> and isd.assign_num like concat('%', #{assignNum}, '%')</if>
<if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x like concat('%', #{assignNumX}, '%')</if>
<if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j like concat('%', #{assignNumJ}, '%')</if>
<if test="printDate != null and printDate != ''"> and isd.print_date like concat('%', #{printDate}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and isd.stock_status like concat('%', #{stockStatus}, '%')</if>
<if test="supplierId != null and supplierId != ''"> and isd.supplier_id like concat('%', #{supplierId}, '%')</if>
<if test="customerId != null and customerId != ''"> and isd.customer_id like concat('%', #{customerId}, '%')</if>
<if test="unit != null and unit != ''"> and isd.unit like concat('%', #{unit}, '%')</if>
<if test="spec != null and spec != ''"> and isd.spec like concat('%', #{spec}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and isd.spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and isd.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and isd.spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and isd.spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and isd.spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and isd.spare6 like concat('%', #{spare6}, '%')</if>
<if test="scanNum != null and scanNum != ''"> and isd.scan_num like concat('%', #{scanNum}, '%')</if>
<if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x like concat('%', #{scanNumX}, '%')</if>
<if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j like concat('%', #{scanNumJ}, '%')</if>
</where>
</select>
@@ -142,34 +142,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
resultMap="InStockinDetailResult">
<include refid="selectInStockinDetailFinishVo"/>
<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 like concat('%', #{stockinGuid}, '%')</if>
<if test="stockinId != null and stockinId != ''"> and isd.stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="lotNo != null and lotNo != ''"> and isd.lot_no like concat('%', #{lotNo}, '%')</if>
<if test="productGuid != null and productGuid != ''"> and isd.product_guid like concat('%', #{productGuid}, '%')</if>
<if test="productId != null and productId != ''"> and isd.product_id like concat('%', #{productId}, '%')</if>
<if test="quantity != null and quantity != ''"> and isd.quantity like concat('%', #{quantity}, '%')</if>
<if test="quantityX != null and quantityX != ''"> and isd.quantity_x like concat('%', #{quantityX}, '%')</if>
<if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j like concat('%', #{quantityJ}, '%')</if>
<if test="price != null and price != ''"> and isd.price like concat('%', #{price}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="assignNum != null and assignNum != ''"> and isd.assign_num like concat('%', #{assignNum}, '%')</if>
<if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x like concat('%', #{assignNumX}, '%')</if>
<if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j like concat('%', #{assignNumJ}, '%')</if>
<if test="printDate != null and printDate != ''"> and isd.print_date like concat('%', #{printDate}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and isd.stock_status like concat('%', #{stockStatus}, '%')</if>
<if test="supplierId != null and supplierId != ''"> and isd.supplier_id like concat('%', #{supplierId}, '%')</if>
<if test="customerId != null and customerId != ''"> and isd.customer_id like concat('%', #{customerId}, '%')</if>
<if test="unit != null and unit != ''"> and isd.unit like concat('%', #{unit}, '%')</if>
<if test="spec != null and spec != ''"> and isd.spec like concat('%', #{spec}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and isd.spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and isd.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and isd.spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and isd.spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and isd.spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and isd.spare6 like concat('%', #{spare6}, '%')</if>
<if test="scanNum != null and scanNum != ''"> and isd.scan_num like concat('%', #{scanNum}, '%')</if>
<if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x like concat('%', #{scanNumX}, '%')</if>
<if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j like concat('%', #{scanNumJ}, '%')</if>
</where>
</select>
@@ -288,3 +288,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
</mapper>

86
ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.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">
@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="warehouseName" column="warehouse_name" />
<result property="warehouseId" column="warehouse_id" />
<result property="productName" column="product_name" />
<result property="erpBill" column="erp_bill" />
<!-- <association property="extraField" javaType="ExtraField">-->
<!-- <result property="productId" column="product_id" />-->
<!-- <result property="materialDesc" column="product_name" />-->
@@ -69,40 +70,40 @@ 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 like concat('%', #{stockinGuid}, '%')</if>
<if test="stockinId != null and stockinId != ''"> and isd.stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="lotNo != null and lotNo != ''"> and isd.lot_no like concat('%', #{lotNo}, '%')</if>
<if test="productGuid != null and productGuid != ''"> and isd.product_guid like concat('%', #{productGuid}, '%')</if>
<if test="productId != null and productId != ''"> and isd.product_id like concat('%', #{productId}, '%')</if>
<if test="quantity != null and quantity != ''"> and isd.quantity like concat('%', #{quantity}, '%')</if>
<if test="quantityX != null and quantityX != ''"> and isd.quantity_x like concat('%', #{quantityX}, '%')</if>
<if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j like concat('%', #{quantityJ}, '%')</if>
<if test="price != null and price != ''"> and isd.price like concat('%', #{price}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="assignNum != null and assignNum != ''"> and isd.assign_num like concat('%', #{assignNum}, '%')</if>
<if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x like concat('%', #{assignNumX}, '%')</if>
<if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j like concat('%', #{assignNumJ}, '%')</if>
<if test="printDate != null and printDate != ''"> and isd.print_date like concat('%', #{printDate}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and isd.stock_status like concat('%', #{stockStatus}, '%')</if>
<if test="supplierId != null and supplierId != ''"> and isd.supplier_id like concat('%', #{supplierId}, '%')</if>
<if test="customerId != null and customerId != ''"> and isd.customer_id like concat('%', #{customerId}, '%')</if>
<if test="unit != null and unit != ''"> and isd.unit like concat('%', #{unit}, '%')</if>
<if test="spec != null and spec != ''"> and isd.spec like concat('%', #{spec}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and isd.spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and isd.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and isd.spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and isd.spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and isd.spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and isd.spare6 like concat('%', #{spare6}, '%')</if>
<if test="scanNum != null and scanNum != ''"> and isd.scan_num like concat('%', #{scanNum}, '%')</if>
<if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x like concat('%', #{scanNumX}, '%')</if>
<if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j like concat('%', #{scanNumJ}, '%')</if>
</where>
</select>
<select id="selectInStockinDetailByStockinDetailId" parameterType="String" resultMap="InStockinDetailResult">
<include refid="selectInStockinDetailVo"/>
where stockin_detail_id = #{stockinDetailId}
where stockin_detail_id = #{stockinDetailId} or bar_code=#{stockinDetailId}
</select>
<insert id="insertInStockinDetail" parameterType="InStockinDetail">
@@ -143,7 +144,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="scanNumX != null">scan_num_x,</if>
<if test="scanNumJ != null">scan_num_j,</if>
<if test="productName != null">product_name,</if>
</trim>
<if test="sourceLineId != null">source_line_id,</if>
<if test="barCode != null">bar_code,</if>
<if test="isBatchManage != null">is_batch_manage,</if>
<if test="oldProjectNo != null">old_project_no,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="stockinDetailId != null">#{stockinDetailId},</if>
<if test="stockinGuid != null and stockinGuid != ''">#{stockinGuid},</if>
@@ -180,7 +185,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="scanNumX != null">#{scanNumX},</if>
<if test="scanNumJ != null">#{scanNumJ},</if>
<if test="productName != null">#{productName},</if>
</trim>
<if test="sourceLineId != null">#{sourceLineId},</if>
<if test="barCode != null">#{barCode},</if>
<if test="isBatchManage != null">#{isBatchManage},</if>
<if test="oldProjectNo != null">#{oldProjectNo},</if>
</trim>
</insert>
<insert id="insertInStockinDetailList">
INSERT INTO in_stockin_detail
@@ -333,4 +344,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
order by ist.create_date desc
</select>
<select id="selectStockInByDetailByBarCode" parameterType="string" resultMap="InStockinDetailResult">
select a.erp_bill,b.* from in_stockin a left join in_stockin_detail b on a.stockin_id=b.stockin_id where b.bar_code=#{barCode}
</select>
</mapper>

79
ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.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">
@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectInStockinFinishVo">
select is2.stockin_guid,
select distinct is2.stockin_guid,
is2.stockin_id,
is2.in_type,
is2.create_date,
@@ -78,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-- su.user_name
from in_stockin_finish is2
left join bas_warehouse bw on is2.warehouse_id = bw.warehouse_id
left join in_stockin_detail is3 on is2.stockin_id=is3.stockin_id
-- left join bas_supplier bs on bs.supplier_no = is2.supplier_no
-- left join sys_dept sd on is2.department_no = sd.dept_id
-- left join sys_user su on su.user_id = is2.create_man_id
@@ -86,24 +87,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectInStockinFinishList" parameterType="InStockinFinish" resultMap="InStockinFinishResult">
<include refid="selectInStockinFinishVo"/>
<where>
<if test="stockinId != null and stockinId != ''"> and is2.stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and is2.in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and is2.create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and is2.create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and is2.status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and is2.warehouse_id = #{warehouseId}</if>
<if test="finishDate != null and finishDate != ''"> and is2.finish_date = #{finishDate}</if>
<if test="erpBill != null and erpBill != ''"> and is2.erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and is2.stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and is2.department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and is2.customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and is2.class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and is2.supplier_no = #{supplierNo}</if>
<if test="spare1 != null and spare1 != ''"> and is2.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and is2.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and is2.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and is2.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and is2.spare5 = #{spare5}</if>
<if test="stockinId != null and stockinId != ''"> and is2.stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="inType != null and inType != ''"> and is2.in_type like concat('%', #{inType}, '%')</if>
<if test="createDate != null and createDate != ''"> and is2.create_date like concat('%', #{createDate}, '%')</if>
<if test="createManId != null and createManId != ''"> and is2.create_man_id like concat('%', #{createManId}, '%')</if>
<if test="status != null and status != ''"> and is2.status like concat('%', #{status}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and is2.warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="finishDate != null and finishDate != ''"> and is2.finish_date like concat('%', #{finishDate}, '%')</if>
<if test="erpBill != null and erpBill != ''"> and is2.erp_bill like concat('%', #{erpBill}, '%')</if>
<if test="stockSource != null and stockSource != ''"> and is2.stock_source like concat('%', #{stockSource}, '%')</if>
<if test="departmentNo != null and departmentNo != ''"> and is2.department_no like concat('%', #{departmentNo}, '%')</if>
<if test="customerNo != null and customerNo != ''"> and is2.customer_no like concat('%', #{customerNo}, '%')</if>
<if test="classNo != null and classNo != ''"> and is2.class_no like concat('%', #{classNo}, '%')</if>
<if test="supplierNo != null and supplierNo != ''"> and is2.supplier_no like concat('%', #{supplierNo}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and is2.spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and is2.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and is2.spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and is2.spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and is2.spare5 like concat('%', #{spare5}, '%')</if>
<if test="stockinDetailId != null and stockinDetailId != ''"> and is3.stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
</where>
</select>
@@ -121,24 +123,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectInStockinFinishListByInStockin" resultMap="InStockinResult">
<include refid="selectInStockinFinishVo"/>
<where>
<if test="stockinId != null and stockinId != ''"> and is2.stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and is2.in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and is2.create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and is2.create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and is2.status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and is2.warehouse_id = #{warehouseId}</if>
<if test="finishDate != null and finishDate != ''"> and is2.finish_date = #{finishDate}</if>
<if test="erpBill != null and erpBill != ''"> and is2.erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and is2.stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and is2.department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and is2.customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and is2.class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and is2.supplier_no = #{supplierNo}</if>
<if test="spare1 != null and spare1 != ''"> and is2.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and is2.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and is2.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and is2.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and is2.spare5 = #{spare5}</if>
<if test="stockinId != null and stockinId != ''"> and is2.stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="inType != null and inType != ''"> and is2.in_type like concat('%', #{inType}, '%')</if>
<if test="createDate != null and createDate != ''"> and is2.create_date like concat('%', #{createDate}, '%')</if>
<if test="createManId != null and createManId != ''"> and is2.create_man_id like concat('%', #{createManId}, '%')</if>
<if test="status != null and status != ''"> and is2.status like concat('%', #{status}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and is2.warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="finishDate != null and finishDate != ''"> and is2.finish_date like concat('%', #{finishDate}, '%')</if>
<if test="erpBill != null and erpBill != ''"> and is2.erp_bill like concat('%', #{erpBill}, '%')</if>
<if test="stockSource != null and stockSource != ''"> and is2.stock_source like concat('%', #{stockSource}, '%')</if>
<if test="departmentNo != null and departmentNo != ''"> and is2.department_no like concat('%', #{departmentNo}, '%')</if>
<if test="customerNo != null and customerNo != ''"> and is2.customer_no like concat('%', #{customerNo}, '%')</if>
<if test="classNo != null and classNo != ''"> and is2.class_no like concat('%', #{classNo}, '%')</if>
<if test="supplierNo != null and supplierNo != ''"> and is2.supplier_no like concat('%', #{supplierNo}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and is2.spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and is2.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and is2.spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and is2.spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and is2.spare5 like concat('%', #{spare5}, '%')</if>
<if test="materialDesc !=null and materialDesc!=''">
and is2.stockin_id in (
select distinct stockin_id from in_stockin_detail_finish isd
@@ -241,3 +243,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
</mapper>

146
ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.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">
@@ -28,10 +28,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare4" column="spare4" />
<result property="spare3" column="spare3" />
<result property="spare5" column="spare5" />
<result property="accountSetNo" column="account_set_no" />
</resultMap>
<sql id="selectInStockinVo">
select is2.stockin_guid,
select DISTINCT is2.stockin_guid,
is2.stockin_id,
is2.in_type,
is2.create_date,
@@ -53,33 +54,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bw.warehouse_name
from in_stockin is2
left join bas_warehouse bw on is2.warehouse_id = bw.warehouse_id
-- left join bas_supplier bs on bs.supplier_no = is2.supplier_no
-- LEFT JOIN in_stockin_detail is3 on is2.stockin_id=is3.stockin_id
-- left join bas_supplier bs on bs.supplier_no = is2.supplier_no
-- left join sys_dept sd on is2.department_no = sd.dept_id
-- left join sys_user su on su.user_id = is2.create_man_id
</sql>
<select id="selectInStockinList" parameterType="InStockin" resultMap="InStockinResult">
<select id="selectInStockinListBill" parameterType="InStockin" resultMap="InStockinResult">
<include refid="selectInStockinVo"/>
<where>
<if test="stockinId != null and stockinId != ''"> and is2.stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and is2.in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and is2.create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and is2.create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and is2.status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and is2.warehouse_id = #{warehouseId}</if>
<if test="stockinId != null and stockinId != ''"> and is2.stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="inType != null and inType != ''"> and is2.in_type like concat('%', #{inType}, '%')</if>
<if test="createDate != null and createDate != ''"> and is2.create_date like concat('%', #{createDate}, '%')</if>
<if test="createManId != null and createManId != ''"> and is2.create_man_id like concat('%', #{createManId}, '%')</if>
<if test="status != null and status != ''"> and is2.status like concat('%', #{status}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and is2.warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="startDate != null and startDate != ''"> and is2.create_date &gt;= #{startDate}</if>
<if test="finishDate != null and finishDate != ''"> and is2.create_date &lt;= #{finishDate}</if>
<if test="erpBill != null and erpBill != ''"> and is2.erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and is2.stock_source = #{stockSource}</if>
<if test="erpBill != null and erpBill != ''"> and is2.erp_bill =#{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and is2.stock_source like concat('%', #{stockSource}, '%')</if>
<if test="departmentNo != null and departmentNo != ''"> and is2.department_no like concat('%', #{departmentNo},'%')</if>
<if test="customerNo != null and customerNo != ''"> and is2.customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and is2.class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and is2.supplier_no = #{supplierNo}</if>
<if test="customerNo != null and customerNo != ''"> and is2.customer_no like concat('%', #{customerNo}, '%')</if>
<if test="classNo != null and classNo != ''"> and is2.class_no like concat('%', #{classNo}, '%')</if>
<if test="supplierNo != null and supplierNo != ''"> and is2.supplier_no like concat('%', #{supplierNo}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and is2.spare1 like concat('%', #{spare1},'%')</if>
<if test="spare2 != null and spare2 != ''"> and is2.spare2 like concat('%', #{spare2},'%')</if>
<if test="spare4 != null and spare4 != ''"> and is2.spare4 = #{spare4}</if>
<if test="spare3 != null and spare3 != ''"> and is2.spare3 = #{spare3}</if>
<if test="spare5 != null and spare5 != ''"> and is2.spare5 = #{spare5}</if>
<!-- <if test="spare4 != null and spare4 != ''"> and is2.spare4 like concat('%', #{spare4}, '%')</if>-->
<if test="spare3 != null and spare3 != ''"> and is2.spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and is2.spare5 like concat('%', #{spare5}, '%')</if>
<if test="accountSetNo != null and accountSetNo != ''"> and is2.account_set_no = #{accountSetNo}</if>
<if test="materialDesc !=null and materialDesc!=''">
and is2.stockin_id in (
select distinct stockin_id from in_stockin_detail isd
@@ -87,6 +94,98 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where isd.product_name like concat('%',#{materialDesc},'%')
)
</if>
<if test="spare4 !=null and spare4 !=''">
and is2.stockin_id in (
select distinct stockin_id from in_stockin_detail isd
where isd.spare4 like concat('%',#{spare4},'%')
)
</if>
<if test="cargoNo !=null and cargoNo!=''">
and is2.stockin_id in (
select distinct stockin_id from in_stockin_detail isd
where isd.cargo_no like concat('%',#{cargoNo},'%')
)
</if>
<if test="stockinDetailId !=null and stockinDetailId!=''">
and is2.stockin_id in (
select distinct stockin_id from in_stockin_detail isd
where isd.stockin_detail_id like concat('%',#{stockinDetailId},'%')
)
</if>
<if test="lotNo !=null and lotNo!=''">
and is2.stockin_id in (
select distinct stockin_id from in_stockin_detail
where lot_no like concat('%',#{lotNo},'%')
)
</if>
<if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
${params.warehouseDataScope}
</if>
<if test="typeData != null and typeData.size()>0">
and bw.warehouse_type in
<foreach item="item" index="index" collection="typeData" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</where>
order by is2.create_date desc
</select>
<select id="selectInStockinList" parameterType="InStockin" resultMap="InStockinResult">
<include refid="selectInStockinVo"/>
<where>
<if test="stockinId != null and stockinId != ''"> and is2.stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="inType != null and inType != ''"> and is2.in_type like concat('%', #{inType}, '%')</if>
<if test="createDate != null and createDate != ''"> and is2.create_date like concat('%', #{createDate}, '%')</if>
<if test="createManId != null and createManId != ''"> and is2.create_man_id like concat('%', #{createManId}, '%')</if>
<if test="status != null and status != ''"> and is2.status like concat('%', #{status}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and is2.warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="startDate != null and startDate != ''"> and is2.create_date &gt;= #{startDate}</if>
<if test="finishDate != null and finishDate != ''"> and is2.create_date &lt;= #{finishDate}</if>
<if test="erpBill != null and erpBill != ''"> and is2.erp_bill like concat('%', #{erpBill}, '%')</if>
<if test="stockSource != null and stockSource != ''"> and is2.stock_source like concat('%', #{stockSource}, '%')</if>
<if test="departmentNo != null and departmentNo != ''"> and is2.department_no like concat('%', #{departmentNo},'%')</if>
<if test="customerNo != null and customerNo != ''"> and is2.customer_no like concat('%', #{customerNo}, '%')</if>
<if test="classNo != null and classNo != ''"> and is2.class_no like concat('%', #{classNo}, '%')</if>
<if test="supplierNo != null and supplierNo != ''"> and is2.supplier_no like concat('%', #{supplierNo}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and is2.spare1 like concat('%', #{spare1},'%')</if>
<if test="spare2 != null and spare2 != ''"> and is2.spare2 like concat('%', #{spare2},'%')</if>
<!-- <if test="spare4 != null and spare4 != ''"> and is2.spare4 like concat('%', #{spare4}, '%')</if>-->
<if test="spare3 != null and spare3 != ''"> and is2.spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and is2.spare5 like concat('%', #{spare5}, '%')</if>
<if test="materialDesc !=null and materialDesc!=''">
and is2.stockin_id in (
select distinct stockin_id from in_stockin_detail isd
left join bas_product bp on isd.product_id = bp.product_id
where isd.product_name like concat('%',#{materialDesc},'%')
)
</if>
<if test="productId !=null and productId!=''">
and is2.stockin_id in (
select distinct stockin_id from in_stockin_detail isd
where isd.product_id like concat('%',#{productId},'%')
)
</if>
<if test="spare4 !=null and spare4 !=''">
and is2.stockin_id in (
select distinct stockin_id from in_stockin_detail isd
where isd.spare4 like concat('%',#{spare4},'%')
)
</if>
<if test="cargoNo !=null and cargoNo!=''">
and is2.stockin_id in (
select distinct stockin_id from in_stockin_detail isd
where isd.cargo_no like concat('%',#{cargoNo},'%')
)
</if>
<if test="stockinDetailId !=null and stockinDetailId!=''">
and is2.stockin_id in (
select distinct stockin_id from in_stockin_detail isd
where isd.stockin_detail_id like concat('%',#{stockinDetailId},'%')
)
</if>
<if test="lotNo !=null and lotNo!=''">
and is2.stockin_id in (
select distinct stockin_id from in_stockin_detail
@@ -138,7 +237,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare4 != null">spare4,</if>
<if test="spare3 != null">spare3,</if>
<if test="spare5 != null">spare5,</if>
</trim>
<if test="companyShortName != null">company_short_name,</if>
<if test="accountSetNo != null">account_set_no,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="stockinGuid != null">#{stockinGuid},</if>
<if test="stockinId != null and stockinId != ''">#{stockinId},</if>
@@ -159,7 +260,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare4 != null">#{spare4},</if>
<if test="spare3 != null">#{spare3},</if>
<if test="spare5 != null">#{spare5},</if>
</trim>
<if test="companyShortName != null">#{companyShortName},</if>
<if test="accountSetNo != null">#{accountSetNo},</if>
</trim>
</insert>
<insert id="insertInStockinHistory">
insert into in_stockin_finish
@@ -187,6 +290,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare4 != null">spare4 = #{spare4},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="companyShortName != null">company_short_name = #{companyShortName},</if>
<if test="accountSetNo != null">account_set_no = #{accountSetNo},</if>
</trim>
where stockin_guid = #{stockinGuid}
</update>
@@ -237,3 +342,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
</mapper>

20
ruoyi-admin/src/main/resources/mapper/in/TransferBillCallbackMapper.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">
@@ -24,14 +24,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTransferBillCallbackList" parameterType="TransferBillCallback" resultMap="TransferBillCallbackResult">
<include refid="selectTransferBillCallbackVo"/>
<where>
<if test="jobId != null and jobId != ''"> and job_id = #{jobId}</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill = #{erpBill}</if>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="finishTime != null and finishTime != ''"> and finish_time = #{finishTime}</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="jobId != null and jobId != ''"> and job_id like concat('%', #{jobId}, '%')</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill like concat('%', #{erpBill}, '%')</if>
<if test="type != null and type != ''"> and type like concat('%', #{type}, '%')</if>
<if test="status != null and status != ''"> and status like concat('%', #{status}, '%')</if>
<if test="finishTime != null and finishTime != ''"> and finish_time like concat('%', #{finishTime}, '%')</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>
</where>
</select>
@@ -92,4 +92,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
</mapper>
</mapper>