From c1db4e0ccf2c2ef1d6b6eb61946af5453010cf06 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期六, 09 五月 2026 15:24:10 +0800
Subject: [PATCH] feat(production): 在生产和报工查询中增加车间筛选和展示

---
 src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java b/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java
index 0596973..2dab5c9 100644
--- a/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java
+++ b/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java
@@ -1,11 +1,13 @@
 package com.ruoyi.production.bean.vo;
 
 import com.ruoyi.basic.dto.StorageBlobVO;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.production.pojo.ProductionOrder;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)
@@ -19,12 +21,15 @@
     private String customerName;
 
     @Schema(description = "浜у搧鍚嶇О")
+    @Excel(name = "浜у搧鍚嶇О",sort = 2)
     private String productName;
 
     @Schema(description = "瑙勬牸鍨嬪彿")
+    @Excel(name = "瑙勬牸",sort = 3)
     private String model;
 
     @Schema(description = "宸ヨ壓璺嚎缂栫爜")
+    @Excel(name = "宸ヨ壓璺嚎缂栧彿",sort = 4)
     private String processRouteCode;
 
     @Schema(description = "浜у搧鍥剧墖")
@@ -32,4 +37,17 @@
 
     @Schema(description = "bom缂栧彿")
     private String bomNo;
+
+    @Schema(description = "瀹屾垚杩涘害")
+    @Excel(name = "瀹屾垚杩涘害",sort = 7)
+    private BigDecimal completionStatus;
+
+    @Schema(description = "鏄惁宸查��鏂�")
+    private Boolean returned;
+
+    @Schema(description = "杞﹂棿鍚嶇О")
+    @Excel(name = "杞﹂棿鍚嶇О",sort = 11)
+    private String workshopName;
+
+
 }

--
Gitblit v1.9.3