热表车间订单列表字段返回

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

@@ -88,6 +88,12 @@ public class WorkOrderVO extends WorkOrder {
 	@Schema(description = "下序名称")
 	private String ppsNameNext;
 
+	@Schema(description = "上序id")
+	private Long ppsIdUp;
+
+	@Schema(description = "上序名称")
+	private String ppsNameUp;
+
 	@Schema(description = "下一班组id")
 	private Long makeTeamNext;
 
@@ -106,4 +112,7 @@ public class WorkOrderVO extends WorkOrder {
 	@Schema(description = "优先级;1.正常，2.项目要求日期急件，3.合同急件，4.绩效零件，5.调度标注急件")
 	private String priorityName;
 
+	@Schema(description = "生产数量")
+	private String makeQty;
+
 }

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

@@ -34,7 +34,9 @@
         mwo.ID woId,
         mwo.YO_ID yoId,
         mwo.TS_ID tsId,
+        bts.TS_NAME mainTsName,
         mwo.OC_ID ocId,
+        bo.OC_NAME mainOcName,
         mwp.MAKE_TEAM makeTeam,
         mwp.OC_ID ppsOcId,
         bpe.NAME ppsName,
@@ -66,16 +68,24 @@
         mwo.INVENTORY_QTY inventoryQty,
         mwo.MAKE_QTY - mwo.INVENTORY_QTY notInQty,
         nmwp.PPS_ID ppsIdNext,
+        nbpe.NAME ppsNameNext,
+        umwp.PPS_ID ppsIdUp,
+        ubpe.NAME ppsNameUp,
         nmwp.MAKE_TEAM makeTeamNext,
         mwo.PICKING_STATUS pickingStatus,
         myo.RECEIVE_USER receiveUser,
         mwo.COLLABORATE collaborate,
         mwo.MEMO memo
         FROM MES_WORK_ORDER mwo
-        LEFT JOIN MES_YIELD_ORDER myo ON mwo.YO_ID = myo.ID
+        INNER JOIN MES_YIELD_ORDER myo ON mwo.YO_ID = myo.ID
         LEFT JOIN MES_WORK_PLAN mwp ON mwo.WP_ID = mwp.ID
         LEFT JOIN MES_WORK_PLAN nmwp ON mwp.NEXT_WP_ID = nmwp.ID
+        LEFT JOIN MES_WORK_PLAN umwp ON mwp.FRONT_WP_ID = umwp.ID
         LEFT JOIN BS_PROCESS_SET bpe ON mwp.PPS_ID = bpe.ID
+        LEFT JOIN BS_PROCESS_SET nbpe ON nmwp.PPS_ID = nbpe.ID
+        LEFT JOIN BS_PROCESS_SET ubpe ON umwp.PPS_ID = ubpe.ID
+        LEFT JOIN BS_TEAM_SET bts ON mwo.TS_ID = bts.ID
+        LEFT JOIN BS_OEM bo ON mwo.OC_ID = bo.ID
         <where>
             mwo.is_deleted = 0
             <if test="workOrder.runStatus != null and workOrder.runStatus != ''">