From 7634ef68f117a8ef89b71cd7466bc208a521dbb7 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 07 八月 2026 21:07:33 +0800
Subject: [PATCH] fix: 根据报工编号倒序
---
src/main/resources/mapper/stock/StockInventoryMapper.xml | 149 +++++++++++++++++++++----------------------------
1 files changed, 63 insertions(+), 86 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index f79b59e..bdcdb25 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -521,8 +521,7 @@
p.product_name,
pm.model,
pm.unit,
- order_source.salesContractNo,
- order_source.sourceOrderNo
+ sales_trace.salesContractNo
from stock_inventory si
left join (select spd.stock_inventory_id, sum(spd.quantity) as qualitity
from shipping_product_detail spd
@@ -537,100 +536,78 @@
(sor.batch_no is null and spd.batch_no is null)))
group by spd.stock_inventory_id) as sd on sd.stock_inventory_id = si.id
left join (
- select source.product_model_id,
- source.batch_no,
- group_concat(distinct source.salesContractNo order by source.salesContractNo separator ',') as salesContractNo,
- group_concat(distinct source.sourceOrderNo order by source.sourceOrderNo separator ',') as sourceOrderNo
+ 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(pl_by_product.sales_contract_no, pl_direct.sales_contract_no)
- when TRIM(sir.record_type) = '10' then pl_by_quality.sales_contract_no
+ 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 salesContractNo,
- case
- when TRIM(sir.record_type) = '7' then COALESCE(pl_by_product.sales_contract_no, pl_direct.sales_contract_no, pl_by_product.purchase_contract_number, pl_direct.purchase_contract_number)
- when TRIM(sir.record_type) = '10' then COALESCE(pl_by_quality.sales_contract_no, pl_by_quality.purchase_contract_number)
- when TRIM(sir.record_type) in ('14', '15') then sl_return.sales_contract_no
- when TRIM(sir.record_type) in ('2', '5') then COALESCE(po_sales_main.sales_contract_no, po_main.nps_no)
- when TRIM(sir.record_type) = '6' then COALESCE(po_sales_qi.sales_contract_no, po_qi.nps_no)
- when TRIM(sir.record_type) in ('4', '11') then COALESCE(po_sales_uq.sales_contract_no, po_uq.nps_no)
- when TRIM(sir.record_type) in ('20', '22') then COALESCE(po_sales_pick.sales_contract_no, po_pick.nps_no)
- else null
- end as sourceOrderNo
+ end as sales_contract_no
from stock_in_record sir
- left join quality_inspect as qi_purchase on TRIM(sir.record_type) = '10' and sir.record_id = qi_purchase.id
- left join sales_ledger_product as slp on TRIM(sir.record_type) = '7' and slp.id = sir.record_id and slp.type = 2
- left join purchase_ledger as pl_by_product on TRIM(sir.record_type) = '7' and pl_by_product.id = slp.sales_ledger_id
- left join purchase_ledger as pl_direct on TRIM(sir.record_type) = '7' and pl_direct.id = sir.record_id
- left join purchase_ledger as pl_by_quality on TRIM(sir.record_type) = '10' and pl_by_quality.id = qi_purchase.purchase_ledger_id
- left join production_product_main as ppm_main on TRIM(sir.record_type) in ('2', '5') and sir.record_id = ppm_main.id
- left join production_operation_task as pot_main on ppm_main.production_operation_task_id = pot_main.id
- left join production_order as 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
- ) as po_sales_main on po_sales_main.production_order_id = po_main.id
- left join quality_inspect as qi_prod on TRIM(sir.record_type) = '6' and sir.record_id = qi_prod.id
- left join production_product_main as ppm_qi on qi_prod.product_main_id = ppm_qi.id
- left join production_operation_task as pot_qi on ppm_qi.production_operation_task_id = pot_qi.id
- left join production_order as 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
- ) as po_sales_qi on po_sales_qi.production_order_id = po_qi.id
- left join quality_unqualified as qu on TRIM(sir.record_type) in ('4', '11') and sir.record_id = qu.id
- left join quality_inspect as qi_uq on qu.inspect_id = qi_uq.id
- left join production_product_main as ppm_uq on qi_uq.product_main_id = ppm_uq.id
- left join production_operation_task as pot_uq on ppm_uq.production_operation_task_id = pot_uq.id
- left join production_order as 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
- ) as po_sales_uq on po_sales_uq.production_order_id = po_uq.id
- left join production_order_pick as pop on TRIM(sir.record_type) in ('20', '22') and sir.record_id = pop.id
- left join production_order as 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
- ) as po_sales_pick on po_sales_pick.production_order_id = po_pick.id
- left join return_sale_product as rsp on TRIM(sir.record_type) in ('14', '15') and sir.record_id = rsp.id
- left join return_management as rm on rsp.return_management_id = rm.id
- left join shipping_info as si_return on rm.shipping_id = si_return.id
- left join sales_ledger as sl_return on si_return.sales_ledger_id = sl_return.id
+ 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
- ) source
- group by source.product_model_id, source.batch_no
- ) as order_source on order_source.product_model_id = si.product_model_id
- and (order_source.batch_no = si.batch_no or (order_source.batch_no is null and si.batch_no is null))
+ ) 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