From ec1d61de19f0fe6c3efc781e5d7a6af2ed65ae5d Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 10 六月 2025 10:51:49 +0800
Subject: [PATCH] DNC 文档导入、回传文档、解析文档、取消原有设备

---
 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