From 5d81fcc5768741323a2e343fc01f44e17e68b65b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 25 六月 2026 14:59:38 +0800
Subject: [PATCH] 1.库存入库新增质检流程 2.销售相关查询返回总合同号 3.采购相关查询返回总合同号

---
 src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java |   15 +++++++++++++++
 1 files changed, 15 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..5b5419d 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)
@@ -15,16 +17,22 @@
     @Schema(description = "閿�鍞悎鍚屽彿")
     private String salesContractNo;
 
+    @Schema(description = "鎬诲悎鍚屽彿")
+    private String masterContractNo;
+
     @Schema(description = "瀹㈡埛鍚嶇О")
     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 +40,11 @@
 
     @Schema(description = "bom缂栧彿")
     private String bomNo;
+
+    @Schema(description = "瀹屾垚杩涘害")
+    @Excel(name = "瀹屾垚杩涘害",sort = 7)
+    private BigDecimal completionStatus;
+
+    @Schema(description = "鏄惁宸查��鏂�")
+    private Boolean returned;
 }

--
Gitblit v1.9.3