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/controller/admin/pro/process/vo/MesProProcessRespVO.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessRespVO.java
index 5cdd462..3f99d4f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessRespVO.java
@@ -7,6 +7,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
@Schema(description = "绠＄悊鍚庡彴 - MES 鐢熶骇宸ュ簭 Response VO")
@@ -29,6 +30,39 @@
@Schema(description = "宸ヨ壓瑕佹眰", example = "鎸夌収鍥剧焊灏哄杩涜鍒囧壊")
private String attention;
+ @ExcelProperty("璁¤垂绫诲瀷")
+ @Schema(description = "璁¤垂绫诲瀷锛�1-璁℃椂 2-璁′欢", example = "2")
+ private Integer billingType;
+
+ @ExcelProperty("宸ヨ祫瀹氶")
+ @Schema(description = "宸ヨ祫瀹氶锛氳鏃朵负鍏�/灏忔椂锛岃浠朵负鍏�/浠�", example = "12.50")
+ private BigDecimal wageRate;
+
+ @ExcelProperty("杈呭姪宸ユ椂灏忔椂宸ヨ祫")
+ @Schema(description = "杈呭姪宸ユ椂灏忔椂宸ヨ祫锛堝厓/灏忔椂锛�", example = "25.00")
+ private BigDecimal auxHourlyRate;
+
+ @Schema(description = "鏍囧噯宸ユ椂璁＄畻鏂瑰紡锛�0-鏈惎鐢� 1-杞�熋楄妭璺� 2-绾块�熷害鐩村彇 3-婊￠�熺櫨鍒嗘瘮脳鑺傝窛", example = "1")
+ private Integer stdTimeMode;
+
+ @Schema(description = "鏍囧噯宸ユ椂鎶樼畻绯绘暟", example = "1.8")
+ private BigDecimal stdTimeFactor;
+
+ @Schema(description = "鏈哄彴婊¤浆閫燂紙r/min锛�", example = "1200")
+ private BigDecimal maxRpm;
+
+ @Schema(description = "杞�熷弬鏁扮紪鐮�", example = "RPM")
+ private String stdRpmParamCode;
+
+ @Schema(description = "鑺傝窛鍙傛暟缂栫爜", example = "PITCH")
+ private String stdPitchParamCode;
+
+ @Schema(description = "绾块�熷害锛堢背/鍒嗭級鍙傛暟缂栫爜", example = "SPEED")
+ private String stdSpeedParamCode;
+
+ @Schema(description = "杞�熺櫨鍒嗘瘮鍙傛暟缂栫爜", example = "RPM_PERCENT")
+ private String stdPercentParamCode;
+
@ExcelProperty(value = "鐘舵��", converter = DictConvert.class)
@DictFormat(DictTypeConstants.COMMON_STATUS)
@Schema(description = "鐘舵��", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
--
Gitblit v1.9.3