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/workorder/vo/MesProWorkOrderRespVO.java | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 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..0859b42 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("瀹㈡埛鍚嶇О")
@@ -103,6 +100,20 @@
@ExcelProperty("渚涘簲鍟嗗悕绉�")
private String vendorName;
+ @Schema(description = "宸ュ巶缂栧彿", example = "1")
+ private Long factoryId;
+
+ @Schema(description = "宸ュ巶鍚嶇О", example = "婊﹀崡璇氬彂浜旈噾鍘�")
+ @ExcelProperty("宸ュ巶")
+ private String factoryName;
+
+ @Schema(description = "杞﹂棿缂栧彿", example = "10")
+ private Long workshopId;
+
+ @Schema(description = "杞﹂棿鍚嶇О", example = "涓�鍙疯溅闂�")
+ @ExcelProperty("杞﹂棿")
+ private String workshopName;
+
@Schema(description = "鎵规鍙�", example = "BATCH-001")
@ExcelProperty("鎵规鍙�")
private String batchCode;
@@ -116,6 +127,20 @@
@Schema(description = "鐖跺伐鍗曠紪鐮�", example = "WO-001")
private String parentCode;
+
+ @Schema(description = "瀹為檯寮�宸ユ椂闂�")
+ @ExcelProperty("瀹為檯寮�宸ユ椂闂�")
+ private LocalDateTime actualStartTime;
+
+ @Schema(description = "寮�宸ヤ汉鐢ㄦ埛缂栧彿", example = "1")
+ private Long startUserId;
+
+ @Schema(description = "寮�宸ヤ汉鍚嶇О", example = "寮犱笁")
+ @ExcelProperty("寮�宸ヤ汉")
+ private String startUserName;
+
+ @Schema(description = "鏄惁宸插紑宸ワ紙鐢熶骇涓殑鍒ゅ畾渚濇嵁锛�", example = "true")
+ private Boolean started;
@Schema(description = "瀹屾垚鏃堕棿")
@ExcelProperty("瀹屾垚鏃堕棿")
@@ -141,8 +166,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