From a3371fddf6dc4b104a15486b31aeabd6ec64c677 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 16 三月 2026 14:07:04 +0800
Subject: [PATCH] 质量管理：修改导出顺序
---
src/main/java/com/ruoyi/quality/pojo/RawMaterial.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java b/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java
index bb7f632..098ca2a 100644
--- a/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java
+++ b/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -35,19 +36,28 @@
@ApiModelProperty("浜у搧鍨嬪彿id")
private Long productModelId;
- @ApiModelProperty("鎵规鍙�")
- private String batchNo;
-
- @ApiModelProperty("妫�楠岀被鍨� 0鍏ュ満妫� 1杞﹂棿妫� 2鍑哄巶妫�")
+ @ApiModelProperty("妫�楠岀被鍨� 0鍏ュ巶妫� 1杞﹂棿妫� 2鍑哄巶妫�")
+ @Excel(name = "妫�楠岀被鍨�", readConverterExp = "0=鍏ュ巶妫�,1=杞﹂棿妫�,2=鍑哄巶妫�")
private Integer checkType;
+ @ApiModelProperty("鎵规鍙�")
+ @Excel(name = "鎵规鍙�")
+ private String batchNo;
+
+ @ApiModelProperty("鏁伴噺")
+ @Excel(name = "鏁伴噺")
+ private BigDecimal quantity;
+
@ApiModelProperty("妫�楠岀粨鏋� 0鍚堟牸 1涓嶅悎鏍�")
+ @Excel(name = "妫�楠岀粨鏋�", readConverterExp = "0=鍚堟牸,1=涓嶅悎鏍�")
private Integer checkResult;
@ApiModelProperty("绫诲埆(0:鏈彁浜�;1:宸叉彁浜�)")
+ @Excel(name = "鎻愪氦鐘舵��", readConverterExp = "0=鏈彁浜�,1=宸叉彁浜�")
private Integer inspectState;
@ApiModelProperty("妫�楠屽憳鍚嶇О")
+ @Excel(name = "妫�楠屽憳")
private String checkUserName;
@ApiModelProperty("妫�楠屾棩鏈�")
--
Gitblit v1.9.3