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/dal/dataobject/pro/workorder/MesProWorkOrderDO.java | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkOrderDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkOrderDO.java
index 82cd251..f326d59 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkOrderDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkOrderDO.java
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.math.BigDecimal;
@@ -100,6 +101,20 @@
*/
private Long vendorId;
/**
+ * 宸ュ巶缂栧彿
+ *
+ * 鍏宠仈 {@link cn.iocoder.yudao.module.mes.dal.dataobject.md.factory.MesMdFactoryDO#getId()}
+ */
+ private Long factoryId;
+
+ /**
+ * 杞﹂棿缂栧彿
+ *
+ * 鍏宠仈 {@link cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkshopDO#getId()}
+ */
+ private Long workshopId;
+
+ /**
* 鎵规鍙�
*/
private String batchCode;
@@ -129,6 +144,18 @@
*/
private Long parentId;
/**
+ * 瀹為檯寮�宸ユ椂闂�
+ *
+ * 鐢便�屽惎鍔ㄧ敓浜с�嶅啓鍏ワ紝鍐欏叆鍗宠涓哄伐鍗曡繘鍏ョ敓浜т腑锛涗负绌鸿〃绀烘湭寮�宸�
+ */
+ private LocalDateTime actualStartTime;
+ /**
+ * 寮�宸ヤ汉鐢ㄦ埛缂栧彿
+ *
+ * 鍏宠仈 AdminUserDO 鐨� id
+ */
+ private Long startUserId;
+ /**
* 瀹屾垚鏃堕棿
*/
private LocalDateTime finishDate;
@@ -148,4 +175,21 @@
*/
private String remark;
+ /**
+ * 鏄惁鎶ュ伐瀹℃壒
+ */
+ @com.baomidou.mybatisplus.annotation.TableField("is_feedback_approve")
+ private Boolean feedbackApprove;
+
+ /**
+ * BPM 娴佺▼瀹氫箟 Key
+ */
+ private String processDefinitionKey;
+
+ /**
+ * 鎶ュ伐瑙掕壊 (澶氫釜瑙掕壊閫楀彿鍒嗛殧)
+ */
+ private String feedbackRole;
+
+
}
--
Gitblit v1.9.3