From 93b488aa57cfd99a94a242c38b007a0d9e35f69b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 03 十二月 2024 13:55:27 +0800
Subject: [PATCH] 1、fixbug:调度任务改为为非强制性出片
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/ywChangelog.sql | 222 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 199 insertions(+), 23 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/ywChangelog.sql b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/ywChangelog.sql
index 5892857..98cb14c 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/ywChangelog.sql
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/ywChangelog.sql
@@ -9,17 +9,14 @@
glass_id_in varchar(20) DEFAULT NULL COMMENT '杩涚墖鐜荤拑id',
glass_id_out varchar(20) DEFAULT NULL COMMENT '鍑虹墖鐜荤拑id',
glass_id varchar(20) DEFAULT NULL COMMENT '纾ㄨ竟鍓嶇幓鐠僫d',
+ in_place int DEFAULT 0 COMMENT '灏变綅淇″彿',
current_cell int DEFAULT '0' COMMENT '褰撳墠灞傚彿',
start_cell int DEFAULT '0' COMMENT '灞傚彿',
end_cell int DEFAULT NULL COMMENT '棰勭暀灞傚彿',
task_state int DEFAULT NULL COMMENT '浠诲姟鐘舵�� 0榛樿绌轰换鍔� 1鎵ц涓� 2缁撴潫浠诲姟',
task_type int DEFAULT NULL COMMENT '浠诲姟绫诲瀷',
create_time timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
- update_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
- width int DEFAULT NULL COMMENT '瀹�',
- height int DEFAULT NULL COMMENT '楂�',
- thickness int DEFAULT NULL COMMENT '鍘�',
- film_remove int DEFAULT NULL COMMENT '鏄惁闄よ啘'
+ update_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿'
);
-- rollback DROP TABLE edg_storage_device_one_task;
@@ -27,9 +24,10 @@
-- changeset zsh:20241107002
-- preconditions onFail:CONTINUE onError:CONTINUE
-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM edg_storage_device_one_task;
-INSERT INTO edg_storage_device_one_task (task_running, glass_id, glass_id_in, glass_id_out, current_cell, start_cell,
- end_cell, task_state, task_type, width, height, thickness, film_remove)
-VALUES (0, NULL, NULL, NULL, 1, 0, NULL, 0, NULL, 0, 0, 0, 0);
+INSERT INTO edg_storage_device_one_task (task_running, glass_id, in_place, glass_id_in, glass_id_out, current_cell,
+ start_cell,
+ end_cell, task_state, task_type)
+VALUES (0, NULL, 0, NULL, NULL, 1, 0, NULL, 0, NULL, 0, 0, 0, 0);
-- changeset zsh:20241107003
@@ -41,26 +39,24 @@
glass_id_in varchar(20) DEFAULT NULL COMMENT '杩涚墖鐜荤拑id',
glass_id_out varchar(20) DEFAULT NULL COMMENT '鍑虹墖鐜荤拑id',
glass_id varchar(20) DEFAULT NULL COMMENT '纾ㄨ竟鍓嶇幓鐠僫d',
+ in_place int DEFAULT 0 COMMENT '灏变綅淇″彿',
current_cell int DEFAULT '0' COMMENT '褰撳墠灞傚彿',
start_cell int DEFAULT '0' COMMENT '灞傚彿',
end_cell int DEFAULT NULL COMMENT '棰勭暀灞傚彿',
task_state int DEFAULT NULL COMMENT '浠诲姟鐘舵�� 0榛樿绌轰换鍔� 1鎵ц涓� 2缁撴潫浠诲姟',
task_type int DEFAULT NULL COMMENT '浠诲姟绫诲瀷',
create_time timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
- update_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
- width int DEFAULT NULL COMMENT '瀹�',
- height int DEFAULT NULL COMMENT '楂�',
- thickness int DEFAULT NULL COMMENT '鍘�',
- film_remove int DEFAULT NULL COMMENT '鏄惁闄よ啘'
+ update_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿'
);
-- rollback DROP TABLE edg_storage_device_two_task;
-- changeset zsh:20241107004
-- preconditions onFail:CONTINUE onError:CONTINUE
-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM edg_storage_device_two_task;
-INSERT INTO edg_storage_device_two_task (task_running, glass_id, glass_id_in, glass_id_out, current_cell, start_cell,
- end_cell, task_state, task_type, width, height, thickness, film_remove)
-VALUES (0, NULL, NULL, NULL, 1, 0, NULL, 0, NULL, 0, 0, 0, 0);
+INSERT INTO edg_storage_device_two_task (task_running, glass_id, in_place, glass_id_in, glass_id_out, current_cell,
+ start_cell,
+ end_cell, task_state, task_type)
+VALUES (0, NULL, 0, NULL, NULL, 1, 0, NULL, 0, NULL, 0, 0, 0, 0);
@@ -72,6 +68,8 @@
id bigint NOT NULL AUTO_INCREMENT COMMENT '宸ョ▼琛╥d',
glass_id_in varchar(20) DEFAULT NULL COMMENT '杩涚墖鐜荤拑id',
glass_id_out varchar(20) DEFAULT NULL COMMENT '鍑虹墖鐜荤拑id',
+ glass_id varchar(20) DEFAULT NULL COMMENT '纾ㄨ竟鍓嶇幓鐠僫d',
+ in_place int DEFAULT 0 COMMENT '灏变綅淇″彿',
current_cell int DEFAULT '0' COMMENT '褰撳墠灞傚彿',
start_cell int DEFAULT '0' COMMENT '灞傚彿',
end_cell int DEFAULT NULL COMMENT '棰勭暀灞傚彿',
@@ -108,6 +106,7 @@
raw_glass_width int DEFAULT '0' COMMENT '鍘熺墖瀹�',
raw_glass_height int DEFAULT '0' COMMENT '鍘熺墖楂�',
slot int DEFAULT '0' COMMENT '涓婄墖浣嶇紪鍙�',
+ inkage_state int DEFAULT '0' COMMENT '鑱旀満鐘舵��',
task_state int DEFAULT NULL COMMENT '浠诲姟鐘舵�� 0榛樿绌轰换鍔� 1鎵ц涓� 2缁撴潫浠诲姟',
create_time timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
update_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
@@ -120,9 +119,9 @@
-- changeset zsh:20241107008
-- preconditions onFail:CONTINUE onError:CONTINUE
-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM load_glass_device_one_task;
-INSERT INTO load_glass_device_one_task (task_running, raw_glass_width, raw_glass_height, slot, task_state, total_count,
- finish_count, damage_count)
-VALUES (0, 0, 0, 0, 0, 0, 0, 0);
+INSERT INTO load_glass_device_one_task (task_running, raw_glass_width, raw_glass_height, slot, inkage_state, task_state,
+ total_count, finish_count, damage_count)
+VALUES (0, 0, 0, 0, 0, 0, 0, 0, 0);
-- changeset zsh:20241107009
-- preconditions onFail:CONTINUE onError:CONTINUE
@@ -133,6 +132,7 @@
raw_glass_width int DEFAULT '0' COMMENT '鍘熺墖瀹�',
raw_glass_height int DEFAULT '0' COMMENT '鍘熺墖楂�',
slot int DEFAULT '0' COMMENT '涓婄墖浣嶇紪鍙�',
+ inkage_state int DEFAULT '0' COMMENT '鑱旀満鐘舵��',
task_state int DEFAULT NULL COMMENT '浠诲姟鐘舵�� 0榛樿绌轰换鍔� 1鎵ц涓� 2缁撴潫浠诲姟',
create_time timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
update_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
@@ -145,9 +145,9 @@
-- changeset zsh:20241107010
-- preconditions onFail:CONTINUE onError:CONTINUE
-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM load_glass_device_two_task;
-INSERT INTO load_glass_device_two_task (task_running, raw_glass_width, raw_glass_height, slot, task_state, total_count,
- finish_count, damage_count)
-VALUES (0, 0, 0, 0, 0, 0, 0, 0);
+INSERT INTO load_glass_device_two_task (task_running, raw_glass_width, raw_glass_height, slot, inkage_state, task_state,
+ total_count, finish_count, damage_count)
+VALUES (0, 0, 0, 0, 0, 0, 0, 0, 0);
-- changeset zsh:20241107011
@@ -161,6 +161,7 @@
raw_glass_height int DEFAULT '0' COMMENT '鍘熺墖楂�',
station int DEFAULT '0' COMMENT '涓婄墖璁惧缂栧彿',
slot int DEFAULT '0' COMMENT '涓婄墖浣嶇紪鍙�',
+ inkage_state int DEFAULT '0' COMMENT '鑱旀満鐘舵��',
task_state int DEFAULT NULL COMMENT '浠诲姟鐘舵�� 0榛樿绌轰换鍔� 1鎵ц涓� 2缁撴潫浠诲姟',
create_time timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
update_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
@@ -169,4 +170,179 @@
damage_count int DEFAULT '0' COMMENT '鐮存崯鏁伴噺',
PRIMARY KEY (id) USING BTREE
);
--- rollback DROP TABLE load_glass_device_task_history;
\ No newline at end of file
+-- rollback DROP TABLE load_glass_device_task_history;
+
+-- changeset zsh:20241112001
+-- preconditions onFail:CONTINUE onError:CONTINUE
+-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'big_storage_cage_history_task' and table_schema = 'hangzhoumes';
+CREATE TABLE big_storage_cage_history_task
+(
+ id int NOT NULL AUTO_INCREMENT,
+ glass_id varchar(32) DEFAULT NULL COMMENT '鐜荤拑id',
+ start_slot int DEFAULT '0' COMMENT '璧峰鏍煎瓙',
+ target_slot int DEFAULT '0' COMMENT '鐩爣鏍煎瓙',
+ task_state int DEFAULT NULL COMMENT '浠诲姟鐘舵�� ',
+ glass_count int DEFAULT NULL COMMENT '鐜荤拑鏁伴噺',
+ task_type int DEFAULT NULL COMMENT '浠诲姟绫诲瀷',
+ create_time timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ update_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ PRIMARY KEY (id)
+);
+-- rollback DROP TABLE big_storage_cage_history_task;
+
+-- changeset zsh:20241112002
+-- preconditions onFail:CONTINUE onError:CONTINUE
+-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'big_storage_cage_in_one_task' and table_schema = 'hangzhoumes';
+CREATE TABLE big_storage_cage_in_one_task
+(
+ glass_id varchar(32) DEFAULT NULL COMMENT '鐜荤拑id',
+ start_slot int DEFAULT '0' COMMENT '璧峰鏍煎瓙',
+ target_slot int DEFAULT '0' COMMENT '鐩爣鏍煎瓙',
+ task_state int DEFAULT NULL COMMENT '浠诲姟鐘舵�� '
+);
+-- rollback DROP TABLE big_storage_cage_in_one_task;
+
+-- changeset zsh:20241112003
+-- preconditions onFail:CONTINUE onError:CONTINUE
+-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM big_storage_cage_in_one_task;
+INSERT INTO big_storage_cage_in_one_task(glass_id, start_slot, target_slot, task_state)
+VALUES (NULL, 0, 0, 0);
+INSERT INTO big_storage_cage_in_one_task(glass_id, start_slot, target_slot, task_state)
+VALUES (NULL, 0, 0, 0);
+INSERT INTO big_storage_cage_in_one_task(glass_id, start_slot, target_slot, task_state)
+VALUES (NULL, 0, 0, 0);
+INSERT INTO big_storage_cage_in_one_task(glass_id, start_slot, target_slot, task_state)
+VALUES (NULL, 0, 0, 0);
+INSERT INTO big_storage_cage_in_one_task(glass_id, start_slot, target_slot, task_state)
+VALUES (NULL, 0, 0, 0);
+INSERT INTO big_storage_cage_in_one_task(glass_id, start_slot, target_slot, task_state)
+VALUES (NULL, 0, 0, 0);
+
+
+-- changeset zsh:20241112004
+-- preconditions onFail:CONTINUE onError:CONTINUE
+-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'big_storage_cage_in_two_task' and table_schema = 'hangzhoumes';
+CREATE TABLE big_storage_cage_in_two_task
+(
+ glass_id VARCHAR(32) COMMENT '鐜荤拑id',
+ start_slot INT DEFAULT '0' COMMENT '璧峰鏍煎瓙',
+ target_slot INT DEFAULT '0' COMMENT '鐩爣鏍煎瓙',
+ task_state INT DEFAULT NULL COMMENT '浠诲姟鐘舵�� '
+);
+-- rollback DROP TABLE big_storage_cage_in_two_task;
+
+-- changeset zsh:20241112005
+-- preconditions onFail:CONTINUE onError:CONTINUE
+-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM big_storage_cage_in_two_task;
+INSERT INTO big_storage_cage_in_two_task(glass_id, start_slot, target_slot, task_state)
+VALUES (NULL, 0, 0, 0);
+INSERT INTO big_storage_cage_in_two_task(glass_id, start_slot, target_slot, task_state)
+VALUES (NULL, 0, 0, 0);
+INSERT INTO big_storage_cage_in_two_task(glass_id, start_slot, target_slot, task_state)
+VALUES (NULL, 0, 0, 0);
+INSERT INTO big_storage_cage_in_two_task(glass_id, start_slot, target_slot, task_state)
+VALUES (NULL, 0, 0, 0);
+INSERT INTO big_storage_cage_in_two_task(glass_id, start_slot, target_slot, task_state)
+VALUES (NULL, 0, 0, 0);
+INSERT INTO big_storage_cage_in_two_task(glass_id, start_slot, target_slot, task_state)
+VALUES (NULL, 0, 0, 0);
+
+-- changeset zsh:20241113001
+-- preconditions onFail:CONTINUE onError:CONTINUE
+-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'big_storage_cage_out_one_task' and table_schema = 'hangzhoumes';
+CREATE TABLE big_storage_cage_out_one_task
+(
+ glass_id varchar(32) DEFAULT NULL COMMENT '鐜荤拑id',
+ start_slot int DEFAULT '0' COMMENT '璧峰鏍煎瓙',
+ target_slot int DEFAULT '0' COMMENT '鐩爣鏍煎瓙',
+ task_state int DEFAULT NULL COMMENT '浠诲姟鐘舵�� '
+);
+-- rollback DROP TABLE big_storage_cage_out_one_task;
+
+-- changeset zsh:20241113002
+-- preconditions onFail:CONTINUE onError:CONTINUE
+-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM big_storage_cage_out_one_task;
+INSERT INTO big_storage_cage_out_one_task(glass_id, start_slot, target_slot, task_state)
+VALUES (NULL, 0, 0, 0);
+INSERT INTO big_storage_cage_out_one_task(glass_id, start_slot, target_slot, task_state)
+VALUES (NULL, 0, 0, 0);
+INSERT INTO big_storage_cage_out_one_task(glass_id, start_slot, target_slot, task_state)
+VALUES (NULL, 0, 0, 0);
+INSERT INTO big_storage_cage_out_one_task(glass_id, start_slot, target_slot, task_state)
+VALUES (NULL, 0, 0, 0);
+INSERT INTO big_storage_cage_out_one_task(glass_id, start_slot, target_slot, task_state)
+VALUES (NULL, 0, 0, 0);
+INSERT INTO big_storage_cage_out_one_task(glass_id, start_slot, target_slot, task_state)
+VALUES (NULL, 0, 0, 0);
+
+
+-- changeset zsh:20241113003
+-- preconditions onFail:CONTINUE onError:CONTINUE
+-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'big_storage_cage_out_two_task' and table_schema = 'hangzhoumes';
+CREATE TABLE big_storage_cage_out_two_task
+(
+ glass_id VARCHAR(32) COMMENT '鐜荤拑id',
+ start_slot INT DEFAULT '0' COMMENT '璧峰鏍煎瓙',
+ target_slot INT DEFAULT '0' COMMENT '鐩爣鏍煎瓙',
+ task_state INT DEFAULT NULL COMMENT '浠诲姟鐘舵�� '
+);
+-- rollback DROP TABLE big_storage_cage_out_two_task;
+-- changeset zsh:20241113004
+-- preconditions onFail:CONTINUE onError:CONTINUE
+-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM big_storage_cage_out_two_task;
+INSERT INTO big_storage_cage_out_two_task(glass_id, start_slot, target_slot, task_state)
+VALUES (NULL, 0, 0, 0);
+INSERT INTO big_storage_cage_out_two_task(glass_id, start_slot, target_slot, task_state)
+VALUES (NULL, 0, 0, 0);
+INSERT INTO big_storage_cage_out_two_task(glass_id, start_slot, target_slot, task_state)
+VALUES (NULL, 0, 0, 0);
+INSERT INTO big_storage_cage_out_two_task(glass_id, start_slot, target_slot, task_state)
+VALUES (NULL, 0, 0, 0);
+INSERT INTO big_storage_cage_out_two_task(glass_id, start_slot, target_slot, task_state)
+VALUES (NULL, 0, 0, 0);
+INSERT INTO big_storage_cage_out_two_task(glass_id, start_slot, target_slot, task_state)
+VALUES (NULL, 0, 0, 0);
+
+
+-- changeset zsh:20241126001
+-- preconditions onFail:CONTINUE onError:CONTINUE
+-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'big_storage_glass_info' and table_schema = 'hangzhoumes';
+CREATE TABLE big_storage_glass_info
+(
+ id bigint NOT NULL AUTO_INCREMENT COMMENT '澶х悊鐗囩淇℃伅琛╥d',
+ glass_id varchar(20) DEFAULT NULL COMMENT '鐜荤拑id',
+ flow_card_id varchar(20) DEFAULT NULL COMMENT '娴佺▼鍗″彿',
+ glass_type int DEFAULT NULL COMMENT '鐜荤拑绫诲瀷',
+ width double DEFAULT NULL COMMENT '瀹�',
+ height double DEFAULT NULL COMMENT '楂�',
+ thickness double DEFAULT NULL COMMENT '鍘氬害',
+ tempering_layout_id int DEFAULT NULL COMMENT '閽㈠寲鐗堝浘id',
+ tempering_feed_sequence int DEFAULT NULL COMMENT '閽㈠寲鐗堝浘鐗囧簭',
+ x_coordinate int DEFAULT NULL COMMENT 'x鍧愭爣',
+ y_coordinate int DEFAULT NULL COMMENT 'y鍧愭爣',
+ engineer_id varchar(50) DEFAULT NULL,
+ layer int DEFAULT NULL COMMENT '灞傚彿',
+ virtual_slot int DEFAULT NULL COMMENT '铏氭嫙鏍煎瓙鍙�',
+ slot_sequence int DEFAULT NULL COMMENT '鏍煎瓙娆″簭',
+ PRIMARY KEY (id) USING BTREE
+);
+-- rollback DROP TABLE big_storage_glass_info;
+
+-- changeset zsh:20241126002
+-- preconditions onFail:CONTINUE onError:CONTINUE
+-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'big_storage_glass_relation_info' and table_schema = 'hangzhoumes';
+CREATE TABLE big_storage_glass_relation_info
+(
+ id bigint NOT NULL AUTO_INCREMENT COMMENT '閽㈠寲鐜荤拑鍏崇郴琛╥d',
+ engineer_id varchar(50) DEFAULT NULL,
+ glass_id varchar(20) DEFAULT NULL COMMENT '鐜荤拑id',
+ tempering_layout_id int DEFAULT NULL COMMENT '閽㈠寲鐗堝浘id',
+ tempering_feed_sequence int DEFAULT NULL COMMENT '閽㈠寲鐗堝浘鐗囧簭',
+ virtual_slot int DEFAULT NULL COMMENT '铏氭嫙鏍煎瓙',
+ slot_sequence int DEFAULT NULL COMMENT '鏍煎瓙鍐呮搴�',
+ slot int DEFAULT NULL COMMENT '瀹為檯鏍煎瓙鍙�',
+ device_id int DEFAULT NULL COMMENT '瀹為檯绗煎瓙鍙�',
+ PRIMARY KEY (id) USING BTREE
+);
+-- rollback DROP TABLE big_storage_glass_relation_info;
+
--
Gitblit v1.8.0