From cea4e4e9c6dad4d4f1b04b750ffca73cc252b22f Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期六, 25 四月 2026 10:23:00 +0800
Subject: [PATCH] 生产工单流转卡去掉logo,增加产品单位

---
 src/main/java/com/ruoyi/production/dto/ProductOrderDto.java |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
index 3827dd7..c61d252 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
@@ -1,12 +1,15 @@
 package com.ruoyi.production.dto;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.production.pojo.ProductOrder;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 
 @Data
 @ExcelIgnoreUnannotated
@@ -32,7 +35,34 @@
     @Excel(name = "瑙勬牸")
     private String specificationModel;
 
+    //鏂欏彿
+    @ApiModelProperty(value = "鏂欏彿")
+    @Excel(name = "鏂欏彿")
+    private String materialCode;
+
     @ApiModelProperty(value = "宸ヨ壓璺嚎缂栧彿")
     @Excel(name = "宸ヨ壓璺嚎缂栧彿")
     private String processRouteCode;
+
+    @ApiModelProperty(value = "瀹屾垚杩涘害")
+    @Excel(name = "瀹屾垚杩涘害", suffix = "%")
+    private BigDecimal completionStatus;
+
+    @ApiModelProperty(value = "BOM缂栧彿")
+    @Excel(name = "BOM缂栧彿")
+    private String bomNo;
+
+    @ApiModelProperty(value = "浜ゆ湡鍋忓樊")
+    private Integer deliveryDaysDiff;
+
+    @ApiModelProperty(value = "浜ゆ湡")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate deliveryDate;
+
+    //鏄惁鍙戣揣(鍙拌处椤甸潰棰滆壊鎺у埗)
+    private Boolean isFh;
+
+    @ApiModelProperty(value = "鍨嬪彿")
+    private String productModelName;
 }

--
Gitblit v1.9.3