From 19cc93e3724b4084658d64bdc3ee1607000f8c08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Fri, 24 Apr 2026 18:05:38 +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

---
 .../produce/pojo/vo/ByCardNoByPlanVO.java     |  2 +
 .../desk/produce/mapper/DisTaskingMapper.xml  | 67 ++++++++++---------
 2 files changed, 37 insertions(+), 32 deletions(-)

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 0a395d65..aa9b00fb 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
@@ -52,5 +52,7 @@ public class ByCardNoByPlanVO {
     @Schema(description = "接收人名称")
     private String userName;
 
+    @Schema(description = "主加工班组")
+    private String mainTsName;
 
 }
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 99569584..54571556 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
@@ -4,22 +4,23 @@
 
     <select id="disTaskHandle" resultType="org.springblade.desk.produce.pojo.vo.TaskCompleteVO">
         SELECT
-            a.id as id,
-            b.plate as plate,
-            a.card_no as cardNo,
-            a.batch_no as batchNo,
-            b.part_code as partCode,
-            b.part_name as partName,
-            b.version as version,
-            b.pdm_create_time as pdmCreateTime,
-            b.way_details as wayDetails,
-            b.wip_take as wipTake,
-            b.change_no as changeNo,
-            b.craft_time as craftTime,
-            a.DIS_ASSIGN_TIME as taskTime,
-            case a.DIS_TASK_STATUS when 0 then '待分派' when 1 then '已分派' when 2 then '已处理' when 3 then '待质量处理' end as status
+        a.id as id,
+        b.plate as plate,
+        a.card_no as cardNo,
+        a.batch_no as batchNo,
+        b.part_code as partCode,
+        b.part_name as partName,
+        b.version as version,
+        b.pdm_create_time as pdmCreateTime,
+        b.way_details as wayDetails,
+        b.wip_take as wipTake,
+        b.change_no as changeNo,
+        b.craft_time as craftTime,
+        a.DIS_ASSIGN_TIME as taskTime,
+        case a.DIS_TASK_STATUS when 0 then '待分派' when 1 then '已分派' when 2 then '已处理' when 3 then '待质量处理'
+        end as status
         FROM
-            MES_DIS_TASKING a INNER JOIN DS_TASKING b ON a.DT_ID = b.ID
+        MES_DIS_TASKING a INNER JOIN DS_TASKING b ON a.DT_ID = b.ID
         <where>
             a.DIS_TASK_STATUS != 3
             <if test="query.isDefault == 1">
@@ -47,24 +48,26 @@
     </select>
     <select id="getByCardNoByPlan" resultType="org.springblade.desk.produce.pojo.vo.ByCardNoByPlanVO">
         SELECT
-            b.ID AS woId,
-            a.PPS_ID AS ppsId,
-            a.ID AS wpId,
-            b.WO_CODE AS woCode,
-            c.PART_CODE AS partCode,
-            b.CARD_NO AS cardNo,
-            b.BATCH_NO AS batchNo,
-            d.NAME AS ppsName,
-            a.WORK_QTY AS workQty,
-            a.MAKE_TEAM AS tsId,
-            e.TS_NAME AS tsName,
-            a.RECEIVE_MAN AS userId
+        b.ID AS woId,
+        a.PPS_ID AS ppsId,
+        a.ID AS wpId,
+        b.WO_CODE AS woCode,
+        c.PART_CODE AS partCode,
+        b.CARD_NO AS cardNo,
+        b.BATCH_NO AS batchNo,
+        d.NAME AS ppsName,
+        a.WORK_QTY AS workQty,
+        a.MAKE_TEAM AS tsId,
+        e.TS_NAME AS tsName,
+        a.RECEIVE_MAN AS userId,
+        f.TS_NAME AS mainTsName
         FROM
-            MES_WORK_PLAN a
-                INNER JOIN MES_WORK_ORDER b ON a.WO_ID = b.ID
-                INNER JOIN MES_YIELD_ORDER c ON b.yo_id = c.id
-                LEFT JOIN BS_PROCESS_SET d ON a.PPS_ID = d.ID
-                LEFT JOIN BS_TEAM_SET e ON a.MAKE_TEAM = e.ID
+        MES_WORK_PLAN a
+        INNER JOIN MES_WORK_ORDER b ON a.WO_ID = b.ID
+        INNER JOIN MES_YIELD_ORDER c ON b.yo_id = c.id
+        LEFT JOIN BS_PROCESS_SET d ON a.PPS_ID = d.ID
+        LEFT JOIN BS_TEAM_SET e ON a.MAKE_TEAM = e.ID
+        LEFT JOIN BS_TEAM_SET f ON b.TS_ID = f.ID
         WHERE a.WO_ID = #{id}
         ORDER BY a.ORDERS
     </select>