From 5c891d8d2c206dfd2aa6daf59579eb2b6843dcc0 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 01 四月 2026 18:00:37 +0800
Subject: [PATCH] fix:1.采购/销售入库去掉审批 2.返工下载附件内容变更 3.生产/库存入库生产日期添加 4.仓库导入导出字段优化
---
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..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,12 +37,15 @@
@Excel(name = "瑙勬牸")
private String specificationModel;
+ @Excel(name = "UID鐮�")
+ private String uidNo;
+
@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 = "BOM缂栧彿id")
+ private Long bomId;
}
--
Gitblit v1.9.3