From 53c0da6e44a01acf9d97bdc7abaf25e5984b92dc Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 13 七月 2026 14:39:57 +0800
Subject: [PATCH] 修改生产核算
---
src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 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 1721e81..eb6d6b3 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
@@ -12,14 +12,32 @@
@EqualsAndHashCode(callSuper = true)
@Data
-@Schema(name = "ProductionProductMainDto", description = "鐢熶骇鎶ュ伐鏌ヨ瀵硅薄")
+@Schema(name = "ProductionProductMainDto", description = "鐢熶骇鎶ュ伐鏌ヨ鍙傛暟")
public class ProductionProductMainDto extends ProductionProductMain {
- @Schema(description = "浜у搧宸ヨ壓璺嚎鏄庣粏ID")
+ @Schema(description = "浜у搧宸ヨ壓璺嚎宸ュ簭ID")
private Long productProcessRouteItemId;
- @Schema(description = "鐢熶骇鎶ュ伐琛╥d")
+ @Schema(description = "鎶ュ伐ID")
private Long productMainId;
+
+ @Schema(description = "鎶ュ伐鍗曞彿")
+ private String reportNo;
+
+ @Schema(description = "鎶ュ伐缁撴灉绫诲瀷锛�0鍚堟牸锛�1杞诲井杩斿伐锛�2涓ラ噸杩斿伐锛�3鎶ュ簾")
+ private Integer reportType;
+
+ @Schema(description = "鎶ュ伐缁撴灉绫诲瀷鍚嶇О")
+ private String reportTypeName;
+
+ @Schema(description = "瀹℃牳鐘舵�侊細0寰呭鏍革紝1瀹℃牳閫氳繃锛�2瀹℃牳涓嶉�氳繃")
+ private Integer auditStatus;
+
+ @Schema(description = "瀹℃牳鐘舵�佸悕绉�")
+ private String auditStatusName;
+
+ @Schema(description = "瀹℃牳鎰忚")
+ private String auditRemark;
@Schema(description = "绉熸埛ID")
private Long tenantId;
@@ -42,13 +60,13 @@
@Schema(description = "浜у搧鍚嶇О")
private String productName;
- @Schema(description = "浜у搧鍨嬪彿鍚嶇О")
+ @Schema(description = "浜у搧瑙勬牸鍨嬪彿")
private String productModelName;
@Schema(description = "鍗曚綅")
private String unit;
- @Schema(description = "閿�鍞悎鍚岀紪鍙�")
+ @Schema(description = "閿�鍞悎鍚屽彿")
private String salesContractNo;
@Schema(description = "鎺掍骇鏃ユ湡")
@@ -63,6 +81,18 @@
@Schema(description = "宸ュ簭")
private String process;
+ @Schema(description = "宸ヨ祫瀹氶")
+ private BigDecimal workHours;
+
+ @Schema(description = "宸ヨ祫")
+ private BigDecimal wages;
+
+ @Schema(description = "宸ヨ祫淇閲戦")
+ private BigDecimal adjustAmount;
+
+ @Schema(description = "宸ヨ祫淇璇存槑")
+ private String adjustRemark;
+
@Schema(description = "宸ュ簭鍙傛暟鍒楄〃")
private List<ProductionOrderRoutingOperationParam> productionOperationParamList;
}
--
Gitblit v1.9.3