From 5c2e8a80d739c5659d74bfd2cbe232b5d72ce21f Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 15 十月 2024 16:47:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/changelog.sql | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/changelog.sql b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/changelog.sql
index 245a94c..5473f61 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/changelog.sql
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/changelog.sql
@@ -153,56 +153,61 @@
-- rollback DELETE FROM sys_dict_data WHERE dict_type in ('鐧界幓', '鍗曢摱', '鍙岄摱');
--- changeset wangfei:20240918001
+-- changeset zsh:20240918001
-- preconditions onFail:CONTINUE onError:CONTINUE
-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'raw_glass_storage_details' and table_schema = 'hangzhoumes';
CREATE TABLE raw_glass_storage_details
(
id bigint NOT NULL AUTO_INCREMENT,
device_id int NULL DEFAULT NULL COMMENT '璁惧id',
- slot_id varchar(255) NULL DEFAULT NULL COMMENT '鏍煎瓙id',
+ slot int NULL DEFAULT NULL COMMENT '鏍煎瓙id',
pattern_width double(8, 2) NULL DEFAULT NULL COMMENT '鍘熺墖瀹�',
pattern_height double(8, 2) NULL DEFAULT NULL COMMENT '鍘熺墖楂�',
pattern_thickness double(8, 2) NULL DEFAULT NULL COMMENT '鍘熺墖鍘氬害',
- films_id varchar(255) NULL DEFAULT NULL COMMENT '鑶滅郴',
+ films_id varchar(64) NULL DEFAULT NULL COMMENT '鑶滅郴',
create_time datetime NOT NULL COMMENT '鍒涘缓鏃堕棿',
- remain_quantity varchar(255) NULL DEFAULT NULL COMMENT '鍓╀綑鏁伴噺',
+ remain_quantity int NULL DEFAULT NULL COMMENT '鍓╀綑鏁伴噺',
+ state int NULL DEFAULT NULL COMMENT '鐘舵��',
PRIMARY KEY (id) USING BTREE
);
-- rollback DROP TABLE raw_glass_storage_details;
--- changeset wangfei:20240918002
+-- changeset zsh:20240918002
-- preconditions onFail:CONTINUE onError:CONTINUE
-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'raw_glass_storage_station' and table_schema = 'hangzhoumes';
CREATE TABLE raw_glass_storage_station
(
- id bigint NOT NULL AUTO_INCREMENT,
- device_id int NULL DEFAULT NULL COMMENT '璁惧id',
- slot int NULL DEFAULT NULL COMMENT '鏍呮牸鍙�',
+ id bigint NOT NULL AUTO_INCREMENT,
+ device_id int NULL DEFAULT NULL COMMENT '璁惧id',
+ slot int NULL DEFAULT NULL COMMENT '鏍呮牸鍙�',
enable_state varchar(255) NULL DEFAULT NULL COMMENT '鍚敤鏍囪',
- start_slot int NULL DEFAULT NULL COMMENT '寮�濮嬪伐浣�',
- end_slot int NULL DEFAULT NULL COMMENT '鐩爣宸ヤ綅',
- PRIMARY KEY (id) USING BTREE
+ PRIMARY KEY (id)
);
-- rollback DROP TABLE raw_glass_storage_station;
--- changeset wangfei:20240918003
+-- changeset zsh:20240918003
-- preconditions onFail:CONTINUE onError:CONTINUE
-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'raw_glass_storage_task' and table_schema = 'hangzhoumes';
CREATE TABLE raw_glass_storage_task
(
- id bigint NOT NULL AUTO_INCREMENT,
- enable_id int NULL DEFAULT NULL COMMENT '浠诲姟ID',
- originate_slot int NULL DEFAULT NULL COMMENT '璧峰鏍煎瓙',
- end_slot int NULL DEFAULT NULL COMMENT '鐩爣鏍煎瓙',
- pattern_quantity varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍘熺墖鏁伴噺',
- enable_type int NULL DEFAULT NULL COMMENT '浠诲姟绫诲瀷',
- enable_state int NULL DEFAULT NULL COMMENT '浠诲姟鐘舵��',
+ id bigint NOT NULL AUTO_INCREMENT,
+ start_slot int NULL DEFAULT NULL COMMENT '璧峰鏍煎瓙',
+ end_slot int NULL DEFAULT NULL COMMENT '鐩爣鏍煎瓙',
+ pattern_quantity int NULL DEFAULT NULL COMMENT '鍘熺墖鏁伴噺',
+ enable_type int NULL DEFAULT NULL COMMENT '浠诲姟绫诲瀷',
+ enable_state int NULL DEFAULT NULL COMMENT '浠诲姟鐘舵��',
create_time datetime NULL DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
PRIMARY KEY (id) USING BTREE
);
-- rollback DROP TABLE raw_glass_storage_task;
+-- changeset zsh:20241015001
+-- preconditions onFail:CONTINUE onError:CONTINUE
+-- precondition-sql-check expectedResult:0 SELECT count(0) FROM information_schema.columns WHERE table_schema = 'hangzhoumes' AND table_name = 'engineering' AND column_name = 'station_cell';
+ALTER TABLE engineering
+ ADD COLUMN station_cell varchar(20);
+
+
--
Gitblit v1.8.0