From eaf6548902e9472fc9b876d531db8508e16c4f2f Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 20 三月 2026 13:49:43 +0800
Subject: [PATCH] feat: 生产订单的撤回、删除；BOM的子集新增/修改统一使用临时ID处理
---
src/main/java/com/ruoyi/production/dto/ProductOrderDto.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
index 1a99346..589f885 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
@@ -15,34 +15,42 @@
@ExcelIgnoreUnannotated
public class ProductOrderDto extends ProductOrder {
- @ApiModelProperty(value = "閿�鍞悎鍚屽彿")
- @Excel(name = "閿�鍞悎鍚屽彿")
- private String salesContractNo;
-
- @ApiModelProperty(value = "椤圭洰鍚�")
- @Excel(name = "椤圭洰鍚�")
- private String projectName;
-
- @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
- @Excel(name = "瀹㈡埛鍚嶇О")
- private String customerName;
-
@ApiModelProperty(value = "浜у搧鍚嶇О")
@Excel(name = "浜у搧鍚嶇О")
- private String productCategory;
+ private String productName;
@ApiModelProperty(value = "瑙勬牸")
@Excel(name = "瑙勬牸")
- private String specificationModel;
+ private String model;
+
+ @ApiModelProperty(value = "浜у搧绫诲瀷")
+ @Excel(name = "浜у搧绫诲瀷")
+ private String strength;
+
+ @ApiModelProperty(value = "宸ヨ壓璺嚎鎻忚堪")
+ @Excel(name = "宸ヨ壓璺嚎鎻忚堪")
+ private String description;
+
+ @ApiModelProperty(value = "宸ヨ壓璺嚎浜у搧绫诲瀷")
+ @Excel(name = "宸ヨ壓璺嚎浜у搧绫诲瀷")
+ private String dictLabel;
+
+ @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 ID")
+ @Excel(name = "BOM ID")
+ private String bomId;
+
@ApiModelProperty(value = "BOM缂栧彿")
@Excel(name = "BOM缂栧彿")
private String bomNo;
--
Gitblit v1.9.3