From 9d42f647f5589e4a560d745d6b359ae6c273bd8d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 五月 2026 13:08:52 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java | 25 +++++++++++++++++++++++++
1 files changed, 25 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 05ca96d..01ef33a 100644
--- a/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java
+++ b/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java
@@ -1,22 +1,47 @@
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)
@Data
+@Schema(name = "ProductionOrderVo", description = "鐢熶骇璁㈠崟杩斿洖瀵硅薄")
public class ProductionOrderVo extends ProductionOrder {
+ @Schema(description = "閿�鍞悎鍚屽彿")
private String salesContractNo;
+ @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 = "浜у搧鍥剧墖")
private List<StorageBlobVO> productImages;
+
+ @Schema(description = "bom缂栧彿")
+ private String bomNo;
+
+ @Schema(description = "瀹屾垚杩涘害")
+ @Excel(name = "瀹屾垚杩涘害",sort = 7)
+ private BigDecimal completionStatus;
+
+ @Schema(description = "鏄惁宸查��鏂�")
+ private Boolean returned;
}
--
Gitblit v1.9.3