From b2537973c7447bc6414d4326ee1e8ac8d6fdd65c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Thu, 25 Jun 2026 10:15:08 +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=E4=B8=8B=E5=BA=8F?= 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 | 5 +++++ 2 files changed, 9 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 b4543705a..22f45fcd6 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 @@ -121,14 +121,14 @@ public class WorkPlanLoadVO { @Schema(description = "当前工序加工班组") public String currentMakeTeam; -// @Schema(description = "上序名称") -// public String frontWpTitle; + @Schema(description = "上序名称") + public String frontWpTitle; // // @Schema(description = "上序加工班组") // public String frontMakeTeam; // -// @Schema(description = "下序名称") -// public String nextWpTitle; + @Schema(description = "下序名称") + public String nextWpTitle; // // @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 ce566b223..63762cf1e 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 @@ -423,6 +423,8 @@ c.PRIORITY AS priority, c.PICKING_STATUS AS pickingStatus, a.ORDERS || '|' || bps.NAME AS currentWpTitle, + b.ORDERS || '|' || bpsf.NAME AS frontWpTitle, + wpn.ORDERS || '|' || bpsn.NAME AS nextWpTitle, bts.TS_NAME AS currentMakeTeam, a.ID AS wpId, a.ID AS currentWpId @@ -430,7 +432,10 @@ INNER JOIN mes_WORK_ORDER c ON a.wo_id = c.ID INNER JOIN mes_YIELD_ORDER d ON c.yo_id = d.ID LEFT JOIN mes_work_plan b ON a.front_wp_id = b.ID + LEFT JOIN mes_work_plan wpn ON a.next_wp_id = wpn.ID LEFT JOIN BS_PROCESS_SET bps ON a.PPS_ID = bps.ID + 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 WHERE ((a.front_wp_id IS NULL AND a.status = 1) OR (b.status = 3)) AND ((a.make_team IN