From 599091b729527d65343ae79a54a74cd194b8e64b Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 19 八月 2026 10:19:51 +0800
Subject: [PATCH] feat: 生产合并下发展示多个销售单号
---
src/main/resources/mapper/stock/StockInventoryMapper.xml | 82 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 78 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 15d08b3..be60678 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -113,7 +113,7 @@
product_model_id,
MAX(create_time) as create_time,
MAX(update_time) as update_time,
- MAX(warn_num) as warn_num,
+ SUM(warn_num) as warn_num,
MAX(version) as version,
model,
MAX(remark) as remark,
@@ -351,7 +351,7 @@
su.nick_name as create_by
from
stock_in_record sir
- left join stock_inventory si on sir.product_model_id = si.product_model_id
+ left join stock_inventory si on sir.batch_no = si.batch_no
left join product_model pm on sir.product_model_id = pm.id
left join product p on pm.product_id = p.id
left join sys_user su on sir.create_user = su.user_id
@@ -367,6 +367,7 @@
and sir.create_time <= #{ew.endMonth}
</if>
</where>
+ order by sir.create_time desc
</select>
<select id="stockInAndOutRecord" resultType="com.ruoyi.stock.dto.StockInventoryDto">
@@ -506,7 +507,7 @@
where si.product_model_id in
<foreach collection="productModelIds" item="productModelId" open="(" separator="," close=")">
#{productModelId}
- </foreach>c
+ </foreach>
and si.batch_no is not null
and si.batch_no != ''
and (si.qualitity - ifnull(si.locked_quantity, 0)) > 0
@@ -514,7 +515,7 @@
</select>
<select id="getByModelId" resultType="com.ruoyi.stock.dto.StockInventoryDto">
select si.id, si.batch_no, si.locked_quantity, (si.qualitity - IFNULL(sd.qualitity, 0)) as qualitity,
- p.product_name, pm.model, pm.unit
+ p.product_name, pm.model, pm.unit, sales_trace.salesContractNo
from stock_inventory si
left join (
select spd.stock_inventory_id, sum(spd.quantity) as qualitity
@@ -531,6 +532,79 @@
)
group by spd.stock_inventory_id
) as sd on sd.stock_inventory_id = si.id
+ left join (
+ select trace_source.product_model_id,
+ trace_source.batch_no,
+ group_concat(distinct trace_source.sales_contract_no order by trace_source.sales_contract_no separator ',') as salesContractNo
+ from (
+ select sir.product_model_id,
+ sir.batch_no,
+ case
+ when TRIM(sir.record_type) = '7' then COALESCE(sl_purchase_product.sales_contract_no, sl_purchase_direct.sales_contract_no, pl_by_product.sales_contract_no, pl_direct.sales_contract_no)
+ when TRIM(sir.record_type) = '10' then COALESCE(sl_purchase_quality.sales_contract_no, pl_by_quality.sales_contract_no)
+ when TRIM(sir.record_type) in ('14', '15') then sl_return.sales_contract_no
+ when TRIM(sir.record_type) in ('2', '5') then sl_main.sales_contract_no
+ when TRIM(sir.record_type) = '6' then sl_qi.sales_contract_no
+ when TRIM(sir.record_type) in ('4', '11') then sl_uq.sales_contract_no
+ when TRIM(sir.record_type) in ('20', '22') then sl_pick.sales_contract_no
+ else null
+ end as sales_contract_no
+ from stock_in_record sir
+ left join quality_inspect qi_purchase on TRIM(sir.record_type) = '10' and sir.record_id = qi_purchase.id
+ left join sales_ledger_product slp on TRIM(sir.record_type) = '7' and slp.id = sir.record_id and slp.type = 2
+ left join purchase_ledger pl_by_product on TRIM(sir.record_type) = '7' and pl_by_product.id = slp.sales_ledger_id
+ left join purchase_ledger pl_direct on TRIM(sir.record_type) = '7' and pl_direct.id = sir.record_id
+ left join purchase_ledger pl_by_quality on TRIM(sir.record_type) = '10' and pl_by_quality.id = qi_purchase.purchase_ledger_id
+ left join sales_ledger sl_purchase_product on sl_purchase_product.id = pl_by_product.sales_ledger_id
+ left join sales_ledger sl_purchase_direct on sl_purchase_direct.id = pl_direct.sales_ledger_id
+ left join sales_ledger sl_purchase_quality on sl_purchase_quality.id = pl_by_quality.sales_ledger_id
+ left join production_product_main ppm_main on TRIM(sir.record_type) in ('2', '5') and sir.record_id = ppm_main.id
+ left join production_operation_task pot_main on ppm_main.production_operation_task_id = pot_main.id
+ left join production_order po_main on pot_main.production_order_id = po_main.id
+ left join production_plan pp_main
+ on TRIM(sir.record_type) in ('2', '5')
+ and find_in_set(pp_main.id, replace(replace(replace(po_main.production_plan_ids, '[', ''), ']', ''), ' ', '')) > 0
+ and pp_main.product_model_id = sir.product_model_id
+ left join sales_ledger sl_main on sl_main.id = pp_main.sales_ledger_id
+ left join quality_inspect qi_prod on TRIM(sir.record_type) = '6' and sir.record_id = qi_prod.id
+ left join production_product_main ppm_qi on qi_prod.product_main_id = ppm_qi.id
+ left join production_operation_task pot_qi on ppm_qi.production_operation_task_id = pot_qi.id
+ left join production_order po_qi on pot_qi.production_order_id = po_qi.id
+ left join production_plan pp_qi
+ on TRIM(sir.record_type) = '6'
+ and find_in_set(pp_qi.id, replace(replace(replace(po_qi.production_plan_ids, '[', ''), ']', ''), ' ', '')) > 0
+ and pp_qi.product_model_id = sir.product_model_id
+ left join sales_ledger sl_qi on sl_qi.id = pp_qi.sales_ledger_id
+ left join quality_unqualified qu on TRIM(sir.record_type) in ('4', '11') and sir.record_id = qu.id
+ left join quality_inspect qi_uq on qu.inspect_id = qi_uq.id
+ left join production_product_main ppm_uq on qi_uq.product_main_id = ppm_uq.id
+ left join production_operation_task pot_uq on ppm_uq.production_operation_task_id = pot_uq.id
+ left join production_order po_uq on pot_uq.production_order_id = po_uq.id
+ left join production_plan pp_uq
+ on TRIM(sir.record_type) in ('4', '11')
+ and find_in_set(pp_uq.id, replace(replace(replace(po_uq.production_plan_ids, '[', ''), ']', ''), ' ', '')) > 0
+ and pp_uq.product_model_id = sir.product_model_id
+ left join sales_ledger sl_uq on sl_uq.id = pp_uq.sales_ledger_id
+ left join production_order_pick pop on TRIM(sir.record_type) in ('20', '22') and sir.record_id = pop.id
+ left join production_order po_pick on pop.production_order_id = po_pick.id
+ left join production_plan pp_pick
+ on TRIM(sir.record_type) in ('20', '22')
+ and find_in_set(pp_pick.id, replace(replace(replace(po_pick.production_plan_ids, '[', ''), ']', ''), ' ', '')) > 0
+ and pp_pick.product_model_id = sir.product_model_id
+ left join sales_ledger sl_pick on sl_pick.id = pp_pick.sales_ledger_id
+ left join return_sale_product rsp on TRIM(sir.record_type) in ('14', '15') and sir.record_id = rsp.id
+ left join return_management rm on rsp.return_management_id = rm.id
+ left join shipping_info si_return on rm.shipping_id = si_return.id
+ left join sales_ledger sl_return on si_return.sales_ledger_id = sl_return.id
+ where sir.product_model_id = #{productModelId}
+ and sir.type = '0'
+ and sir.approval_status = 1
+ ) trace_source
+ where trace_source.sales_contract_no is not null
+ and trace_source.sales_contract_no != ''
+ group by trace_source.product_model_id, trace_source.batch_no
+ ) sales_trace on sales_trace.product_model_id = si.product_model_id
+ and (sales_trace.batch_no = si.batch_no or (sales_trace.batch_no is null and si.batch_no is null))
left join product_model pm on si.product_model_id = pm.id
left join product p on pm.product_id = p.id
where si.product_model_id = #{productModelId}
--
Gitblit v1.9.3