From cf33278c73767f72e35a4898c23765f52a3bfd1d Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 03 十二月 2024 09:06:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywMes'
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/ywChangelog.sql | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/ywChangelog.sql b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/ywChangelog.sql
index 9832dd6..98cb14c 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/ywChangelog.sql
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/ywChangelog.sql
@@ -199,7 +199,7 @@
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
@@ -256,7 +256,7 @@
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
@@ -303,3 +303,46 @@
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