生产管理修改

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;
 
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DisTaskingMapper.xml

@@ -17,7 +17,8 @@
         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
+        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
         <where>
@@ -58,13 +59,15 @@
         a.WORK_QTY AS workQty,
         a.MAKE_TEAM AS tsId,
         e.TS_NAME AS tsName,
-            a.RECEIVE_MAN AS userId
+        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
+        LEFT JOIN BS_TEAM_SET f ON b.TS_ID = f.ID
         WHERE a.WO_ID = #{id}
         ORDER BY a.ORDERS
     </select>