From 18fa07479d3c7f5a9b683ab0f698528d9bd2a9ec Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 21 四月 2026 11:23:53 +0800
Subject: [PATCH] feat: 入库管理、出库台账增加合同号字段；支持合同模糊查询
---
src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java | 5 ++
src/main/resources/mapper/stock/StockOutRecordMapper.xml | 36 +++++++++++++++++-
src/main/resources/mapper/stock/StockInRecordMapper.xml | 36 +++++++++++++++++-
src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java | 5 ++
4 files changed, 78 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
index 6ebc136..3e2390a 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
@@ -27,6 +27,11 @@
private String createBy;
+ /**
+ * 鍚堝悓鍙�
+ */
+ private String salesContractNo;
+
//鐜板瓨閲�
private String currentStock;
diff --git a/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java b/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
index c8053e1..0b81981 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
@@ -31,6 +31,11 @@
private String createBy;
/**
+ * 鍚堝悓鍙�
+ */
+ private String salesContractNo;
+
+ /**
* 鍘氬害
*/
private BigDecimal thickness;
diff --git a/src/main/resources/mapper/stock/StockInRecordMapper.xml b/src/main/resources/mapper/stock/StockInRecordMapper.xml
index e2c2b6e..4436bf3 100644
--- a/src/main/resources/mapper/stock/StockInRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -9,17 +9,33 @@
pm.model,
pm.unit,
pm.thickness,
- u.nick_name as createBy
+ u.nick_name as createBy,
+ CASE
+ WHEN sir.record_type IN ('7', '18', '19', '20') THEN pl.purchase_contract_number
+ ELSE sl.sales_contract_no
+ END as salesContractNo
FROM stock_in_record as sir
LEFT JOIN product_model as pm on sir.product_model_id = pm.id
LEFT JOIN product as p on pm.product_id = p.id
LEFT JOIN sys_user as u on sir.create_user = u.user_id
+ LEFT JOIN sales_ledger_product as slp_link on slp_link.id = COALESCE(sir.sales_ledger_product_id, sir.record_id)
+ LEFT JOIN sales_ledger as sl on sl.id = COALESCE(sir.sales_ledger_id, slp_link.sales_ledger_id, sir.record_id)
+ and sir.record_type NOT IN ('7', '18', '19', '20')
+ LEFT JOIN purchase_ledger as pl on pl.id = COALESCE(sir.sales_ledger_id, slp_link.sales_ledger_id, sir.record_id)
+ and sir.record_type IN ('7', '18', '19', '20')
<where>
<if test="params.timeStr != null and params.timeStr != ''">
and sir.create_time like concat('%',#{params.timeStr},'%')
</if>
<if test="params.productName != null and params.productName != ''">
and p.product_name like concat('%',#{params.productName},'%')
+ </if>
+ <if test="params.salesContractNo != null and params.salesContractNo != ''">
+ and (
+ (sir.record_type IN ('7', '18', '19', '20') and pl.purchase_contract_number like concat('%',#{params.salesContractNo},'%'))
+ or
+ (sir.record_type NOT IN ('7', '18', '19', '20') and sl.sales_contract_no like concat('%',#{params.salesContractNo},'%'))
+ )
</if>
<if test="params.type != null and params.type != ''">
and sir.type = #{params.type}
@@ -36,11 +52,20 @@
p.product_name as product_name,
pm.model,
pm.unit,
- u.nick_name as createBy
+ u.nick_name as createBy,
+ CASE
+ WHEN sir.record_type IN ('7', '18', '19', '20') THEN pl.purchase_contract_number
+ ELSE sl.sales_contract_no
+ END as salesContractNo
FROM stock_in_record as sir
LEFT JOIN product_model as pm on sir.product_model_id = pm.id
LEFT JOIN product as p on pm.product_id = p.id
LEFT JOIN sys_user as u on sir.create_user = u.user_id
+ LEFT JOIN sales_ledger_product as slp_link on slp_link.id = COALESCE(sir.sales_ledger_product_id, sir.record_id)
+ LEFT JOIN sales_ledger as sl on sl.id = COALESCE(sir.sales_ledger_id, slp_link.sales_ledger_id, sir.record_id)
+ and sir.record_type NOT IN ('7', '18', '19', '20')
+ LEFT JOIN purchase_ledger as pl on pl.id = COALESCE(sir.sales_ledger_id, slp_link.sales_ledger_id, sir.record_id)
+ and sir.record_type IN ('7', '18', '19', '20')
<where>
<if test="params.timeStr != null and params.timeStr != ''">
and sir.create_time like concat('%',#{params.timeStr},'%')
@@ -48,6 +73,13 @@
<if test="params.productName != null and params.productName != ''">
and p.product_name like concat('%',#{params.productName},'%')
</if>
+ <if test="params.salesContractNo != null and params.salesContractNo != ''">
+ and (
+ (sir.record_type IN ('7', '18', '19', '20') and pl.purchase_contract_number like concat('%',#{params.salesContractNo},'%'))
+ or
+ (sir.record_type NOT IN ('7', '18', '19', '20') and sl.sales_contract_no like concat('%',#{params.salesContractNo},'%'))
+ )
+ </if>
<if test="params.type != null and params.type != ''">
and sir.type = #{params.type}
</if>
diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index 9f6f2a3..3e72c71 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -24,17 +24,33 @@
pm.model,
pm.unit,
pm.thickness,
- u.nick_name as createBy
+ u.nick_name as createBy,
+ CASE
+ WHEN sor.record_type IN ('9', '16', '12') THEN pl.purchase_contract_number
+ ELSE sl.sales_contract_no
+ END as salesContractNo
FROM stock_out_record as sor
LEFT JOIN product_model as pm on sor.product_model_id = pm.id
LEFT JOIN product as p on pm.product_id = p.id
LEFT JOIN sys_user as u on sor.create_user = u.user_id
+ LEFT JOIN sales_ledger_product as slp_link on slp_link.id = COALESCE(sor.sales_ledger_product_id, sor.record_id)
+ LEFT JOIN sales_ledger as sl on sl.id = COALESCE(sor.sales_ledger_id, slp_link.sales_ledger_id, sor.record_id)
+ and sor.record_type NOT IN ('9', '16', '12')
+ LEFT JOIN purchase_ledger as pl on pl.id = COALESCE(sor.sales_ledger_id, slp_link.sales_ledger_id, sor.record_id)
+ and sor.record_type IN ('9', '16', '12')
<where>
<if test="params.timeStr != null and params.timeStr != ''">
and sor.create_time like concat('%',#{params.timeStr},'%')
</if>
<if test="params.productName != null and params.productName != ''">
and p.product_name like concat('%',#{params.productName},'%')
+ </if>
+ <if test="params.salesContractNo != null and params.salesContractNo != ''">
+ and (
+ (sor.record_type IN ('9', '16', '12') and pl.purchase_contract_number like concat('%',#{params.salesContractNo},'%'))
+ or
+ (sor.record_type NOT IN ('9', '16', '12') and sl.sales_contract_no like concat('%',#{params.salesContractNo},'%'))
+ )
</if>
<if test="params.type != null and params.type != ''">
and sor.type = #{params.type}
@@ -51,11 +67,20 @@
p.product_name as productName,
pm.model,
pm.unit,
- u.nick_name as createBy
+ u.nick_name as createBy,
+ CASE
+ WHEN sor.record_type IN ('9', '16', '12') THEN pl.purchase_contract_number
+ ELSE sl.sales_contract_no
+ END as salesContractNo
FROM stock_out_record as sor
LEFT JOIN product_model as pm on sor.product_model_id = pm.id
LEFT JOIN product as p on pm.product_id = p.id
LEFT JOIN sys_user as u on sor.create_user = u.user_id
+ LEFT JOIN sales_ledger_product as slp_link on slp_link.id = COALESCE(sor.sales_ledger_product_id, sor.record_id)
+ LEFT JOIN sales_ledger as sl on sl.id = COALESCE(sor.sales_ledger_id, slp_link.sales_ledger_id, sor.record_id)
+ and sor.record_type NOT IN ('9', '16', '12')
+ LEFT JOIN purchase_ledger as pl on pl.id = COALESCE(sor.sales_ledger_id, slp_link.sales_ledger_id, sor.record_id)
+ and sor.record_type IN ('9', '16', '12')
<where>
<if test="params.timeStr != null and params.timeStr != ''">
and sor.create_time like concat('%',#{params.timeStr},'%')
@@ -63,6 +88,13 @@
<if test="params.productName != null and params.productName != ''">
and p.product_name like concat('%',#{params.productName},'%')
</if>
+ <if test="params.salesContractNo != null and params.salesContractNo != ''">
+ and (
+ (sor.record_type IN ('9', '16', '12') and pl.purchase_contract_number like concat('%',#{params.salesContractNo},'%'))
+ or
+ (sor.record_type NOT IN ('9', '16', '12') and sl.sales_contract_no like concat('%',#{params.salesContractNo},'%'))
+ )
+ </if>
<if test="params.type != null and params.type != ''">
and sor.type = #{params.type}
</if>
--
Gitblit v1.9.3