From a7a3e876c467a401ecec1a084acb8edc0927d10b Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 17 六月 2025 13:36:04 +0800
Subject: [PATCH] 1.修改检索nc文件bug 2.新增刀具列表查询接口 3.程序加工确认表确认流程

---
 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/GuideCardBatch.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/GuideCardBatch.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/GuideCardBatch.java
index a3bd5f4..0018d05 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/GuideCardBatch.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/GuideCardBatch.java
@@ -9,6 +9,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -104,6 +105,7 @@
 	/**缂栧啓浜�*/
 	@Excel(name = "缂栧啓浜�", width = 15)
     @ApiModelProperty(value = "缂栧啓浜�")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
     private String compiler;
 	/**缂栧啓鏃ユ湡*/
 	@Excel(name = "缂栧啓鏃ユ湡", width = 15, format = "yyyy-MM-dd")
@@ -114,6 +116,7 @@
 	/**鏍″浜�*/
 	@Excel(name = "鏍″浜�", width = 15)
     @ApiModelProperty(value = "鏍″浜�")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
     private String proofreader;
 	/**鏍″鏃ユ湡*/
 	@Excel(name = "鏍″鏃ユ湡", width = 15, format = "yyyy-MM-dd")
@@ -124,6 +127,7 @@
 	/**鎿嶄綔鑰�*/
 	@Excel(name = "鎿嶄綔鑰�", width = 15)
     @ApiModelProperty(value = "鎿嶄綔鑰�")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
     private String operator;
 	/**棣栨鏃ユ湡*/
 	@Excel(name = "棣栨鏃ユ湡", width = 15, format = "yyyy-MM-dd")
@@ -131,9 +135,14 @@
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "棣栨鏃ユ湡")
     private Date inspectionTime;
+    /**棣栨鎰忚*/
+    @Excel(name = "棣栨鎰忚", width = 15)
+    @ApiModelProperty(value = "棣栨鎰忚")
+    private String inspectionOpinion;
 	/**瀹℃壒浜�*/
 	@Excel(name = "瀹℃壒浜�", width = 15)
     @ApiModelProperty(value = "瀹℃壒浜�")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
     private String approver;
 	/**瀹℃壒鏃ユ湡*/
 	@Excel(name = "瀹℃壒鏃ユ湡", width = 15, format = "yyyy-MM-dd")
@@ -143,6 +152,7 @@
     private Date approverTime;
 	/**鍒涘缓浜�*/
     @ApiModelProperty(value = "鍒涘缓浜�")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
     private String createBy;
 	/**鍒涘缓鏃ユ湡*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")

--
Gitblit v1.9.3