From 5f612ab2f67b2c6f6894c624a7780799526d566d Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 05 十一月 2026 20:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/process/MesProWorkOrderProcessRespVO.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/process/MesProWorkOrderProcessRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/process/MesProWorkOrderProcessRespVO.java
index bda4a62..ce182cb 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/process/MesProWorkOrderProcessRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/process/MesProWorkOrderProcessRespVO.java
@@ -2,10 +2,12 @@
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.process.MesProProcessBomItemVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
+import java.util.List;
@Schema(description = "绠＄悊鍚庡彴 - MES 鐢熶骇宸ュ崟宸ュ簭 Response VO")
@Data
@@ -66,19 +68,46 @@
@ExcelProperty("鏄惁鍊掑啿")
private Boolean backflushFlag;
- @Schema(description = "浜у嚭浜у搧鐗╂枡缂栧彿", example = "100")
+ @Schema(description = "浜у嚭浜у搧鐗╂枡缂栧彿锛堢涓�涓紝鍚戝悗鍏煎锛�", example = "100")
private Long outputItemId;
- @Schema(description = "浜у嚭浜у搧鐗╂枡缂栫爜", example = "M001")
+ @Schema(description = "浜у嚭浜у搧鐗╂枡缂栫爜锛堢涓�涓級", example = "M001")
private String outputItemCode;
- @Schema(description = "浜у嚭浜у搧鐗╂枡鍚嶇О", example = "浜у搧A")
+ @Schema(description = "浜у嚭浜у搧鐗╂枡鍚嶇О锛堢涓�涓級", example = "浜у搧A")
private String outputItemName;
+
+ @Schema(description = "浜у嚭浜у搧鐗╂枡缂栧彿鍒楄〃", example = "[100, 101]")
+ private List<Long> outputItemIds;
+
+ @Schema(description = "浜у嚭浜у搧鐗╂枡鍚嶇О锛堥�楀彿鎷兼帴锛�", example = "浜у搧A, 浜у搧B")
+ private String outputItemNames;
+
+ @Schema(description = "鎶ュ伐浠撳簱缂栧彿", example = "10")
+ private Long warehouseId;
+
+ @Schema(description = "鎶ュ伐浠撳簱鍚嶇О", example = "鎴愬搧浠�")
+ private String warehouseName;
+
+ @Schema(description = "鎶ュ伐搴撳尯缂栧彿", example = "110")
+ private Long locationId;
+
+ @Schema(description = "鎶ュ伐搴撳尯鍚嶇О", example = "鎴愬搧浠撻�氱敤搴撳尯")
+ private String locationName;
+
+ @Schema(description = "鎶ュ伐搴撲綅缂栧彿", example = "210")
+ private Long areaId;
+
+ @Schema(description = "鎶ュ伐搴撲綅鍚嶇О", example = "鎴愬搧浠撻粯璁ゅ簱浣�")
+ private String areaName;
@Schema(description = "澶囨敞", example = "澶囨敞")
@ExcelProperty("澶囨敞")
private String remark;
+ @Schema(description = "宸ュ簭鎶曟枡BOM鏄庣粏")
+ private List<MesProProcessBomItemVO> bomItems;
+
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
--
Gitblit v1.9.3