From 806d2ed9cb284aae1df7a723e34117b82afdf365 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 10 七月 2025 22:36:31 +0800
Subject: [PATCH] 完善下发接口
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java | 4 ++--
doc/sql/mdm/mdm.mysql.all.create.sql | 25 +++++++++++++++----------
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java | 3 ++-
3 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java
index 9bf2c07..c24f7a1 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java
@@ -128,8 +128,8 @@
return null;//R.data(ncProcessProgRefService.listByProcess(processInstanceId));
}
- @GetMapping("/send-to-machine-by-nodeid")
- @Operation(summary = "涓嬪彂", description = "涓嬪彂缁欐満搴婅瀹氱殑鐩綍")
+ @PostMapping("/send-to-machine-by-nodeid")
+ @Operation(summary = "绋嬪簭涓嬪彂", description = "涓嬪彂缁欐満搴婅瀹氱殑鐩綍")
public R<Void> sendToMachineByNodeId(@Parameter(description = "鑺傜偣id") Long nodeId) {
try {
ncProgramService.sendByBindNodeId(nodeId);
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
index 0a0653c..fa5f0de 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
@@ -282,7 +282,8 @@
wrapper.eq(NcProgram::getBindNcNodeId, bindNcNodeId);
wrapper.eq(NcProgram::getIsLastEdition,1);
NcProgram prog = this.getOne(wrapper);
- String filePath = prog.getName();
+
+ String filePath = getFilePath(prog);
try(InputStream ins = ossTemplate.statFileStream(prog.getOssName());){
File targetFile = new File(filePath);
FileUtils.copyInputStreamToFile(ins, targetFile);
diff --git a/doc/sql/mdm/mdm.mysql.all.create.sql b/doc/sql/mdm/mdm.mysql.all.create.sql
index 1218e1d..7aee6aa 100644
--- a/doc/sql/mdm/mdm.mysql.all.create.sql
+++ b/doc/sql/mdm/mdm.mysql.all.create.sql
@@ -41,8 +41,11 @@
UNIQUE KEY `uniqueCodeIndex` (`code`,`is_deleted`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='鏈哄簥';
+
+DROP TABLE IF EXISTS `mdm_produce_division`;
CREATE TABLE `mdm_produce_division` (
`id` bigint NOT NULL,
+ `drawing_no` varchar(100) NULL COMMENT '鍥惧彿锛岄浂缁勪欢鍙�',
`team_leader_id` bigint NOT NULL COMMENT '涓撲笟缁勯暱璐﹀彿',
`programmer_id` bigint NOT NULL COMMENT '缂栧埗鍛樿处鍙�',
`checker_id` bigint NOT NULL COMMENT '鏍″鍛樿处鍙凤紙宸ヨ壓鍛樿鑹诧級',
@@ -58,7 +61,7 @@
`update_user` bigint DEFAULT NULL COMMENT '鏇存柊浜�',
PRIMARY KEY (`id`) USING BTREE,
UNIQUE KEY `uniqueCheckIndex` (`team_leader_id`,`programmer_id`,`checker_id`,`senior_id`,`is_deleted`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='涓诲埗璁″垝琛�';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='涓诲埗鍒嗗伐琛�';
DROP TABLE IF EXISTS `mdm_nc_node`;
CREATE TABLE `mdm_nc_node` (
@@ -67,7 +70,7 @@
`name` varchar(100) NOT NULL COMMENT '鑺傜偣鍚嶇О',
`process_name` varchar(20) NULL COMMENT '宸ュ簭鍚嶇О',
`machine_code` varchar(100) DEFAULT NULL COMMENT '璁惧缂栧彿/鏈哄簥缂栧彿',
- `part_no` varchar(100) NULL COMMENT '闆剁粍浠剁紪鍙�/鍥惧彿',
+ `drawing_no` varchar(100) NULL COMMENT '闆剁粍浠剁紪鍙�/鍥惧彿',
`is_cured` int DEFAULT NULL COMMENT '鏄惁鍥哄寲,1鏄�;0鍚�',
`expire_date` date DEFAULT NULL COMMENT '鍒版湡鏃堕棿,鏍规嵁鏈夋晥鏈熸椂闀胯绠楄�屾潵',
`process_edition` varchar(40) DEFAULT NULL COMMENT '宸ュ簭鐗堟锛屽崌鐗堝氨鏄彉鏇存敼璇ュ瓧娈碉紝闇�瑕佷繚鐣欏巻鍙茶褰�',
@@ -93,6 +96,7 @@
`tenant_id` varchar(6) DEFAULT NULL COMMENT '鎵�灞炵鎴�',
`process_instance_id` varchar(64) NOT NULL COMMENT '娴佺▼瀹炰緥id',
`nc_program_id` bigint DEFAULT NULL COMMENT '鏁版帶绋嬪簭id',
+ `process_definition_key` varchar(100) DEFAULT NULL COMMENT '娴佺▼瀹氫箟key',
`status` int DEFAULT NULL COMMENT '涓氬姟鐘舵��',
`create_dept` bigint DEFAULT NULL COMMENT '鍒涘缓鍗曚綅',
`is_deleted` int DEFAULT NULL,
@@ -107,7 +111,8 @@
CREATE TABLE `mdm_nc_program` (
`id` bigint NOT NULL,
`tenant_id` varchar(6) DEFAULT NULL COMMENT '鎵�灞炵鎴�',
- `nc_node_id` bigint DEFAULT NULL COMMENT '鎵�灞炶妭鐐筰d锛屽簲璇ュ睘浜庢煇涓暟鎺х▼搴忚妭鐐�',
+ `nc_node_id` bigint DEFAULT NULL COMMENT '鎵�灞炶妭鐐筰d锛屽簲璇ュ睘浜庢煇涓暟鎺х▼搴忚妭鐐圭殑涓嬬骇',
+ `bind_nc_node_id` bigint DEFAULT NULL COMMENT '缁戝畾鑺傜偣id锛岀粦瀹氳妭鐐逛笌鏂囦欢鍚嶅悓鍚嶏紝渚夸簬鏄剧ず鏍戠粨鏋�',
`code` varchar(100) NULL COMMENT '绋嬪簭缂栧彿',
`name` varchar(100) NOT NULL COMMENT '绋嬪簭鍚嶇О',
`oss_name` varchar(100) NULL COMMENT 'oss涓殑鏂囦欢鍚�',
@@ -117,8 +122,8 @@
`is_text_file` int DEFAULT NULL COMMENT '鏄惁鏂囨湰鏂囦欢',
`url` varchar(400) NOT NULL COMMENT '鏂囦欢鍦板潃',
`machine_code` varchar(100) DEFAULT NULL COMMENT '璁惧缂栧彿/鏈哄簥缂栧彿',
- `part_no` varchar(100) NULL COMMENT '闆剁粍浠剁紪鍙�/鍥惧彿',
- `part_no_edition` varchar(100) NULL COMMENT '鍥惧彿鐗堟',
+ `drawing_no` varchar(100) NULL COMMENT '闆剁粍浠剁紪鍙�/鍥惧彿',
+ `drawing_no_edition` varchar(100) NULL COMMENT '鍥惧彿鐗堟',
`craft_edition` varchar(20) NULL COMMENT '璁捐鐗堟',
`description` varchar(100) NULL COMMENT '鎻忚堪',
`is_cured` int DEFAULT NULL COMMENT '鏄惁鍥哄寲,1鏄�;0鍚�',
@@ -147,12 +152,13 @@
`tenant_id` varchar(6) DEFAULT NULL COMMENT '鎵�灞炵鎴�',
`nc_program_id` bigint NULL COMMENT '绋嬪簭id銆傛湭閫夋嫨绋嬪簭涔嬪墠鏄痭ull',
`process_instance_id` varchar(64) DEFAULT NULL COMMENT '娴佺▼瀹炰緥id',
+ `process_definition_key` varchar(100) DEFAULT NULL COMMENT '娴佺▼瀹氫箟key',
`task_name` varchar(100) DEFAULT NULL COMMENT '浠诲姟鍚嶇О',
`operate_time` datetime DEFAULT NULL COMMENT '瀹℃壒鏃堕棿',
`operate_result` varchar(20) DEFAULT NULL COMMENT '瀹℃壒缁撴灉',
`user_id` bigint NOT NULL COMMENT '瀹℃壒鐢ㄦ埛id',
`user_nickname` varchar(100) NOT NULL COMMENT '瀹℃壒鐢ㄦ埛濮撳悕',
- `comment` varchar(100) NOT NULL COMMENT '瀹℃壒澶囨敞',
+ `comment` varchar(100) NULL COMMENT '瀹℃壒澶囨敞',
`status` int DEFAULT NULL COMMENT '涓氬姟鐘舵��',
`create_dept` bigint DEFAULT NULL COMMENT '鍒涘缓鍗曚綅',
`is_deleted` int DEFAULT NULL,
@@ -203,13 +209,12 @@
DROP TABLE IF EXISTS `mdm_machine_back_file`;
CREATE TABLE `mdm_machine_back_file` (
`id` bigint NOT NULL,
- `program_id` varchar(255) NOT NULL COMMENT '绋嬪簭缂栫爜',
- `machine_code` bigint DEFAULT NULL COMMENT '鎵�灞炴満搴婁唬鐮�',
+ `tenant_id` varchar(6) DEFAULT NULL COMMENT '鎵�灞炵鎴�',
+ `program_id` bigint NOT NULL COMMENT '绋嬪簭缂栫爜',
+ `machine_code` varchar(100) DEFAULT NULL COMMENT '鎵�灞炴満搴婁唬鐮�',
`confirm_time` datetime DEFAULT NULL COMMENT '纭鏃堕棿',
`status` int DEFAULT NULL COMMENT '涓氬姟鐘舵��',
-
-
`create_dept` bigint DEFAULT NULL COMMENT '鍒涘缓鍗曚綅',
`is_deleted` int DEFAULT NULL,
--
Gitblit v1.9.3