From bf84fec7d8dd5e7fbcc93030b8d83da7ec0ece91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 03 四月 2026 15:39:36 +0800
Subject: [PATCH] yys
---
src/main/java/com/ruoyi/production/dto/ProductOrderDto.java | 20 ++++++++++++++++++--
1 files changed, 18 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 1a99346..288965f 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
@@ -1,15 +1,18 @@
package com.ruoyi.production.dto;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.production.pojo.ProductOrder;
+import com.ruoyi.production.pojo.ProductWorkOrder;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDate;
+import java.util.List;
@Data
@ExcelIgnoreUnannotated
@@ -31,6 +34,9 @@
@Excel(name = "浜у搧鍚嶇О")
private String productCategory;
+
+ private String drawingNumber;
+
@ApiModelProperty(value = "瑙勬牸")
@Excel(name = "瑙勬牸")
private String specificationModel;
@@ -39,8 +45,8 @@
@Excel(name = "宸ヨ壓璺嚎缂栧彿")
private String processRouteCode;
- @ApiModelProperty(value = "瀹屾垚鐘舵��")
- @Excel(name = "瀹屾垚鐘舵��")
+ @ApiModelProperty(value = "瀹屾垚杩涘害")
+ @Excel(name = "瀹屾垚杩涘害", suffix = "%")
private BigDecimal completionStatus;
@ApiModelProperty(value = "BOM缂栧彿")
@@ -57,4 +63,14 @@
//鏄惁鍙戣揣(鍙拌处椤甸潰棰滆壊鎺у埗)
private Boolean isFh;
+
+ @ApiModelProperty(value = "搴撳瓨鏁伴噺")
+ @Excel(name = "搴撳瓨鏁伴噺")
+ private BigDecimal inventoryQuantity;
+
+ @ApiModelProperty(value = "鎿嶄綔 1-寮�濮� 2-鏆傚仠")
+ private Integer operation;
+
+ @ApiModelProperty(value = "鐢熶骇浠诲姟")
+ private List<ProductWorkOrderDto> productWorkOrders;
}
--
Gitblit v1.9.3