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/MesProFeedbackRespVO.java | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 108 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackRespVO.java
index 61c4c8e..76ef33a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProFeedbackRespVO.java
@@ -150,6 +150,84 @@
@Schema(description = "鍏朵粬搴熷搧鏁伴噺", example = "0")
private BigDecimal otherScrapQuantity;
+ @Schema(description = "璁¤垂绫诲瀷锛�1-璁℃椂 2-璁′欢", example = "2")
+ @ExcelProperty("璁¤垂绫诲瀷")
+ private Integer billingType;
+
+ @Schema(description = "宸ヨ祫瀹氶锛氳鏃朵负鍏�/灏忔椂锛岃浠朵负鍏�/浠�", example = "12.50")
+ @ExcelProperty("宸ヨ祫瀹氶")
+ private BigDecimal wageRate;
+
+ @Schema(description = "涓昏浠疯澶囩紪鍙�", example = "8")
+ private Long machineryId;
+
+ @Schema(description = "涓昏浠疯澶囧悕绉�", example = "鎸ゅ鏈�-01")
+ private String machineryName;
+
+ @Schema(description = "鍛戒腑鐨勫伐搴忓伐璧勫崟浠疯鍒欑紪鍙�")
+ private Long wageRuleId;
+
+ @Schema(description = "鏈鎶ュ伐宸ユ椂锛堝皬鏃讹級", example = "8.00")
+ @ExcelProperty("鎶ュ伐宸ユ椂")
+ private BigDecimal workHours;
+
+ @Schema(description = "鏈鎶ュ伐宸ヨ祫锛堝惈杈呭姪宸ヨ祫涓庤川閲忚皟鏁达級", example = "100.00")
+ @ExcelProperty("鎶ュ伐宸ヨ祫")
+ private BigDecimal wageAmount;
+
+ @Schema(description = "杈呭姪璁¤柂宸ユ椂锛堝皬鏃讹級", example = "0.50")
+ private BigDecimal auxPaidHours;
+
+ @Schema(description = "鏈杈呭姪宸ヨ祫", example = "15.00")
+ @ExcelProperty("杈呭姪宸ヨ祫")
+ private BigDecimal auxWageAmount;
+
+ @Schema(description = "璐ㄩ噺鍚堟牸鐜囷紙%锛�", example = "97.50")
+ private BigDecimal qualityPassRate;
+
+ @Schema(description = "璐ㄩ噺绯绘暟", example = "0.9200")
+ private BigDecimal qualityCoefficient;
+
+ @Schema(description = "璐ㄩ噺鎵ｆ", example = "0.00")
+ private BigDecimal qualityDeduction;
+
+ @Schema(description = "宸ヨ祫璁＄畻鏄庣粏蹇収锛圝SON锛�")
+ private String wageBreakdown;
+
+ @Schema(description = "鏈鐢熶骇闀垮害锛堢背锛夛紝浠呯敤浜庤绠楁爣鍑嗗伐鏃�", example = "1000.00")
+ @ExcelProperty("鐢熶骇闀垮害(绫�)")
+ private BigDecimal productionLength;
+
+ @Schema(description = "鏍囧噯宸ユ椂锛堝皬鏃讹級锛屽彧鐢ㄤ簬鑰冩牳瀵规瘮", example = "1.25")
+ @ExcelProperty("鏍囧噯宸ユ椂")
+ private BigDecimal standardWorkHours;
+
+ @Schema(description = "鏍囧噯宸ユ椂-涓诲伐鏃讹紙灏忔椂锛�", example = "1.00")
+ private BigDecimal standardPrimaryHours;
+
+ @Schema(description = "鏍囧噯宸ユ椂-杈呭姪宸ユ椂锛堝皬鏃讹級", example = "0.25")
+ private BigDecimal standardAuxHours;
+
+ @Schema(description = "鏍囧噯宸ユ椂璁＄畻渚濇嵁", example = "绾块�熷害 45.60 绫�/鍒嗭紱鐢熶骇闀垮害 1000.00 绫筹紝涓诲伐鏃� 0.37h锛涜緟鍔╁伐鏃� 0.25h")
+ private String stdCalcNote;
+
+ @Schema(description = "宸ユ椂宸紓锛堝皬鏃讹級= 瀹為檯宸ユ椂 - 鏍囧噯宸ユ椂", example = "0.35")
+ @ExcelProperty("宸ユ椂宸紓")
+ private BigDecimal workHoursDiff;
+
+ @Schema(description = "宸ユ椂宸紓鐜囷紙%锛�= (瀹為檯 - 鏍囧噯) 梅 鏍囧噯 脳 100", example = "28.00")
+ @ExcelProperty("宸ユ椂宸紓鐜�(%)")
+ private BigDecimal workHoursDiffRate;
+
+ @Schema(description = "鏄惁瓒呭嚭宸ユ椂鑰冩牳闃堝��", example = "true")
+ private Boolean standardWarnFlag;
+
+ @Schema(description = "宸ユ椂鑰冩牳鎻愮ず", example = "鏈鎶ュ伐宸ユ椂 1.60h 楂樹簬鏍囧噯宸ユ椂 1.25h 杈� 28.00%锛岃秴杩� 20% 闃堝�硷紝璇锋牳瀵瑰伐鏃舵垨杈呭姪椤规鏁�")
+ private String standardWarnMessage;
+
+ @Schema(description = "杈呭姪宸ユ椂褰曞叆鏄庣粏")
+ private List<AuxResp> auxList;
+
@Schema(description = "鎶ュ伐鐢ㄦ埛缂栧彿", example = "1")
private Long feedbackUserId;
@@ -189,6 +267,36 @@
private List<ParamValueResp> paramValues;
@Data
+ @Schema(description = "鎶ュ伐杈呭姪宸ユ椂鏄庣粏")
+ public static class AuxResp {
+
+ @Schema(description = "杈呭姪宸ユ椂椤圭洰缂栧彿", example = "1024")
+ private Long auxItemId;
+
+ @Schema(description = "杈呭姪椤圭洰鍚嶇О", example = "涓婁笅鏀剧嚎鐩�")
+ private String itemName;
+
+ @Schema(description = "璁￠噺鏂瑰紡锛�1-鎸夋 2-鎸変釜 3-鎸夌洏 4-鎸夌背鎶樼畻", example = "2")
+ private Integer measureType;
+
+ @Schema(description = "娆℃暟/涓暟/鐩樻暟/绫虫暟", example = "2.00")
+ private BigDecimal quantity;
+
+ @Schema(description = "鎹㈣壊璧峰鏉愭枡", example = "PVC")
+ private String materialFrom;
+
+ @Schema(description = "鎹㈣壊鐩爣鏉愭枡", example = "LSZH")
+ private String materialTo;
+
+ @Schema(description = "鎶樼畻鍒嗛挓鏁�", example = "10.00")
+ private BigDecimal minutes;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ }
+
+ @Data
@Schema(description = "鎶ュ伐鍙傛暟鍊�")
public static class ParamValueResp {
--
Gitblit v1.9.3