From 833a285ef00a84fc1a88464eb3d7d1934cf71ff6 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 23 四月 2026 14:45:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子
---
src/main/java/com/ruoyi/production/dto/ProductOrderDto.java | 13 +++++++++++--
1 files changed, 11 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..c61d252 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
@@ -35,12 +35,17 @@
@Excel(name = "瑙勬牸")
private String specificationModel;
+ //鏂欏彿
+ @ApiModelProperty(value = "鏂欏彿")
+ @Excel(name = "鏂欏彿")
+ private String materialCode;
+
@ApiModelProperty(value = "宸ヨ壓璺嚎缂栧彿")
@Excel(name = "宸ヨ壓璺嚎缂栧彿")
private String processRouteCode;
- @ApiModelProperty(value = "瀹屾垚鐘舵��")
- @Excel(name = "瀹屾垚鐘舵��")
+ @ApiModelProperty(value = "瀹屾垚杩涘害")
+ @Excel(name = "瀹屾垚杩涘害", suffix = "%")
private BigDecimal completionStatus;
@ApiModelProperty(value = "BOM缂栧彿")
@@ -55,5 +60,9 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate deliveryDate;
+ //鏄惁鍙戣揣(鍙拌处椤甸潰棰滆壊鎺у埗)
private Boolean isFh;
+
+ @ApiModelProperty(value = "鍨嬪彿")
+ private String productModelName;
}
--
Gitblit v1.9.3