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/ProductionOperationTaskMapper.xml | 5 ++++-
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 10 ++++++++--
src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java | 6 ++++++
src/main/resources/mapper/production/ProductionOrderMapper.xml | 3 +++
src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java | 4 +---
src/main/java/com/ruoyi/production/bean/vo/ProductionOperationTaskVo.java | 6 ++++++
6 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
index 9fc8d86..85243b9 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
@@ -71,4 +71,10 @@
@Schema(description = "operation param list")
private List<ProductionOrderRoutingOperationParam> productionOperationParamList;
+
+ @Schema(description = "杞﹂棿id")
+ private Long workshopId;
+
+ @Schema(description = "杞﹂棿鍚嶇О")
+ private String workshopName;
}
diff --git a/src/main/java/com/ruoyi/production/bean/vo/ProductionOperationTaskVo.java b/src/main/java/com/ruoyi/production/bean/vo/ProductionOperationTaskVo.java
index 6c7c5a7..05e4a53 100644
--- a/src/main/java/com/ruoyi/production/bean/vo/ProductionOperationTaskVo.java
+++ b/src/main/java/com/ruoyi/production/bean/vo/ProductionOperationTaskVo.java
@@ -46,4 +46,10 @@
@Schema(description = "鏄惁缁撴潫锛�")
private Boolean endOrder;
+
+ @Schema(description = "杞﹂棿id")
+ private Long workshopId;
+
+ @Schema(description = "杞﹂棿鍚嶇О")
+ private String workshopName;
}
diff --git a/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java b/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java
index 2860655..2dab5c9 100644
--- a/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java
+++ b/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java
@@ -45,10 +45,8 @@
@Schema(description = "鏄惁宸查��鏂�")
private Boolean returned;
- @Schema(description = "杞﹂棿id")
- private Long workshopId;
-
@Schema(description = "杞﹂棿鍚嶇О")
+ @Excel(name = "杞﹂棿鍚嶇О",sort = 11)
private String workshopName;
diff --git a/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml b/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml
index 577bcfd..2480106 100644
--- a/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml
@@ -34,7 +34,9 @@
CASE
WHEN pot.work_order_no LIKE 'FG%' THEN '杩斿伐杩斾慨'
ELSE '姝ｅ父'
- END AS work_order_type
+ END AS work_order_type,
+ t8.id as workshop_id,
+ t8.name as workshop_name
from production_operation_task pot
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
@@ -47,6 +49,7 @@
left join production_product_output ppo on ppo.production_product_main_id = ppm.id
group by ppm.production_operation_task_id
) scrapStat on scrapStat.taskId = pot.id
+ left join workshop as t8 on po.workshop_id = t8.id
<where>
<if test="c != null and c.id != null">
and pot.id = #{c.id}
diff --git a/src/main/resources/mapper/production/ProductionOrderMapper.xml b/src/main/resources/mapper/production/ProductionOrderMapper.xml
index 50ebd4d..35a7941 100644
--- a/src/main/resources/mapper/production/ProductionOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderMapper.xml
@@ -129,6 +129,9 @@
<if test="c.endTime != null">
and po.end_time <= #{c.endTime}
</if>
+ <if test="c.workshopId != null">
+ and t7.id = #{c.workshopId}
+ </if>
</if>
</where>
</sql>
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