From c1db4e0ccf2c2ef1d6b6eb61946af5453010cf06 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期六, 09 五月 2026 15:24:10 +0800
Subject: [PATCH] feat(production): 在生产和报工查询中增加车间筛选和展示
---
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 5a78a5b..631f7cd 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -34,11 +34,14 @@
date(ppm.create_time) as schedulingDate,
su.nick_name as schedulingUserName,
po_sales.customerName,
- poro.operation_name as process
+ poro.operation_name as process,
+ t5.id as workshop_id,
+ t5.name as workshop_name
from production_product_main ppm
left join production_operation_task pot on ppm.production_operation_task_id = pot.id
left join production_order po on pot.production_order_id = po.id
left join production_order_routing_operation poro on pot.production_order_routing_operation_id = poro.id
+ left join workshop as t5 on po.workshop_id = t5.id
left join (
select po2.id as orderId,
group_concat(distinct sl2.sales_contract_no order by sl2.sales_contract_no separator ',') as salesContractNo,
@@ -109,7 +112,9 @@
else 1
end
as decimal(18,4)
- ) as wages
+ ) as wages,
+ t10.id as workshop_id,
+ t10.name as workshop_name
from production_account pa
left join production_product_main ppm on ppm.id = pa.production_product_main_id
left join production_operation_task pot on ppm.production_operation_task_id = pot.id
@@ -119,6 +124,7 @@
left join product p on pm.product_id = p.id
left join product p_parent on p_parent.id = p.parent_id
left join production_product_output ppo on ppo.production_product_main_id = ppm.id
+ left join workshop as t10 on po.workshop_id = t10.id
<where>
<if test="c != null">
<if test="c.productCategory != null and c.productCategory != ''">
--
Gitblit v1.9.3