From 5c891d8d2c206dfd2aa6daf59579eb2b6843dcc0 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 01 四月 2026 18:00:37 +0800
Subject: [PATCH] fix:1.采购/销售入库去掉审批 2.返工下载附件内容变更 3.生产/库存入库生产日期添加 4.仓库导入导出字段优化
---
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index 134c8db..8f73084 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -6,10 +6,12 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
@@ -39,6 +41,7 @@
* 妫�娴嬫棩鏈�
*/
@JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "妫�娴嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
private Date checkTime;
@@ -47,7 +50,7 @@
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鐢熶骇鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
- private Date productionDate;
+ private LocalDate productionDate;
/**
* 渚涘簲鍟嗗悕绉�(鍘熸潗鏂欐楠�)
@@ -124,7 +127,7 @@
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鏈夋晥鏈�", width = 30, dateFormat = "yyyy-MM-dd")
- private Date validityDate;
+ private LocalDate validityDate;
/**
* 妫�娴嬪崟浣�
@@ -185,6 +188,36 @@
@TableField(exist = false)
private String purchaseContractNo;
- private String BatchNo;
+ private String batchNo;
private String manufacturingTeam;
+
+ /**
+ * 妫�娴嬫棩鏈燂紙鏍煎紡鍖栧瓧绗︿覆锛岀敤浜嶹ord瀵煎嚭锛�
+ */
+ @TableField(exist = false)
+ private String checkTimeStr;
+
+ /**
+ * 鐢熶骇鏃ユ湡锛堟牸寮忓寲瀛楃涓诧紝鐢ㄤ簬Word瀵煎嚭锛�
+ */
+ @TableField(exist = false)
+ private String productionDateStr;
+
+ /**
+ * 鏈夋晥鏈燂紙鏍煎紡鍖栧瓧绗︿覆锛岀敤浜嶹ord瀵煎嚭锛�
+ */
+ @TableField(exist = false)
+ private String validityDateStr;
+
+ /**
+ * 鏈夋晥鏈燂紙鏍煎紡鍖栧瓧绗︿覆锛岀敤浜嶹ord瀵煎嚭锛�
+ */
+ @TableField(exist = false)
+ private String inspectMaterialConditionA;
+
+ /**
+ * 鏈夋晥鏈燂紙鏍煎紡鍖栧瓧绗︿覆锛岀敤浜嶹ord瀵煎嚭锛�
+ */
+ @TableField(exist = false)
+ private String inspectMaterialConditionB;
}
--
Gitblit v1.9.3