工序接收查询显示上序下序

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

@@ -121,14 +121,14 @@ public class WorkPlanLoadVO {
     @Schema(description = "当前工序加工班组")
     public String currentMakeTeam;
 
-//    @Schema(description = "上序名称")
+    @Schema(description = "上序名称")
-//    public String frontWpTitle;
+    public String frontWpTitle;
 //
 //    @Schema(description = "上序加工班组")
 //    public String frontMakeTeam;
 //
-//    @Schema(description = "下序名称")
+    @Schema(description = "下序名称")
-//    public String nextWpTitle;
+    public String nextWpTitle;
 //
 //    @Schema(description = "下序加工班组")
 //    public String nextMakeTeam;

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

@@ -423,6 +423,8 @@
         c.PRIORITY AS priority,
         c.PICKING_STATUS AS pickingStatus,
         a.ORDERS || '|' || bps.NAME AS currentWpTitle,
+        b.ORDERS || '|' || bpsf.NAME AS frontWpTitle,
+        wpn.ORDERS || '|' || bpsn.NAME AS nextWpTitle,
         bts.TS_NAME AS currentMakeTeam,
         a.ID AS wpId,
         a.ID AS currentWpId
@@ -430,7 +432,10 @@
         INNER JOIN mes_WORK_ORDER c ON a.wo_id = c.ID
         INNER JOIN mes_YIELD_ORDER d ON c.yo_id = d.ID
         LEFT JOIN mes_work_plan b ON a.front_wp_id = b.ID
+        LEFT JOIN mes_work_plan wpn ON a.next_wp_id = wpn.ID
         LEFT JOIN BS_PROCESS_SET bps ON a.PPS_ID = bps.ID
+        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
         WHERE ((a.front_wp_id IS NULL AND a.status = 1) OR (b.status = 3))
         AND ((a.make_team IN