From 0871a25215fb468f121785600f796a14b54d8ebc Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 06 六月 2025 15:47:00 +0800
Subject: [PATCH] 1.刀具添加字段 2.新增dnc传输日志表 3.导入NC文件默认产生nc文件对应数控程序加工确认表 4.拆分两网 修改yml配置
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/Cutter.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/Cutter.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/Cutter.java
index 4e95a6a..cabeeb0 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/Cutter.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/Cutter.java
@@ -33,6 +33,16 @@
@TableField(value = "attribution_type")
private Integer attributionType;
+ //瀵瑰簲鏂囨。id
+ @Excel(name = "瀵瑰簲鏂囨。id", width = 15)
+ @TableField(value = "doc_id")
+ private String docId;
+
+ //瀵瑰簲鍒�鍏峰簱id
+ @Excel(name = "瀵瑰簲鍒�鍏峰簱id", width = 15)
+ @TableField(value = "tools_id")
+ private String toolsId;
+
//鍒�鍏峰悕绉�
@Excel(name = "鍒�鍏峰悕绉�", width = 15)
@TableField(value = "cutter_name")
@@ -43,8 +53,8 @@
@TableField(value = "cutter_code")
private String cutterCode;
- //鍒�鍏风被鍨�
- @Excel(name = "鍒�鍏风被鍨�", width = 15,dicCode = "cutter_type")
+ //鍒�鍏风畝绉�
+ @Excel(name = "鍒�鍏风畝绉�", width = 15,dicCode = "cutter_type")
@TableField(value = "cutter_type")
@Dict(dicCode = "cutter_type")
private String cutterType;
@@ -64,6 +74,11 @@
@TableField(value = "quantity")
private Integer quantity;
+ //鍒�鍏疯鏍�
+ @Excel(name = "鍒�鍏疯鏍�", width = 15)
+ @TableField(value = "cutter_spec")
+ private String cutterSpec;
+
//鎻忚堪
@Excel(name = "鎻忚堪", width = 15)
@TableField(value = "description")
--
Gitblit v1.9.3