From 17d65c77c6fedf1b51afec166c5a9735c6e4d38e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 26 一月 2026 16:48:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
index f43789e..50a91f5 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
@@ -1,9 +1,14 @@
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
@@ -26,4 +31,13 @@
private String unit;
+ //鐢熶骇璁㈠崟鍙�
+ @ApiModelProperty(value = "鐢熶骇璁㈠崟鍙�")
+ private String productOrderNpsNo;
+
+ @ApiModelProperty(value = "瀹屾垚杩涘害")
+ private BigDecimal completionStatus;
+
+ @ApiModelProperty(value = "鎶ュ簾鏁伴噺")
+ private BigDecimal scrapQty;
}
--
Gitblit v1.9.3