From 2ee9e158e3129070f6b1fd953da1540f05d4f2b0 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 10 七月 2026 18:04:50 +0800
Subject: [PATCH] 修改报工
---
src/main/java/com/ruoyi/production/bean/dto/ProductionAccountDto.java | 46 +++++++++++++++++++++++++++++++---------------
1 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductionAccountDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductionAccountDto.java
index 91b97ef..a72f7cb 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionAccountDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionAccountDto.java
@@ -6,57 +6,73 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+import java.math.BigDecimal;
import java.time.LocalDate;
@Data
-@Schema(name = "ProductionAccountDto", description = "production account query dto")
+@Schema(name = "ProductionAccountDto", description = "鐢熶骇鏍哥畻鏌ヨ鍙傛暟")
public class ProductionAccountDto extends ProductionAccount {
- @Schema(description = "sales contract no")
+ @Schema(description = "閿�鍞悎鍚屽彿")
private String salesContractNo;
- @Schema(description = "customer contract no")
+ @Schema(description = "瀹㈡埛鍚堝悓鍙�")
private String customerContractNo;
- @Schema(description = "project name")
+ @Schema(description = "椤圭洰鍚嶇О")
private String projectName;
- @Schema(description = "customer name")
+ @Schema(description = "瀹㈡埛鍚嶇О")
private String customerName;
- @Schema(description = "product category")
+ @Schema(description = "浜у搧绫诲埆")
private String productCategory;
- @Schema(description = "specification model")
+ @Schema(description = "瑙勬牸鍨嬪彿")
private String specificationModel;
- @Schema(description = "scheduling user id")
+ @Schema(description = "鎺掍骇浜哄憳ID")
private Long schedulingUserId;
- @Schema(description = "scheduling user name")
+ @Schema(description = "鎺掍骇浜哄憳鍚嶇О")
private String schedulingUserName;
- @Schema(description = "process")
+ @Schema(description = "宸ュ簭")
private String process;
- @Schema(description = "date type(day/month)")
+ @Schema(description = "宸ヨ祫淇閲戦")
+ private BigDecimal adjustAmount;
+
+ @Schema(description = "宸ヨ祫淇璇存槑")
+ private String adjustRemark;
+
+ @Schema(description = "淇浜�")
+ private Long adjustUser;
+
+ @Schema(description = "鎶ュ伐缁撴灉绫诲瀷锛�0鍚堟牸锛�1杞诲井杩斿伐锛�2涓ラ噸杩斿伐锛�3鎶ュ簾")
+ private Integer reportType;
+
+ @Schema(description = "瀹℃牳鐘舵�侊細0寰呭鏍革紝1瀹℃牳閫氳繃锛�2瀹℃牳涓嶉�氳繃")
+ private Integer auditStatus;
+
+ @Schema(description = "鏃ユ湡绫诲瀷锛堟寜澶�/鎸夋湀锛�")
private String dateType;
- @Schema(description = "day query date")
+ @Schema(description = "鎸夊ぉ鏌ヨ鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate entryDate;
- @Schema(description = "date range")
+ @Schema(description = "鏃ユ湡鑼冨洿")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate[] dateRange;
- @Schema(description = "start date")
+ @Schema(description = "寮�濮嬫棩鏈�")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate entryDateStart;
- @Schema(description = "end date")
+ @Schema(description = "缁撴潫鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate entryDateEnd;
--
Gitblit v1.9.3