From 7bd10d34e8a8dc2437ec8551eb511e37634d7306 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 16:51:52 +0800
Subject: [PATCH] feat(mes): 生产计划审批改走协同办公，修复工单领料与产成品入库校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/vo/MesProMpsRespVO.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/vo/MesProMpsRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/vo/MesProMpsRespVO.java
index b7c2622..7d8e3ae 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/vo/MesProMpsRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/vo/MesProMpsRespVO.java
@@ -75,15 +75,16 @@
@Schema(description = "瀹㈡埛缂栧彿", example = "300")
private Long clientId;
- @Schema(description = "瀹㈡埛缂栫爜", example = "C-001")
- @ExcelProperty("瀹㈡埛缂栫爜")
- private String clientCode;
@Schema(description = "瀹㈡埛鍚嶇О", example = "瀹㈡埛 A")
@ExcelProperty("瀹㈡埛鍚嶇О")
private String clientName;
// ========== 鏃堕棿淇℃伅 ==========
+
+ @Schema(description = "璁″垝寮�濮嬫棩鏈�")
+ @ExcelProperty("璁″垝寮�濮嬫棩鏈�")
+ private LocalDateTime planStartDate;
@Schema(description = "闇�姹傛棩鏈�")
@ExcelProperty("闇�姹傛棩鏈�")
@@ -108,6 +109,24 @@
// ========== 鍚堝苟涓嬪彂鏍囪瘑 ==========
+ @Schema(description = "瀹℃牳浜虹紪鍙�", example = "1")
+ private Long auditUserId;
+
+ @Schema(description = "瀹℃牳浜哄悕绉�", example = "寮犱笁")
+ private String auditUserName;
+
+ @Schema(description = "瀹℃牳鏃堕棿")
+ private LocalDateTime auditTime;
+
+ @Schema(description = "瀹℃牳鎰忚锛堥┏鍥炲師鍥狅級", example = "鏁伴噺涓庨攢鍞鍗曚笉绗�")
+ private String auditRemark;
+
+ @Schema(description = "鐢熸垚鐨勯噰璐敵璇峰崟缂栧彿", example = "800")
+ private Long purchaseRequestId;
+
+ @Schema(description = "鎵ц杩涘害棰勮鎻愮ず锛屼负绌鸿〃绀烘棤鍋忓樊", example = "璁″垝宸茶繃 70% 宸ユ湡锛屽疄闄呭畬鎴� 30%")
+ private String progressWarning;
+
@Schema(description = "鏄惁鍚堝苟涓嬪彂", example = "0")
private Integer mergeFlag;
--
Gitblit v1.9.3