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/feedback/vo/MesProFeedbackSaveReqVO.java | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackSaveReqVO.java
index ce71bf4..390f2f0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackSaveReqVO.java
@@ -26,6 +26,9 @@
@Schema(description = "宸ヤ綔绔欑紪鍙�", example = "1")
private Long workstationId;
+ @Schema(description = "涓昏浠疯澶囩紪鍙凤紝鏈鎶ュ伐瀹為檯浣跨敤鐨勮澶囷紱宸ヨ祫鍗曚环鎸夊伐搴�+宸ヨ壓璺嚎+璁惧鍖归厤", example = "8")
+ private Long machineryId;
+
@Schema(description = "宸ヨ壓璺嚎缂栧彿", example = "1")
private Long routeId;
@@ -77,6 +80,24 @@
@NotNull(message = "鎶ュ伐浜轰笉鑳戒负绌�")
private Long feedbackUserId;
+ @Schema(description = "璁¤垂绫诲瀷锛�1-璁℃椂 2-璁′欢锛堢敱宸ュ簭鑷姩甯﹀嚭锛屽墠绔棤闇�鎻愪氦锛�", example = "2")
+ private Integer billingType;
+
+ @Schema(description = "宸ヨ祫瀹氶锛堢敱宸ュ簭鑷姩甯﹀嚭锛屽墠绔棤闇�鎻愪氦锛�", example = "12.50")
+ private BigDecimal wageRate;
+
+ @Schema(description = "鏈鎶ュ伐宸ユ椂锛堝皬鏃讹級锛岃鏃惰钖殑宸ュ簭蹇呭～", example = "8.00")
+ private BigDecimal workHours;
+
+ @Schema(description = "鏈鎶ュ伐宸ヨ祫锛堝悗绔寜宸ュ簭璁¤垂绫诲瀷鑷姩璁＄畻锛屽墠绔棤闇�鎻愪氦锛�", example = "100.00")
+ private BigDecimal wageAmount;
+
+ @Schema(description = "鏈鐢熶骇闀垮害锛堢背锛夛紝浠呯敤浜庤绠楁爣鍑嗗伐鏃讹紱鎶ュ伐鍗曚綅涓虹背鏃堕粯璁ょ瓑浜庢姤宸ユ暟閲�", example = "1000.00")
+ private BigDecimal productionLength;
+
+ @Schema(description = "杈呭姪宸ユ椂褰曞叆椤�")
+ private List<AuxValue> auxList;
+
@Schema(description = "鎶ュ伐鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "鎶ュ伐鏃堕棿涓嶈兘涓虹┖")
private LocalDateTime feedbackTime;
@@ -89,6 +110,27 @@
private List<ParamValue> paramValues;
@Data
+ public static class AuxValue {
+
+ @Schema(description = "杈呭姪宸ユ椂椤圭洰缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ @NotNull(message = "杈呭姪宸ユ椂椤圭洰涓嶈兘涓虹┖")
+ private Long auxItemId;
+
+ @Schema(description = "娆℃暟/涓暟/鐩樻暟/绫虫暟", example = "2.00")
+ private BigDecimal quantity;
+
+ @Schema(description = "鎹㈣壊/鎹㈡枡璧峰鏉愭枡锛堟寜鏉愭枡瀵归厤缃椂濉啓锛�", example = "PVC")
+ private String materialFrom;
+
+ @Schema(description = "鎹㈣壊/鎹㈡枡鐩爣鏉愭枡锛堟寜鏉愭枡瀵归厤缃椂濉啓锛�", example = "LSZH")
+ private String materialTo;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ }
+
+ @Data
public static class ParamValue {
@Schema(description = "浠诲姟鍙傛暟璁板綍鏄庣粏缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "鍙傛暟鏄庣粏涓嶈兘涓虹┖")
--
Gitblit v1.9.3