From d6804aed24c4eea8412bb38d28abe6726d4f3ccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Thu, 25 Jun 2026 19:34:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=9B=91=E6=8E=A7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/produce/pojo/vo/ProduceMonitorOrderDataVO.java | 3 +++ .../desk/produce/pojo/vo/ProduceMonitorWorkPlanVO.java | 3 +++ .../org/springblade/desk/produce/mapper/WorkPlanMapper.xml | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorOrderDataVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorOrderDataVO.java index 6f208d9a5..64e08ae91 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorOrderDataVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorOrderDataVO.java @@ -94,6 +94,9 @@ public class ProduceMonitorOrderDataVO { @Schema(description = "主加工单位") private String mainProcessingUnit; + @Schema(description = "当前工序ID") + private Long wpId; + @Schema(description = "零件信息") private ProduceMonitorDsPartVO dsPart; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorWorkPlanVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorWorkPlanVO.java index 8acca34c8..762ef62e0 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorWorkPlanVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorWorkPlanVO.java @@ -17,6 +17,9 @@ public class ProduceMonitorWorkPlanVO { @Schema(description = "工序id") private Long id; + @Schema(description = "下道工序id") + private Long nextWpId; + @Schema(description = "工艺号") private String orders; 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 2ac827bc3..7b5640f39 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 @@ -382,7 +382,8 @@ mwp.PLAN_START_TIME AS planStartTime, mwp.PLAN_END_TIME AS planEndTime, mwp.FACT_START_TIME AS factStartTime, - mwp.FACT_END_TIME AS factEndTime + mwp.FACT_END_TIME AS factEndTime, + mwp.NEXT_WP_ID AS nextWpId FROM MES_WORK_PLAN mwp LEFT JOIN BS_PROCESS_SET bpe ON mwp.PPS_ID = bpe.ID LEFT JOIN BS_TEAM_SET bte ON mwp.MAKE_TEAM = bte.ID