From 23ad584cbec80ec476ed3127d1a7c8af16e40f9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Thu, 16 Apr 2026 18:38:36 +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/ByCardNoByPlanVO.java  | 6 ++++++
 .../springblade/desk/produce/mapper/DisTaskingMapper.xml    | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ByCardNoByPlanVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ByCardNoByPlanVO.java
index 72a6357b..b5fe77dd 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ByCardNoByPlanVO.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ByCardNoByPlanVO.java
@@ -13,6 +13,9 @@ import java.util.Date;
 @Data
 public class ByCardNoByPlanVO {
 
+    @Schema(description = "车间订单ID")
+    private Long woId;
+
     @Schema(description = "工序id")
     private Long wpId;
 
@@ -28,6 +31,9 @@ public class ByCardNoByPlanVO {
     @Schema(description = "批次号")
     private String batchNo;
 
+    @Schema(description = "工序ID")
+    private Long ppsId;
+
     @Schema(description = "当前工序")
     private String ppsName;
 
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DisTaskingMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DisTaskingMapper.xml
index 2e27a589..73e62d95 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DisTaskingMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DisTaskingMapper.xml
@@ -47,6 +47,8 @@
     </select>
     <select id="getByCardNoByPlan" resultType="org.springblade.desk.produce.pojo.vo.ByCardNoByPlanVO">
         SELECT
+            b.WO_ID AS woId,
+            a.PPS_ID AS ppsId,
             a.ID AS wpId,
             b.WO_CODE AS woCode,
             c.PART_CODE AS partCode,