From 9dcf20387a41fc71501a5243ee25b74c806b464f Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 26 三月 2026 15:48:56 +0800
Subject: [PATCH] 生产详情返回报废数量，重新计算合格数量等值
---
src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
index 50a91f5..6ff9df7 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
@@ -1,18 +1,18 @@
package com.ruoyi.production.dto;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.production.pojo.ProductWorkOrder;
-import com.ruoyi.production.pojo.ProductWorkOrderFile;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
-import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Data
public class ProductWorkOrderDto extends ProductWorkOrder {
+
+ @ApiModelProperty(value = "浜у搧ID")
+ private String productId;
//浜у搧鍚嶇О
@ApiModelProperty(value = "浜у搧鍚嶇О")
@@ -26,6 +26,11 @@
@ApiModelProperty(value = "宸ュ簭")
private String processName;
+ private Long processId;
+
+ @ApiModelProperty(value = "宸ュ簭缂栧彿")
+ private String processNo;
+
//鍗曚綅
@ApiModelProperty(value = "鍗曚綅")
private String unit;
@@ -38,6 +43,42 @@
@ApiModelProperty(value = "瀹屾垚杩涘害")
private BigDecimal completionStatus;
+ // 鎬讳骇鍑烘暟閲�
+ @ApiModelProperty(value = "鎬讳骇鍑烘暟閲忥紙鍖呭惈鎶ュ簾鏁伴噺锛�")
+ private BigDecimal totalQty;
+
@ApiModelProperty(value = "鎶ュ簾鏁伴噺")
private BigDecimal scrapQty;
+
+ // 涓嶈壇鏁伴噺
+ @ApiModelProperty(value = "涓嶈壇鏁伴噺")
+ private BigDecimal defectiveQuantity;
+
+ @ApiModelProperty(value = "宸ュ崟绫诲瀷 姝ｅ父 /杩斿伐杩斾慨")
+ private String workOrderType;
+
+ @ApiModelProperty(value = "宸ュ簭鎺掑簭")
+ private Integer dragSort;
+
+ @ApiModelProperty(value = "宸ヨ壓璺嚎ID")
+ private Long productRouteId;
+
+ @ApiModelProperty(value = "鏄惁鍙互鎶ュ伐")
+ private Boolean isCanReport;
+
+ // 鍚堟牸鏁伴噺
+ @ApiModelProperty(value = "鍚堟牸鏁伴噺")
+ private BigDecimal completeQty;
+
+ @ApiModelProperty(value = "涓嶈壇鐜�")
+ private BigDecimal defectiveRate;
+
+ @ApiModelProperty(value = "鐘舵�佹枃鏈�")
+ private String statusText;
+
+ @ApiModelProperty(value = "宸ュ簭鍚堟牸鐜�")
+ private BigDecimal processQualifiedRate;
+
+ @ApiModelProperty(value = "瀹為檯鍚堟牸鐜�")
+ private BigDecimal actualQualifiedRate;
}
--
Gitblit v1.9.3