From 3e144b2eb8fc9447d2d092edb71db533d12abc52 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 24 九月 2026 19:06:39 +0800
Subject: [PATCH] feat(生产核算): 新增大类「中提琴」并打通工资/核算折算
---
src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
index 848e69e..217780e 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
@@ -54,11 +54,26 @@
@Schema(description = "鏁伴噺")
private BigDecimal quantity;
+ @Schema(description = "鎺掍骇鏁伴噺")
+ private BigDecimal schedulingNum;
+
+ @Schema(description = "寰呯敓浜ф暟閲�")
+ private BigDecimal pendingNum;
+
@Schema(description = "鎶ュ簾鏁伴噺")
private BigDecimal scrapQty;
+ @Schema(description = "杞诲井杩斿伐鏁伴噺")
+ private BigDecimal reworkMinorQty;
+
+ @Schema(description = "涓ラ噸杩斿伐鏁伴噺")
+ private BigDecimal reworkMajorQty;
+
@Schema(description = "浜у搧鍚嶇О")
private String productName;
+
+ @Schema(description = "鎶ュ伐浜у搧澶х被锛氬皬鎻愮惔/涓彁鐞�/澶ф彁鐞�/璐濇柉锛屾湭褰掔被涓� null")
+ private String majorCategory;
@Schema(description = "浜у搧瑙勬牸鍨嬪彿")
private String productModelName;
@@ -81,9 +96,15 @@
@Schema(description = "宸ュ簭")
private String process;
+ @Schema(description = "宸ュ簭鏍囧噯鏁伴噺")
+ private java.math.BigDecimal standardQuantity;
+
@Schema(description = "宸ヨ祫瀹氶")
private BigDecimal workHours;
+ @Schema(description = "鎶樼畻宸ユ椂")
+ private BigDecimal convertedWorkHours;
+
@Schema(description = "宸ヨ祫")
private BigDecimal wages;
--
Gitblit v1.9.3