root/hl_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:三线清洗功能

Browse Source
This commit is contained in:
zhangzq
2024-02-26 09:11:47 +08:00
parent cde116d4f0
commit 45377df88e
45 changed files with 1090 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mes/hd/nladmin-system/src/main/resources/config/application.yml
View File

@@ -69,6 +69,7 @@ security:
- /api/localStorage/pictures
# 参数
- /api/param/getValueByCode
- /api/pda/jgwash/**
- /plumelog/**
- /api/esLog/**
- /api/users

2
mes/hd/nladmin-system/src/main/resources/logback-spring.xml
View File

@@ -80,7 +80,7 @@
<springProfile name="dev3">
<root level="info">
<appender-ref ref="asyncLuceneAppender"/>
<!-- <appender-ref ref="asyncLuceneAppender"/>-->
<appender-ref ref="CONSOLE"/>
</root>
<logger name="jdbc" level="ERROR" additivity="true">

20
mes/hd/nladmin-system/src/main/resources/sql/三线初始化数据.sql
View File

@@ -331,3 +331,23 @@ INSERT INTO `hl_one_mes`.`sch_base_point`(`point_id`, `point_code`, `point_name`
INSERT INTO `hl_one_mes`.`sch_base_point`(`point_id`, `point_code`, `point_name`, `product_area`, `region_code`, `pre_region_code`, `next_region_code`, `point_type`, `point_status`, `lock_type`, `material_id`, `device_code`, `can_vehicle_type`, `vehicle_max_qty`, `vehicle_type`, `vehicle_code`, `vehicle_qty`, `block_num`, `row_num`, `col_num`, `layer_num`, `in_order_seq`, `out_order_seq`, `in_empty_seq`, `out_empty_seq`, `point_group_code`, `task_id`, `point_location`, `remark`, `source_id`, `is_used`, `is_delete`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`, `control_point`, `qty`, `priority`) VALUES ('1759406007819301337', 'A3_THXL_19_J', '三线铜环下料05接料位', 'A3', 'A3_THXL', NULL, NULL, '1', '1', '0', NULL, 'A3_THXL_19', NULL, 0, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, '1', '0', '1740177213497675776', '管理员', '2024-02-19 10:58:01.349', NULL, NULL, NULL, NULL, NULL, '2');
INSERT INTO `hl_one_mes`.`sch_base_point`(`point_id`, `point_code`, `point_name`, `product_area`, `region_code`, `pre_region_code`, `next_region_code`, `point_type`, `point_status`, `lock_type`, `material_id`, `device_code`, `can_vehicle_type`, `vehicle_max_qty`, `vehicle_type`, `vehicle_code`, `vehicle_qty`, `block_num`, `row_num`, `col_num`, `layer_num`, `in_order_seq`, `out_order_seq`, `in_empty_seq`, `out_empty_seq`, `point_group_code`, `task_id`, `point_location`, `remark`, `source_id`, `is_used`, `is_delete`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`, `control_point`, `qty`, `priority`) VALUES ('1759406007819301338', 'A3_THXL_19_M', '三线铜环下料05满料位', 'A3', 'A3_THXL', NULL, NULL, '1', '1', '0', NULL, 'A3_THXL_19', NULL, 0, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, '1', '0', '1740177213497675776', '管理员', '2024-02-19 10:58:01.349', NULL, NULL, NULL, NULL, NULL, '3');
INSERT INTO `hl_one_mes`.`sch_base_point`(`point_id`, `point_code`, `point_name`, `product_area`, `region_code`, `pre_region_code`, `next_region_code`, `point_type`, `point_status`, `lock_type`, `material_id`, `device_code`, `can_vehicle_type`, `vehicle_max_qty`, `vehicle_type`, `vehicle_code`, `vehicle_qty`, `block_num`, `row_num`, `col_num`, `layer_num`, `in_order_seq`, `out_order_seq`, `in_empty_seq`, `out_empty_seq`, `point_group_code`, `task_id`, `point_location`, `remark`, `source_id`, `is_used`, `is_delete`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`, `control_point`, `qty`, `priority`) VALUES ('1759406007819301339', 'A3_THXL_19_D', '三线铜环下料05倒料位', 'A3', 'A3_THXL', NULL, NULL, '1', '1', '0', NULL, 'A3_THXL_19', NULL, 0, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, '1', '0', '1740177213497675776', '管理员', '2024-02-19 10:58:01.349', NULL, NULL, NULL, NULL, NULL, '3');
--业务--
CREATE TABLE `sch_conveyor_position` (
`id` int NOT NULL AUTO_INCREMENT COMMENT '主键',
`position_code` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL COMMENT '输送线编码',
`position_name` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL COMMENT '缓存线位置名字',
`position_no` int NOT NULL DEFAULT '0' COMMENT '位置顺序号',
`storagevehicle_code` varchar(20) COLLATE utf8mb3_bin DEFAULT '0' COMMENT '缓存线层数',
`materila_id` varchar(20) COLLATE utf8mb3_bin DEFAULT '0' COMMENT '缓存线层数',
`qty` decimal(5,3) DEFAULT '0.000' COMMENT '缓存线层数',
`wrokprocedure_id` varchar(20) COLLATE utf8mb3_bin DEFAULT '0' COMMENT '缓存线层数',
`max_no` int NOT NULL DEFAULT '0' COMMENT '缓存线层数',
`create_time` varchar(25) COLLATE utf8mb3_bin NOT NULL COMMENT '创建时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin COMMENT='输送线队列列表';
ALTER TABLE sch_base_task
ADD COLUMN workprocedure_id varchar(20) DEFAULT NULL COMMENT '物料工序id';