From 5cb362d364fa8582b2090e0d81585f4a7e9f19a1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 06 二月 2026 13:33:46 +0800
Subject: [PATCH] Merge branch 'dev_New' into jtwy
---
src/main/java/com/ruoyi/production/dto/ProductOrderDto.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
index 84539b0..f4aa238 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
@@ -31,6 +31,9 @@
@Excel(name = "浜у搧鍚嶇О")
private String productCategory;
+
+ private String drawingNumber;
+
@ApiModelProperty(value = "瑙勬牸")
@Excel(name = "瑙勬牸")
private String specificationModel;
@@ -39,8 +42,8 @@
@Excel(name = "宸ヨ壓璺嚎缂栧彿")
private String processRouteCode;
- @ApiModelProperty(value = "瀹屾垚鐘舵��")
- @Excel(name = "瀹屾垚鐘舵��")
+ @ApiModelProperty(value = "瀹屾垚杩涘害")
+ @Excel(name = "瀹屾垚杩涘害", suffix = "%")
private BigDecimal completionStatus;
@ApiModelProperty(value = "BOM缂栧彿")
@@ -55,5 +58,6 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate deliveryDate;
+ //鏄惁鍙戣揣(鍙拌处椤甸潰棰滆壊鎺у埗)
private Boolean isFh;
}
--
Gitblit v1.9.3