From f4d4d29368ccacb807f93e2033cd4a643a3ddade Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 30 三月 2026 10:20:28 +0800
Subject: [PATCH] yys 1.修改bug

---
 src/main/java/com/ruoyi/production/dto/ProductOrderDto.java |   16 ++++++++++++++--
 1 files changed, 14 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..92eef03 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
@@ -1,6 +1,7 @@
 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;
@@ -31,6 +32,9 @@
     @Excel(name = "浜у搧鍚嶇О")
     private String productCategory;
 
+
+    private String drawingNumber;
+
     @ApiModelProperty(value = "瑙勬牸")
     @Excel(name = "瑙勬牸")
     private String specificationModel;
@@ -39,8 +43,8 @@
     @Excel(name = "宸ヨ壓璺嚎缂栧彿")
     private String processRouteCode;
 
-    @ApiModelProperty(value = "瀹屾垚鐘舵��")
-    @Excel(name = "瀹屾垚鐘舵��")
+    @ApiModelProperty(value = "瀹屾垚杩涘害")
+    @Excel(name = "瀹屾垚杩涘害", suffix = "%")
     private BigDecimal completionStatus;
 
     @ApiModelProperty(value = "BOM缂栧彿")
@@ -55,5 +59,13 @@
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate deliveryDate;
 
+    //鏄惁鍙戣揣(鍙拌处椤甸潰棰滆壊鎺у埗)
     private Boolean isFh;
+
+    @ApiModelProperty(value = "搴撳瓨鏁伴噺")
+    @Excel(name = "搴撳瓨鏁伴噺")
+    private BigDecimal inventoryQuantity;
+
+    @ApiModelProperty(value = "鎿嶄綔 1-寮�濮� 2-鏆傚仠")
+    private Integer operation;
 }

--
Gitblit v1.9.3