From 9d748ae6f7540349146cf4d7c1f9f6ad90c14f8d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 06 八月 2026 00:14:31 +0800
Subject: [PATCH] feat: 生产合并下发展示多个销售单号
---
src/main/resources/mapper/stock/StockInventoryMapper.xml | 64 ++++++++++++--------------------
1 files changed, 24 insertions(+), 40 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 9e6e051..bdcdb25 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -546,10 +546,10 @@
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 po_sales_main.sales_contract_no
- when TRIM(sir.record_type) = '6' then po_sales_qi.sales_contract_no
- when TRIM(sir.record_type) in ('4', '11') then po_sales_uq.sales_contract_no
- when TRIM(sir.record_type) in ('20', '22') then po_sales_pick.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
@@ -564,53 +564,37 @@
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 (
- select po2.id as production_order_id,
- group_concat(distinct sl2.sales_contract_no order by sl2.sales_contract_no separator ',') as sales_contract_no
- from production_order po2
- left join production_plan pp2
- on find_in_set(pp2.id, replace(replace(replace(po2.production_plan_ids, '[', ''), ']', ''), ' ', '')) > 0
- left join sales_ledger sl2 on sl2.id = pp2.sales_ledger_id
- group by po2.id
- ) po_sales_main on po_sales_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 (
- select po2.id as production_order_id,
- group_concat(distinct sl2.sales_contract_no order by sl2.sales_contract_no separator ',') as sales_contract_no
- from production_order po2
- left join production_plan pp2
- on find_in_set(pp2.id, replace(replace(replace(po2.production_plan_ids, '[', ''), ']', ''), ' ', '')) > 0
- left join sales_ledger sl2 on sl2.id = pp2.sales_ledger_id
- group by po2.id
- ) po_sales_qi on po_sales_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 (
- select po2.id as production_order_id,
- group_concat(distinct sl2.sales_contract_no order by sl2.sales_contract_no separator ',') as sales_contract_no
- from production_order po2
- left join production_plan pp2
- on find_in_set(pp2.id, replace(replace(replace(po2.production_plan_ids, '[', ''), ']', ''), ' ', '')) > 0
- left join sales_ledger sl2 on sl2.id = pp2.sales_ledger_id
- group by po2.id
- ) po_sales_uq on po_sales_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 (
- select po2.id as production_order_id,
- group_concat(distinct sl2.sales_contract_no order by sl2.sales_contract_no separator ',') as sales_contract_no
- from production_order po2
- left join production_plan pp2
- on find_in_set(pp2.id, replace(replace(replace(po2.production_plan_ids, '[', ''), ']', ''), ' ', '')) > 0
- left join sales_ledger sl2 on sl2.id = pp2.sales_ledger_id
- group by po2.id
- ) po_sales_pick on po_sales_pick.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
--
Gitblit v1.9.3