工序接收查询显示上序班组和下序班组

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/WorkPlanLoadVO.java

@@ -124,13 +124,13 @@ public class WorkPlanLoadVO {
     @Schema(description = "上序名称")
     public String frontWpTitle;
 //
-//    @Schema(description = "上序加工班组")
+    @Schema(description = "上序加工班组")
-//    public String frontMakeTeam;
+    public String frontMakeTeam;
 //
     @Schema(description = "下序名称")
     public String nextWpTitle;
 //
-//    @Schema(description = "下序加工班组")
+    @Schema(description = "下序加工班组")
-//    public String nextMakeTeam;
+    public String nextMakeTeam;
 
 }

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

@@ -425,6 +425,8 @@
         a.ORDERS || '|' || bps.NAME AS currentWpTitle,
         b.ORDERS || '|' || bpsf.NAME AS frontWpTitle,
         wpn.ORDERS || '|' || bpsn.NAME AS nextWpTitle,
+        btsf.TS_NAME AS frontMakeTeam,
+        btsn.TS_NAME AS nextMakeTeam,
         bts.TS_NAME AS currentMakeTeam,
         a.ID AS wpId,
         a.ID AS currentWpId
@@ -437,6 +439,8 @@
         LEFT JOIN BS_PROCESS_SET bpsf ON b.PPS_ID = bpsf.ID
         LEFT JOIN BS_PROCESS_SET bpsn ON wpn.PPS_ID = bpsn.ID
         LEFT JOIN BS_TEAM_SET bts ON a.MAKE_TEAM = bts.ID
+        LEFT JOIN BS_TEAM_SET btsf ON b.MAKE_TEAM = btsf.ID
+        LEFT JOIN BS_TEAM_SET btsn ON wpn.MAKE_TEAM = btsn.ID
         WHERE ((a.front_wp_id IS NULL AND a.status = 1) OR (b.status = 3))
         AND ((a.make_team IN
         <foreach collection="tsIds" item="tsId" open="(" separator="," close=")">