From d2239e5711466087e0e4d9002d6a46b4cbb7a410 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Fri, 12 Jun 2026 11:25:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=A7=BD=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/produce/pojo/vo/MesMacToolUseVO.java          | 10 ++++++++++
 .../desk/produce/mapper/MacToolUseMapper.xml           |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/MesMacToolUseVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/MesMacToolUseVO.java
index 8aaa5dc30..32a97526e 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/MesMacToolUseVO.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/MesMacToolUseVO.java
@@ -24,6 +24,9 @@ public class MesMacToolUseVO {
 	@Schema(description = "车间订单号")
 	private String woCode;
 
+	@Schema(description = "流程卡号")
+	private String cardNo;
+
 	@Schema(description = "物料号")
 	private String partCode;
 
@@ -51,4 +54,11 @@ public class MesMacToolUseVO {
 	@Schema(description = "挂次号")
 	private String hangNum;
 
+	@Schema(description = "工序号")
+	private String orders;
+
+	@Schema(description = "工序名称")
+	private String ppsName;
+
+
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml
index e9cf85bda..30b4c02dc 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml
@@ -129,6 +129,9 @@
     </select>
     <select id="queryMacToolUse" resultType="org.springblade.desk.produce.pojo.vo.MesMacToolUseVO">
         SELECT a.MTN_CODE  AS code,
+        b.orders AS orders,
+        h.name AS ppsName,
+        c.card_no AS cardNo,
         c.wo_code   AS woCode,
         c.PART_CODE AS partCode,
         c.BATCH_NO  AS batchNo,
@@ -147,6 +150,7 @@
         LEFT JOIN MES_FEI_BA_SET e ON a.BS_FEI_BA_SET = e.ID
         LEFT JOIN MES_EQUIPMENT f ON a.EQUIPMENT_CARD = f.ID
         LEFT JOIN blade_user g ON a.CREATE_MAN = g.ID
+        LEFT JOIN BS_PROCESS_SET h ON b.PPS_ID = h.ID
         <where>
             a.is_deleted = 0
             <if test="macToolUse.code != null and macToolUse.code != ''">