From 005e11377f508e3a79b528572a386a2af43697ca Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 09 一月 2026 16:24:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/java/com/ruoyi/production/dto/ProductOrderDto.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
index 16ea17b..f9fdbbd 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+
@Data
public class ProductOrderDto extends ProductOrder {
@@ -21,7 +23,16 @@
@ApiModelProperty(value = "瑙勬牸")
private String specificationModel;
-
-
-
+ @ApiModelProperty(value = "璁″垝鏁伴噺")
+ private Integer planQuantity;
+ @ApiModelProperty(value = "鏁伴噺")
+ private Integer Quantity;
+ @ApiModelProperty(value = "宸ュ崟鍙�")
+ private String workOrderNo;
+ @ApiModelProperty(value = "鏄惁鎶ュ伐")
+ private Integer reportWork;
+ @ApiModelProperty(value = "宸ュ崟鐘舵��")
+ private Integer status;
+ @ApiModelProperty(value = "璁㈠崟瀹屾垚搴�")
+ private BigDecimal completionStatus;
}
--
Gitblit v1.9.3