From 9a2353edaf63e3513ae6308640b7467b3c7731c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Thu, 25 Jun 2026 10:55:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E6=8E=A5=E6=94=B6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=98=BE=E7=A4=BA=E4=B8=8A=E5=BA=8F=E7=8F=AD=E7=BB=84?= =?UTF-8?q?=E5=92=8C=E4=B8=8B=E5=BA=8F=E7=8F=AD=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/desk/produce/pojo/vo/WorkPlanLoadVO.java | 8 ++++---- .../springblade/desk/produce/mapper/WorkPlanMapper.xml | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/WorkPlanLoadVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/WorkPlanLoadVO.java index 22f45fcd6..22207a21b 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/WorkPlanLoadVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/WorkPlanLoadVO.java @@ -124,13 +124,13 @@ public class WorkPlanLoadVO { @Schema(description = "上序名称") public String frontWpTitle; // -// @Schema(description = "上序加工班组") -// public String frontMakeTeam; + @Schema(description = "上序加工班组") + public String frontMakeTeam; // @Schema(description = "下序名称") public String nextWpTitle; // -// @Schema(description = "下序加工班组") -// public String nextMakeTeam; + @Schema(description = "下序加工班组") + public String nextMakeTeam; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml index 63762cf1e..2ac827bc3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml @@ -425,6 +425,8 @@ a.ORDERS || '|' || bps.NAME AS currentWpTitle, b.ORDERS || '|' || bpsf.NAME AS frontWpTitle, wpn.ORDERS || '|' || bpsn.NAME AS nextWpTitle, + btsf.TS_NAME AS frontMakeTeam, + btsn.TS_NAME AS nextMakeTeam, bts.TS_NAME AS currentMakeTeam, a.ID AS wpId, a.ID AS currentWpId @@ -437,6 +439,8 @@ LEFT JOIN BS_PROCESS_SET bpsf ON b.PPS_ID = bpsf.ID LEFT JOIN BS_PROCESS_SET bpsn ON wpn.PPS_ID = bpsn.ID LEFT JOIN BS_TEAM_SET bts ON a.MAKE_TEAM = bts.ID + LEFT JOIN BS_TEAM_SET btsf ON b.MAKE_TEAM = btsf.ID + LEFT JOIN BS_TEAM_SET btsn ON wpn.MAKE_TEAM = btsn.ID WHERE ((a.front_wp_id IS NULL AND a.status = 1) OR (b.status = 3)) AND ((a.make_team IN