From 8c65f898ed6e5b0c7a94c792c4562f6ec831dccd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 07 十一月 2026 08:50:53 +0800
Subject: [PATCH] feat: 完善质检、生产、销售、财务与人事模块并接入审批流程
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/feedback/MesProFeedbackDO.java | 80 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 80 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/feedback/MesProFeedbackDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/feedback/MesProFeedbackDO.java
index 82d1914..31e2aac 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/feedback/MesProFeedbackDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/feedback/MesProFeedbackDO.java
@@ -34,6 +34,12 @@
/** 棣栨鎻愪氦鏃剁殑鍏宠仈璁惧缂栧彿蹇収锛岄�楀彿鍒嗛殧锛涙棫鍘嗗彶璁板綍涓嶅弽鎺ㄣ�� */
private String machineryIds;
+ /**
+ * 涓昏浠疯澶囩紪鍙凤紙姣忔鎶ュ伐浣跨敤鐨勮澶囷紝宸ヨ祫鍗曚环鎸夋璁惧鍖归厤瑙勫垯锛�
+ *
+ * 鍏宠仈 {@link cn.iocoder.yudao.module.mes.dal.dataobject.dv.machinery.MesDvMachineryDO#getId()}
+ */
+ private Long machineryId;
/**
* 缂栧彿
@@ -146,6 +152,80 @@
*/
private Long feedbackUserId;
/**
+ * 璁¤垂绫诲瀷蹇収
+ *
+ * 鏋氫妇 {@link cn.iocoder.yudao.module.mes.enums.pro.MesProProcessBillingTypeEnum}
+ */
+ private Integer billingType;
+ /**
+ * 宸ヨ祫瀹氶蹇収
+ *
+ * 璁℃椂锛氬厓/灏忔椂锛涜浠讹細鍏�/浠�
+ */
+ private BigDecimal wageRate;
+ /**
+ * 鍛戒腑鐨勫伐搴忓伐璧勫崟浠疯鍒欑紪鍙凤紝绌�=浣跨敤宸ュ簭榛樿宸ヨ祫瀹氶
+ *
+ * 鍏宠仈 {@link cn.iocoder.yudao.module.mes.dal.dataobject.pro.wage.MesProProcessWageRuleDO#getId()}
+ */
+ private Long wageRuleId;
+ /**
+ * 璐ㄩ噺鍚堟牸鐜囷紙%锛夛紝浠呰川妫�宸ュ簭
+ */
+ private BigDecimal qualityPassRate;
+ /**
+ * 璐ㄩ噺绯绘暟锛屼粎璐ㄦ宸ュ簭涓斿懡涓�滃悎鏍肩巼绯绘暟鈥濊鍒�
+ */
+ private BigDecimal qualityCoefficient;
+ /**
+ * 璐ㄩ噺鎵ｆ锛屼粎璐ㄦ宸ュ簭涓斿懡涓�滀笉鍚堟牸鎵ｆ鈥濊鍒�
+ */
+ private BigDecimal qualityDeduction;
+ /**
+ * 鏈鎶ュ伐宸ユ椂锛堝皬鏃讹級
+ *
+ * 璁℃椂璁¤柂鐨勫伐搴忓繀濉�
+ */
+ private BigDecimal workHours;
+ /**
+ * 鏈鎶ュ伐宸ヨ祫
+ *
+ * 璁℃椂 = 宸ユ椂 脳 宸ヨ祫瀹氶锛涜浠� = 鎶ュ伐鏁伴噺 脳 宸ヨ祫瀹氶
+ */
+ private BigDecimal wageAmount;
+ /**
+ * 杈呭姪璁¤柂宸ユ椂锛堝皬鏃讹級
+ */
+ private BigDecimal auxPaidHours;
+ /**
+ * 鏈杈呭姪宸ヨ祫
+ */
+ private BigDecimal auxWageAmount;
+ /**
+ * 宸ヨ祫璁＄畻鏄庣粏蹇収锛圝SON锛�
+ */
+ private String wageBreakdown;
+ /**
+ * 鏈鐢熶骇闀垮害锛堢背锛夛紝浠呯敤浜庤绠楁爣鍑嗗伐鏃�
+ */
+ private BigDecimal productionLength;
+ /**
+ * 鏍囧噯宸ユ椂锛堝皬鏃讹級锛屽彧鐢ㄤ簬鑰冩牳瀵规瘮锛屼笉鍙備笌宸ヨ祫璁＄畻
+ */
+ private BigDecimal standardWorkHours;
+ /**
+ * 鏍囧噯宸ユ椂-涓诲伐鏃讹紙灏忔椂锛�
+ */
+ private BigDecimal standardPrimaryHours;
+ /**
+ * 鏍囧噯宸ユ椂-杈呭姪宸ユ椂锛堝皬鏃讹級
+ */
+ private BigDecimal standardAuxHours;
+ /**
+ * 鏍囧噯宸ユ椂璁＄畻渚濇嵁蹇収
+ */
+ private String stdCalcNote;
+ /**
* 瀹℃牳鐢ㄦ埛缂栧彿
*
* 鍏宠仈 AdminUserDO#getId()
--
Gitblit v1.9.3