From c924d59a94fc17d570610cbf2b691481dd0b2e4d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 16 一月 2026 17:50:09 +0800
Subject: [PATCH] Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New
---
src/main/java/com/ruoyi/production/dto/ProductOrderDto.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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..b12803d 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
@@ -1,27 +1,46 @@
package com.ruoyi.production.dto;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.production.pojo.ProductOrder;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+
@Data
+@ExcelIgnoreUnannotated
public class ProductOrderDto extends ProductOrder {
@ApiModelProperty(value = "閿�鍞悎鍚屽彿")
+ @Excel(name = "閿�鍞悎鍚屽彿")
private String salesContractNo;
@ApiModelProperty(value = "椤圭洰鍚�")
+ @Excel(name = "椤圭洰鍚�")
private String projectName;
- @ApiModelProperty(value = "瀹㈡埛鍚�")
+ @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ @Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
@ApiModelProperty(value = "浜у搧鍚嶇О")
+ @Excel(name = "浜у搧鍚嶇О")
private String productCategory;
@ApiModelProperty(value = "瑙勬牸")
+ @Excel(name = "瑙勬牸")
private String specificationModel;
+ @ApiModelProperty(value = "宸ヨ壓璺嚎缂栧彿")
+ @Excel(name = "宸ヨ壓璺嚎缂栧彿")
+ private String processRouteCode;
+ @ApiModelProperty(value = "瀹屾垚鐘舵��")
+ @Excel(name = "瀹屾垚鐘舵��")
+ private BigDecimal completionStatus;
+ @ApiModelProperty(value = "BOM缂栧彿")
+ @Excel(name = "BOM缂栧彿")
+ private String bomNo;
}
--
Gitblit v1.9.3