From 8d8ff1ded346338d5ea223e699134d5800ddc8c2 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 30 六月 2025 18:27:53 +0800
Subject: [PATCH] 修改字段错误
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.xml | 2 +-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramUploadVO.java | 5 +++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java | 10 +++++++++-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml | 2 +-
doc/sql/mdm/mdm.mysql.all.create.sql | 1 +
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramVO.java | 9 +++++----
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java | 4 +---
7 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
index 05a1a36..8074b5a 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
@@ -69,9 +69,7 @@
return R.data(list);
}
- /**
- * 鍒嗛〉
- */
+
@Operation(summary = "绋嬪簭鍒嗛〉鏌ヨ", description = "鐢ㄤ簬鍦ㄧ紪鍒惰妭鐐归�夋嫨娴佺▼瀵瑰簲鐨勭▼搴�")
@GetMapping("/programpickpage")
public R<IPage<NcNodeProgramVO>> page(NcNodeProgramQueryVO query) {
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java
index 08bc2db..2edda0f 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java
@@ -58,9 +58,13 @@
private String partNo;
/**
+ * 鎻忚堪
+ */
+ private String description;
+ /**
* 鏄惁鍥哄寲
*/
- //private Integer isCured;
+ private Integer isCured;
/**
* 杩囨湡鏃ユ湡
*/
@@ -78,6 +82,10 @@
*/
private Integer isLocked;
/**
+ * 鏄惁娴嬭瘯绋嬪簭
+ */
+ private Integer isTest;
+ /**
* 浠诲姟鍒嗘淳鏃堕棿
*/
private LocalDateTime taskAssignTime;
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml
index bc00658..c4e601c 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml
@@ -24,7 +24,7 @@
<!-- <select id="parentTree" resultMap="treeNodeResultMap">-->
<!-- select id, parent_id, dict_value as title, id as "value", id as "key" from blade_dict where is_deleted = 0 and parent_id = 0-->
<!-- </select>-->
- <sql id="prog_all_columns">id,tenant_id,nc_node_id,code,name,package_name,machine_code,part_no,is_cured,
+ <sql id="prog_all_columns">id,tenant_id,nc_node_id,code,name,machine_code,part_no,is_cured,
expire_date,process_edition,is_last_edition,is_locked,task_assign_time,status,create_dept,is_deleted,create_time,create_user,update_time,update_user</sql>
<select id="getCuredNcProgram" resultMap="BaseResultMap">
select <include refid="prog_all_columns"/> from mdm_nc_program
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.xml
index 0e0bacb..6c82270 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.xml
@@ -34,7 +34,7 @@
<!-- <select id="parentTree" resultMap="treeNodeResultMap">-->
<!-- select id, parent_id, dict_value as title, id as "value", id as "key" from blade_dict where is_deleted = 0 and parent_id = 0-->
<!-- </select>-->
- <sql id="all_columns">id,tenant_id,nc_node_id,code,name,package_name,machine_code,part_no,is_cured,
+ <sql id="all_columns">id,tenant_id,nc_node_id,code,name,machine_code,part_no,is_cured,
expire_date,process_edition,is_last_edition,is_locked,task_assign_time,status,create_dept,is_deleted,create_time,create_user,update_time,update_user</sql>
<select id="getCuredNcProgram" resultMap="BaseResultMap">
select <include refid="all_columns"/> from mdm_nc_program
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramUploadVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramUploadVO.java
index b626bc5..04d6def 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramUploadVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramUploadVO.java
@@ -31,4 +31,9 @@
@Schema(description = "宸ュ簭鐗堟湰")
private String processEdition;
+
+ /**
+ * 鏄惁娴嬭瘯绋嬪簭銆�1鏄紱0鍚�
+ */
+ private Integer isTest;
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramVO.java
index a7ee86a..ce34105 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramVO.java
@@ -21,10 +21,6 @@
@Schema(description = "澶囨敞")
private String remark;
-
- @Schema(description = "鍥惧彿鐗堟")
- private String drawingNoEdition;
-
@Schema(description = "宸ュ簭锛屽鈥滅簿閾ｂ��")
private String processName;
@@ -33,4 +29,9 @@
@Schema(description = "闆剁粍浠跺彿/鍥惧彿")
private String partNo;
+ @Schema(description = "闆剁粍浠跺彿/鍥惧彿鐗堟")
+ private String partNoEdition;
+
+ @Schema(description = "鏄惁娴嬭瘯绋嬪簭.1鏄�;0鍚�")
+ private Integer isTest;
}
diff --git a/doc/sql/mdm/mdm.mysql.all.create.sql b/doc/sql/mdm/mdm.mysql.all.create.sql
index 00ce01a..a5f3600 100644
--- a/doc/sql/mdm/mdm.mysql.all.create.sql
+++ b/doc/sql/mdm/mdm.mysql.all.create.sql
@@ -123,6 +123,7 @@
`process_edition` varchar(40) DEFAULT NULL COMMENT '宸ュ簭鐗堟锛屽崌鐗堝氨鏄彉鏇存敼璇ュ瓧娈碉紝闇�瑕佷繚鐣欏巻鍙茶褰�',
`is_last_edition` int NOT NULL COMMENT '鏄惁鏈�鏂扮増娆★紝1锛氭渶鏂扮増娆★紱0:鍘嗗彶鐗堟锛屼富瑕佸彇璇ュ瓧娈�=1鐨勬暟鎹紝0鏄巻鍙茬増娆�',
`is_locked` int DEFAULT NULL COMMENT '閿佸畾鐘舵�侊紝1锛氶攣瀹氾紱0:姝ｅ父',
+ `is_test` int DEFAULT NULL COMMENT '鏄惁娴嬭瘯绋嬪簭锛�1锛氭槸锛�0:鍚�',
`task_assign_time` datetime DEFAULT NULL COMMENT '绋嬪簭鐨勪换鍔′笅鍙戠殑鏃堕棿锛堢敤浜庢鏌ユ槸鍚︿负閲嶅鐨勪换鍔★級',
`status` int DEFAULT NULL COMMENT '涓氬姟鐘舵��',
`create_dept` bigint DEFAULT NULL COMMENT '鍒涘缓鍗曚綅',
--
Gitblit v1.9.3