From 22b57a30be7f73e13585ae4bd4925f0c66846ba9 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 11 六月 2026 14:52:57 +0800
Subject: [PATCH] feat(production): 优化工单查询接口按订单维度分组并新增订单明细查询
---
src/main/java/com/ruoyi/production/bean/dto/ProductionOperationTaskDto.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductionOperationTaskDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductionOperationTaskDto.java
index 906d1f6..b6de685 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionOperationTaskDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionOperationTaskDto.java
@@ -1,8 +1,62 @@
package com.ruoyi.production.bean.dto;
import com.ruoyi.production.pojo.ProductionOperationTask;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@EqualsAndHashCode(callSuper = true)
@Data
public class ProductionOperationTaskDto extends ProductionOperationTask {
+
+ @Schema(description = "宸ュ簭鍚嶇О")
+ private String processName;
+
+ @Schema(description = "鐢熶骇璁㈠崟鍙�")
+ private String productOrderNpsNo;
+
+ @Schema(description = "浜у搧鍚嶇О")
+ private String productName;
+
+ @Schema(description = "瑙勬牸鍨嬪彿")
+ private String model;
+
+ @Schema(description = "鍗曚綅")
+ private String unit;
+
+ @Schema(description = "鎶ュ簾鏁伴噺")
+ private BigDecimal scrapQty;
+
+ @Schema(description = "瀹屾垚杩涘害")
+ private BigDecimal completionStatus;
+
+ @Schema(description = "璁㈠崟鍙�")
+ private String npsNo;
+
+ @Schema(description = "寮�濮嬫棩鏈�")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate startDate;
+
+ @Schema(description = "缁撴潫鏃ユ湡")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate endDate;
+
+ @Schema(description = "鏄惁鐢熶骇")
+ private Integer isProduction;
+
+ @Schema(description = "鑹搧鏁伴噺")
+ private BigDecimal goodQuantity;
+
+ @Schema(description = "宸ュ崟浠诲姟鏁伴噺")
+ private Long productionTaskCount;
+
+ @Schema(description = "宸ュ崟绫诲瀷锛堟甯�/杩斿伐杩斾慨锛�")
+ private String workOrderType;
+
+ @Schema(description = "鎶ュ伐浜哄憳鍚嶇О")
+ private String userNames;
}
--
Gitblit v1.9.3