From 1fd7a7d67a5df84b57af4fbcc310aa66da3cd8ca Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 25 三月 2026 17:51:16 +0800
Subject: [PATCH] feat:1.出入库单位转换 2.仓储/耗材导出字段值优化 3.仓储/耗材库存为0不展示
---
src/main/java/com/ruoyi/quality/pojo/RawMaterial.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java b/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java
index f84e322..6cf90ca 100644
--- a/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java
+++ b/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java
@@ -1,13 +1,6 @@
package com.ruoyi.quality.pojo;
import com.baomidou.mybatisplus.annotation.*;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.Date;
-
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
@@ -15,6 +8,11 @@
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
/**
* <p>
@@ -47,7 +45,7 @@
private String batchNo;
@ApiModelProperty("妫�楠岀粨鏋� 0鍚堟牸 1涓嶅悎鏍�")
- @Excel(name = "妫�楠岀粨鏋�", readConverterExp = "0=鍚堟牸,1=涓嶅悎鏍�")
+ @Excel(name = "妫�楠岀粨鏋�", readConverterExp = "0=涓嶅悎鏍�,1=鍚堟牸")
private Integer checkResult;
@ApiModelProperty("绫诲埆(0:鏈彁浜�;1:宸叉彁浜�)")
@@ -71,4 +69,20 @@
@ApiModelProperty(value = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
+
+
+ @ApiModelProperty(value = "鍘熸潗鏂欎笉鍚堟牸鏁�")
+ @TableField(exist = false)
+ private BigDecimal supplierNum;
+
+ @ApiModelProperty(value = "鍑哄巶涓嶅悎鏍兼暟")
+ @TableField(exist = false)
+ private BigDecimal factoryNum;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "杩囩▼涓嶅悎鏍兼暟")
+ private BigDecimal processNum;
+
+ @TableField(exist = false)
+ private String date;
}
--
Gitblit v1.9.3