From 6c95c2f6a3602fe6f92898dd322c20bbe955e69d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 21 四月 2026 18:03:20 +0800
Subject: [PATCH] feat: 成品入库增加审批环节,原材质检后提交入库时增加一个审批环节
---
src/main/resources/mapper/stock/StockInRecordMapper.xml | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInRecordMapper.xml b/src/main/resources/mapper/stock/StockInRecordMapper.xml
index 4436bf3..f9c2b44 100644
--- a/src/main/resources/mapper/stock/StockInRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -11,18 +11,22 @@
pm.thickness,
u.nick_name as createBy,
CASE
- WHEN sir.record_type IN ('7', '18', '19', '20') THEN pl.purchase_contract_number
+ WHEN sir.record_type IN ('6', '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 quality_inspect as qi on qi.id = sir.record_id and sir.record_type = '6'
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')
+ and sir.record_type NOT IN ('6', '7', '18', '19', '20')
+ LEFT JOIN purchase_ledger as pl on pl.id = CASE
+ WHEN sir.record_type = '6' THEN qi.purchase_ledger_id
+ ELSE COALESCE(sir.sales_ledger_id, slp_link.sales_ledger_id, sir.record_id)
+ END
+ and sir.record_type IN ('6', '7', '18', '19', '20')
<where>
<if test="params.timeStr != null and params.timeStr != ''">
and sir.create_time like concat('%',#{params.timeStr},'%')
@@ -32,9 +36,9 @@
</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},'%'))
+ (sir.record_type IN ('6', '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},'%'))
+ (sir.record_type NOT IN ('6', '7', '18', '19', '20') and sl.sales_contract_no like concat('%',#{params.salesContractNo},'%'))
)
</if>
<if test="params.type != null and params.type != ''">
@@ -54,18 +58,22 @@
pm.unit,
u.nick_name as createBy,
CASE
- WHEN sir.record_type IN ('7', '18', '19', '20') THEN pl.purchase_contract_number
+ WHEN sir.record_type IN ('6', '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 quality_inspect as qi on qi.id = sir.record_id and sir.record_type = '6'
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')
+ and sir.record_type NOT IN ('6', '7', '18', '19', '20')
+ LEFT JOIN purchase_ledger as pl on pl.id = CASE
+ WHEN sir.record_type = '6' THEN qi.purchase_ledger_id
+ ELSE COALESCE(sir.sales_ledger_id, slp_link.sales_ledger_id, sir.record_id)
+ END
+ and sir.record_type IN ('6', '7', '18', '19', '20')
<where>
<if test="params.timeStr != null and params.timeStr != ''">
and sir.create_time like concat('%',#{params.timeStr},'%')
@@ -75,9 +83,9 @@
</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},'%'))
+ (sir.record_type IN ('6', '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},'%'))
+ (sir.record_type NOT IN ('6', '7', '18', '19', '20') and sl.sales_contract_no like concat('%',#{params.salesContractNo},'%'))
)
</if>
<if test="params.type != null and params.type != ''">
--
Gitblit v1.9.3