From 8782476e9cb4480be5da588888d08022b7942d0c Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期六, 07 十一月 2026 14:07:59 +0800
Subject: [PATCH] feat: 补齐需求10/15/16/17/18/21/23，改用现有模块替代 ERP 依赖
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderRespVO.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderRespVO.java
index beb178f..14e190a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderRespVO.java
@@ -84,9 +84,6 @@
@Schema(description = "瀹㈡埛缂栧彿", example = "300")
private Long clientId;
- @Schema(description = "瀹㈡埛缂栫爜", example = "C-001")
- @ExcelProperty("瀹㈡埛缂栫爜")
- private String clientCode;
@Schema(description = "瀹㈡埛鍚嶇О", example = "瀹㈡埛 A")
@ExcelProperty("瀹㈡埛鍚嶇О")
@@ -110,6 +107,12 @@
@Schema(description = "闇�姹傛棩鏈�")
@ExcelProperty("闇�姹傛棩鏈�")
private LocalDateTime requestDate;
+
+ @Schema(description = "鎺掍骇浼樺厛绾э紝鏁板瓧瓒婂ぇ瓒婁紭鍏�")
+ private Integer schedulePriority;
+
+ @Schema(description = "甯傚満绫诲瀷锛欴OMESTIC 鍐呴攢锛孍XPORT 澶栭攢")
+ private String marketType;
@Schema(description = "鐖跺伐鍗曠紪鍙�", example = "0")
private Long parentId;
@@ -141,8 +144,16 @@
@Schema(description = "宸ュ簭杩涘害鍒楄〃")
private java.util.List<MesProWorkOrderProcessProgressVO> processProgressList;
- @Schema(description = "鐢熶骇鐘舵�� (0: 寰呯敓浜�, 1: 鐢熶骇涓�, 2: 鐢熶骇瀹屾垚)")
- @ExcelProperty("鐢熶骇鐘舵��")
- private Integer productionStatus;
+ @Schema(description = "鏄惁鎶ュ伐瀹℃壒")
+ @ExcelProperty("鏄惁鎶ュ伐瀹℃壒")
+ private Boolean feedbackApprove;
+
+ @Schema(description = "BPM 娴佺▼瀹氫箟 Key")
+ @ExcelProperty("BPM 娴佺▼瀹氫箟 Key")
+ private String processDefinitionKey;
+
+ @Schema(description = "鎶ュ伐瑙掕壊 (澶氫釜瑙掕壊閫楀彿鍒嗛殧)")
+ @ExcelProperty("鎶ュ伐瑙掕壊")
+ private String feedbackRole;
}
--
Gitblit v1.9.3