From b3fe06c151dc8455649bf0a46e481ceb83e3ea2a Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期六, 07 十一月 2026 13:37:54 +0800
Subject: [PATCH] feat: 完成好水川 MOM 需求1/2/4/5/8（装箱、BOM成本、销售合同、劳动合同、留样）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkOrderDO.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 59 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..aca3899 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;
@@ -88,6 +89,47 @@
*/
private BigDecimal quantityScheduled;
/**
+ * 瓒呰�楁姤璀︽瘮渚嬶紙%锛�
+ *
+ * 涓虹┖鏃跺彇浜у搧榛樿姣斾緥锛屽啀涓虹┖鍙栧叏灞�閰嶇疆 mes.pro-over-consume.default-ratio
+ */
+ private BigDecimal overConsumeRatio;
+ /**
+ * 鏍囧噯鐗╂枡鎴愭湰锛堟寜璁″垝鏁伴噺锛�
+ */
+ private BigDecimal standardMaterialCost;
+ /**
+ * 瀹為檯鐗╂枡鎴愭湰锛堝凡鍙戠敓娑堣�楋級
+ */
+ private BigDecimal actualMaterialCost;
+ /**
+ * 瓒呰�楃墿鏂欐垚鏈�
+ */
+ private BigDecimal overConsumeCost;
+ /**
+ * 鐗╂枡鍗曚綅鎴愭湰锛堝疄闄呯墿鏂欐垚鏈� / 宸叉姤宸ユ暟閲忥級
+ */
+ private BigDecimal materialUnitCost;
+ /**
+ * 鎴愭湰璁＄畻鏃堕棿
+ */
+ private LocalDateTime costUpdateTime;
+ /**
+ * 宸茶绠辨暟閲�
+ */
+ private BigDecimal packedQuantity;
+ /**
+ * 宸茶绠辩鏁�
+ */
+ private Integer packedBoxCount;
+ /**
+ * 瑁呯鐘舵��
+ *
+ * 瀛楀吀 {@link DictTypeConstants#MES_PRO_WORK_ORDER_PACKING_STATUS}
+ * 0=鏈绠� 1=閮ㄥ垎宸茶绠� 2=宸茶绠卞畬鎴�
+ */
+ private Integer packingStatus;
+ /**
* 瀹㈡埛缂栧彿
*
* 鍏宠仈 CRM 瀹㈡埛 {@link cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO#getId()}
@@ -148,4 +190,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