From 3841d6424d6cb9cfeb4221435c137628b9f7442d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 02 四月 2026 11:52:13 +0800
Subject: [PATCH] fix:1.采购/销售导入导出模板调整 2.采购/销售导入导出逻辑更改

---
 src/main/java/com/ruoyi/production/dto/ProductOrderDto.java |    8 +++++++-
 1 files changed, 7 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 78d0a83..3a14d53 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
@@ -6,11 +6,13 @@
 import com.ruoyi.production.pojo.ProductOrder;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 @ExcelIgnoreUnannotated
 public class ProductOrderDto extends ProductOrder {
@@ -35,6 +37,9 @@
     @Excel(name = "瑙勬牸")
     private String specificationModel;
 
+    @Excel(name = "UID鐮�")
+    private String uidNo;
+
     @ApiModelProperty(value = "宸ヨ壓璺嚎缂栧彿")
     @Excel(name = "宸ヨ壓璺嚎缂栧彿")
     private String processRouteCode;
@@ -58,5 +63,6 @@
     //鏄惁鍙戣揣(鍙拌处椤甸潰棰滆壊鎺у埗)
     private Boolean isFh;
 
-    private String uidNo;
+    @ApiModelProperty(value = "BOM缂栧彿id")
+    private Long bomId;
 }

--
Gitblit v1.9.3