From d74a35503ac4f0f9ce74f4d28b96933d3232e7cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Sat, 28 Mar 2026 16:10:11 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/desk/produce/pojo/vo/BeforePlatInVO.java | 8 +++++++- .../springblade/desk/produce/mapper/PlateAroundMapper.xml | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/BeforePlatInVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/BeforePlatInVO.java index 377304be..d5b1dd88 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/BeforePlatInVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/BeforePlatInVO.java @@ -25,6 +25,9 @@ public class BeforePlatInVO { @Schema(description = "流程卡号") private String cardNo; + @Schema(description = "入库班组/供应商id") + private Long teamId; + @Schema(description = "入库班组/供应商") private String teamCode; @@ -40,9 +43,12 @@ public class BeforePlatInVO { @Schema(description = "下序名称") private String nextProcessName; - @Schema(description = "下序班组/供应商") + @Schema(description = "下序班组/供应商id") private String nextTeamCode; + @Schema(description = "下序班组/供应商") + private Long nextTeamId; + @Schema(description = "入库数量") private String inQuantity; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/PlateAroundMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/PlateAroundMapper.xml index b57491b6..d3ffe2e7 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/PlateAroundMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/PlateAroundMapper.xml @@ -64,12 +64,14 @@ c.BATCH_NO AS batchNo, c.CARD_NO AS cardNo, d.TS_NAME AS teamCode, + a.MAKE_TEAM AS teamId e.NAME AS processName, a.ORDERS AS processCode, a.WORK_QTY AS inQuantity, d2.TS_NAME as nextTeamCode, b.ORDERS as nextProcessCode, - e2.NAME as nextProcessName + e2.NAME as nextProcessName, + b.MAKE_TEAM AS nextTeamId FROM MES_WORK_PLAN a INNER JOIN MES_WORK_PLAN b ON a.NEXT_WP_ID = b.ID INNER JOIN MES_WORK_ORDER c ON a.WO_ID = c.ID