From 1577c2e2874c1fad9ac684356bf0e568c3015045 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期三, 27 十一月 2024 09:46:15 +0800 Subject: [PATCH] 1、大理片笼新增进笼规则，计算本工程下所有玻璃的虚拟格子信息，按照虚拟格子，匹配笼内的实际格子，进笼之后查看格子是否有到齐的，执行调度任务 2、卧理修改任务执行顺序，移除捕获异常操作 3、不覆盖原有逻辑，新增opc任务，避免任务重复执行报错 --- hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/ywChangelog.sql | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 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..b4fb95c 100644 --- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/ywChangelog.sql +++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/ywChangelog.sql @@ -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