From d2f503f72b5485bfee54ea296c7d0a9a243cea02 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 14 一月 2026 17:51:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztns' into dev_ztns
---
inspect-server/src/main/java/com/ruoyi/inspect/dto/MaterialPropTableDTO.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/MaterialPropTableDTO.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/MaterialPropTableDTO.java
index 2e76cd1..091c6a6 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/MaterialPropTableDTO.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/MaterialPropTableDTO.java
@@ -1,26 +1,31 @@
package com.ruoyi.inspect.dto;
+import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
-import java.util.Date;
@Data
public class MaterialPropTableDTO {
- @ApiModelProperty(value = "淇敼鍚庢壒娆″彿")
- private String updateBatchNo;
+ @Excel(name = "搴忓彿")
+ @ApiModelProperty(value = "搴忓彿")
+ private String index;
- @ApiModelProperty(value = "鎶佃揪鐨勯噰璐暟閲�")
- private BigDecimal qtyArrived;
+ @Excel(name = "渚涘簲鍟嗗悕绉�")
+ @ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
+ private String supplierName;
- @ApiModelProperty(value = "闆朵欢鎻忚堪")
- private String partDesc;
+ @Excel(name = "鍒拌揣鎵规")
+ @ApiModelProperty(value = "鍒拌揣鎵规")
+ private Integer totalBatch;
- @ApiModelProperty(value = "鍚堟牸鐘舵��")
- private Integer inspectStatus;
+ @Excel(name = "涓嶅悎鏍兼壒娆�")
+ @ApiModelProperty(value = "涓嶅悎鏍兼壒娆�")
+ private Integer unqualifiedBatch;
- @ApiModelProperty(value = "涓嬪彂鏃堕棿")
- private Date sendTime;
-}
+ @Excel(name = "鍚堟牸鐜�(%)")
+ @ApiModelProperty(value = "鍚堟牸鐜�(%)")
+ private BigDecimal passRate;
+}
\ No newline at end of file
--
Gitblit v1.9.3