diff --git a/files/WCS系统开发手册.md b/files/WCS系统开发手册.md index fb019fd..64fc60c 100644 --- a/files/WCS系统开发手册.md +++ b/files/WCS系统开发手册.md @@ -19,4 +19,6 @@ 电子标签联动输送线逻辑：输送线扫码时检查该捡选站台对应的电子标签货位是否有任务，若有则弹出；此处需要正确在电子标签货位表填写站台号 -电子标签状态：立即点亮的直接定时任务点亮，未激活的要扫码触发 \ No newline at end of file +电子标签状态：立即点亮的直接定时任务点亮，未激活的要扫码触发 + +电子标签区域标签状态：正在捡选（橙色） ----> 这片区域捡选完成（蓝色） ----> 所有任务完成（绿色） \ No newline at end of file diff --git a/wcs/db/wcs.sql b/wcs/db/wcs.sql index 6afd41e..2a70f76 100644 --- a/wcs/db/wcs.sql +++ b/wcs/db/wcs.sql @@ -11,7 +11,7 @@ Target Server Version : 80404 (8.4.4) File Encoding : 65001 - Date: 09/01/2026 17:01:56 + Date: 28/01/2026 14:14:07 */ SET NAMES utf8mb4; @@ -35,9 +35,9 @@ CREATE TABLE `t_app_base_api_info` ( -- Records of t_app_base_api_info -- ---------------------------- BEGIN; +INSERT INTO `t_app_base_api_info` (`api_key`, `api_name`, `root_key`, `address`, `tag`, `remark`) VALUES ('WMS__STOCK_LOGIN_REQ', '注册堆垛机任务', 'WMS_BASE', ' ', NULL, NULL); INSERT INTO `t_app_base_api_info` (`api_key`, `api_name`, `root_key`, `address`, `tag`, `remark`) VALUES ('WMS_BASE', 'WMS根地址', NULL, 'http://106.14.189.117:18080', '-', NULL); INSERT INTO `t_app_base_api_info` (`api_key`, `api_name`, `root_key`, `address`, `tag`, `remark`) VALUES ('WMS_CONVEY_TASK_STATUS_CALLBACK', '上报箱式线任务状态', 'WMS_BASE', '/api/test', NULL, NULL); -INSERT INTO `t_app_base_api_info` (`api_key`, `api_name`, `root_key`, `address`, `tag`, `remark`) VALUES ('WMS_LOGIN_STACKER', '注册堆垛机任务', 'WMS_BASE', ' ', NULL, NULL); INSERT INTO `t_app_base_api_info` (`api_key`, `api_name`, `root_key`, `address`, `tag`, `remark`) VALUES ('WMS_STOCK_TASK_STATUS_CALLBACK', '上报仓储任务状态', 'WMS_BASE', '\n', NULL, '-'); COMMIT; @@ -295,11 +295,11 @@ INSERT INTO `t_app_base_menu` (`menu_id`, `menu_name`, `menu_level`, `father_men INSERT INTO `t_app_base_menu` (`menu_id`, `menu_name`, `menu_level`, `father_menu_id`, `menu_status`, `menu_ico`, `router_name`, `create_time`, `update_time`) VALUES ('01-1', '当前箱线任务', 2, '01', 1, NULL, 'conveyTask', '2025-09-16 11:37:43', '2025-09-17 22:25:44'); INSERT INTO `t_app_base_menu` (`menu_id`, `menu_name`, `menu_level`, `father_menu_id`, `menu_status`, `menu_ico`, `router_name`, `create_time`, `update_time`) VALUES ('01-2', '历史箱线任务', 2, '01', 1, NULL, 'conveyTaskBak', '2025-09-16 11:37:55', '2025-09-19 16:33:19'); INSERT INTO `t_app_base_menu` (`menu_id`, `menu_name`, `menu_level`, `father_menu_id`, `menu_status`, `menu_ico`, `router_name`, `create_time`, `update_time`) VALUES ('01-3', '复核台设置', 2, '01', 1, NULL, 'conveyCheckStand', '2024-10-31 12:25:07', '2025-11-18 14:47:31'); -INSERT INTO `t_app_base_menu` (`menu_id`, `menu_name`, `menu_level`, `father_menu_id`, `menu_status`, `menu_ico`, `router_name`, `create_time`, `update_time`) VALUES ('01-4', '发货口设置', 2, '01', 1, NULL, NULL, '2024-10-31 12:25:30', '2024-10-31 12:25:33'); +INSERT INTO `t_app_base_menu` (`menu_id`, `menu_name`, `menu_level`, `father_menu_id`, `menu_status`, `menu_ico`, `router_name`, `create_time`, `update_time`) VALUES ('01-4', '发货口设置', 2, '01', 1, NULL, 'conveyDeliverStand', '2024-10-31 12:25:30', '2026-01-28 14:09:54'); INSERT INTO `t_app_base_menu` (`menu_id`, `menu_name`, `menu_level`, `father_menu_id`, `menu_status`, `menu_ico`, `router_name`, `create_time`, `update_time`) VALUES ('01-5', '捡货站台配置', 2, '01', 1, NULL, 'conveyPickStand', '2025-09-22 08:51:09', '2025-09-24 13:58:16'); INSERT INTO `t_app_base_menu` (`menu_id`, `menu_name`, `menu_level`, `father_menu_id`, `menu_status`, `menu_ico`, `router_name`, `create_time`, `update_time`) VALUES ('02', '电子标签综合管理', 1, NULL, 1, 'Pointer', NULL, '2024-10-31 12:26:24', '2024-10-31 12:26:26'); INSERT INTO `t_app_base_menu` (`menu_id`, `menu_name`, `menu_level`, `father_menu_id`, `menu_status`, `menu_ico`, `router_name`, `create_time`, `update_time`) VALUES ('02-1', '当前标签任务', 2, '02', 1, NULL, 'etagTask', '2024-10-31 12:26:47', '2025-09-17 22:26:02'); -INSERT INTO `t_app_base_menu` (`menu_id`, `menu_name`, `menu_level`, `father_menu_id`, `menu_status`, `menu_ico`, `router_name`, `create_time`, `update_time`) VALUES ('02-2', '历史标签任务', 2, '02', 1, NULL, NULL, '2024-10-31 12:27:11', '2025-09-17 22:26:11'); +INSERT INTO `t_app_base_menu` (`menu_id`, `menu_name`, `menu_level`, `father_menu_id`, `menu_status`, `menu_ico`, `router_name`, `create_time`, `update_time`) VALUES ('02-2', '历史标签任务', 2, '02', 1, NULL, 'etagTagBak', '2024-10-31 12:27:11', '2026-01-20 12:11:24'); INSERT INTO `t_app_base_menu` (`menu_id`, `menu_name`, `menu_level`, `father_menu_id`, `menu_status`, `menu_ico`, `router_name`, `create_time`, `update_time`) VALUES ('02-3', '控制器管理', 2, '02', 1, NULL, 'etagController', '2024-10-31 12:27:32', '2025-11-03 14:26:34'); INSERT INTO `t_app_base_menu` (`menu_id`, `menu_name`, `menu_level`, `father_menu_id`, `menu_status`, `menu_ico`, `router_name`, `create_time`, `update_time`) VALUES ('02-4', '标签ID管理', 2, '02', 1, NULL, 'etagTag', '2024-10-31 12:27:54', '2025-11-12 15:46:42'); INSERT INTO `t_app_base_menu` (`menu_id`, `menu_name`, `menu_level`, `father_menu_id`, `menu_status`, `menu_ico`, `router_name`, `create_time`, `update_time`) VALUES ('02-5', '电子标签货位管理', 2, '02', 1, NULL, 'etagLocation', '2024-10-31 12:28:12', '2025-12-23 13:10:30'); @@ -422,7 +422,7 @@ CREATE TABLE `t_app_base_user` ( -- ---------------------------- BEGIN; INSERT INTO `t_app_base_user` (`user_id`, `user_name`, `user_pwd`, `user_status`, `user_level`, `create_time`, `update_time`, `user_group`, `sex`, `photo`, `last_login_time`) VALUES ('admin', '管理员', '7MQZUEZJDUWWZ9XTEVTBGWFYEDKWVZU7HMF4PSP6L6QCCQVICCVQEBFTAN31XGMW9RNXRYYYK7J8BCOW34PWTW0YDDESA9XF6SLEA6XRSQZW3XCTWMIPMTFJ3TWMSNJQLEBO2HBD2JR2D6ZIQZY1JGLHGR0ZV8CKON5RTZZ9CNWOMWOWL7TLKHDVJ6LENHNAMK1DWZKZSFOI1LA4LXYDGDEQOJDVQ8YKBZM5E3ZLIQNLGRXRNNUA8KW40HEU8YG', 1, 3, '2025-09-02 14:31:38', '2026-01-08 13:28:09', 'ug-Admin', 0, NULL, '2026-01-08 13:28:09'); -INSERT INTO `t_app_base_user` (`user_id`, `user_name`, `user_pwd`, `user_status`, `user_level`, `create_time`, `update_time`, `user_group`, `sex`, `photo`, `last_login_time`) VALUES ('dev', '无所不能的开发者', 'Z4MVQYYWJ1ECCBSFLIWOG2CN7ZSLZRFGUWYLKF9ZXYWY6H4RHHGRKZ8XG2KZ6HDLQOBIW7QDMJZBFSIC1QUD65GZZVGUQXP4EY1UUOWRZHCQD7CKAGNYHRV3DSV1Y53NZWHIRAXXKXGADI426LFIDFGG7Z6XLV3HYRMBEY5QK22WZUX0WZT9E9Y7PCX5TMASWP9S4RKXGYOBYMNOT2JYGQM7MGOYAAMHP3NT3WISD2NQZ8JLFTVE70AIAUFJEGO', 1, 4, '2024-10-31 12:42:23', '2026-01-08 14:05:11', 'ug-developer', 0, NULL, '2026-01-08 14:05:11'); +INSERT INTO `t_app_base_user` (`user_id`, `user_name`, `user_pwd`, `user_status`, `user_level`, `create_time`, `update_time`, `user_group`, `sex`, `photo`, `last_login_time`) VALUES ('dev', '无所不能的开发者', 'Z4MVQYYWJ1ECCBSFLIWOG2CN7ZSLZRFGUWYLKF9ZXYWY6H4RHHGRKZ8XG2KZ6HDLQOBIW7QDMJZBFSIC1QUD65GZZVGUQXP4EY1UUOWRZHCQD7CKAGNYHRV3DSV1Y53NZWHIRAXXKXGADI426LFIDFGG7Z6XLV3HYRMBEY5QK22WZUX0WZT9E9Y7PCX5TMASWP9S4RKXGYOBYMNOT2JYGQM7MGOYAAMHP3NT3WISD2NQZ8JLFTVE70AIAUFJEGO', 1, 4, '2024-10-31 12:42:23', '2026-01-28 14:09:40', 'ug-developer', 0, NULL, '2026-01-28 14:09:40'); INSERT INTO `t_app_base_user` (`user_id`, `user_name`, `user_pwd`, `user_status`, `user_level`, `create_time`, `update_time`, `user_group`, `sex`, `photo`, `last_login_time`) VALUES ('test', '测试账号', 'test', 4, 1, '2025-05-07 22:00:20', '2025-05-13 14:17:25', 'ug-developer', 1, NULL, NULL); COMMIT; @@ -475,6 +475,31 @@ BEGIN; INSERT INTO `t_app_convey_check_stand` (`stand_id`, `stand_name`, `plc_id`, `area_id`, `stand_status`, `router`, `read_arrive_address`, `write_task_address`, `remark`) VALUES ('CHECK_1', '复核台1', 1, '-', 1, 1, 'DB300.23', 'DB301.33', 'wu'); COMMIT; +-- ---------------------------- +-- Table structure for t_app_convey_deliver_stand +-- ---------------------------- +DROP TABLE IF EXISTS `t_app_convey_deliver_stand`; +CREATE TABLE `t_app_convey_deliver_stand` ( + `stand_id` varchar(64) NOT NULL COMMENT '站台号', + `stand_name` varchar(64) DEFAULT NULL COMMENT '站台名称', + `plc_id` int NOT NULL COMMENT '管辖的PLC', + `area_id` varchar(64) NOT NULL DEFAULT '-' COMMENT '区域号', + `stand_status` int NOT NULL COMMENT '站台状态', + `router` int NOT NULL DEFAULT '0' COMMENT '路向', + `read_arrive_address` varchar(32) DEFAULT NULL COMMENT '读取到达数据地址', + `write_task_address` varchar(32) DEFAULT NULL COMMENT '写入任务地址', + `remark` varchar(255) DEFAULT NULL COMMENT '备注', + PRIMARY KEY (`stand_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='纯输送线发货站台表'; + +-- ---------------------------- +-- Records of t_app_convey_deliver_stand +-- ---------------------------- +BEGIN; +INSERT INTO `t_app_convey_deliver_stand` (`stand_id`, `stand_name`, `plc_id`, `area_id`, `stand_status`, `router`, `read_arrive_address`, `write_task_address`, `remark`) VALUES ('T1', '发货口1', 1, 'A1', 1, 1, 'DB90.100', 'DB30.45', '无备注0'); +INSERT INTO `t_app_convey_deliver_stand` (`stand_id`, `stand_name`, `plc_id`, `area_id`, `stand_status`, `router`, `read_arrive_address`, `write_task_address`, `remark`) VALUES ('T3', '发货口3', 1, 'A1', 1, 1, 'DB90.100', 'DB30.45', '无备注'); +COMMIT; + -- ---------------------------- -- Table structure for t_app_convey_location -- ---------------------------- @@ -745,7 +770,7 @@ CREATE TABLE `t_app_etag_tag_info` ( -- Records of t_app_etag_tag_info -- ---------------------------- BEGIN; -INSERT INTO `t_app_etag_tag_info` (`tag_name`, `controller_id`, `tag_id`, `tag_type`, `business_type`, `tunnel_no`, `area_id`, `remark`) VALUES ('A1-1', 1, 1, 1, 0, '12', '0003-1', '234'); +INSERT INTO `t_app_etag_tag_info` (`tag_name`, `controller_id`, `tag_id`, `tag_type`, `business_type`, `tunnel_no`, `area_id`, `remark`) VALUES ('A1-1', 1, 1, 1, 1, '12', '0003-1', '234'); INSERT INTO `t_app_etag_tag_info` (`tag_name`, `controller_id`, `tag_id`, `tag_type`, `business_type`, `tunnel_no`, `area_id`, `remark`) VALUES ('A1-10', 1, 10, 1, 0, '', '0003-1', NULL); INSERT INTO `t_app_etag_tag_info` (`tag_name`, `controller_id`, `tag_id`, `tag_type`, `business_type`, `tunnel_no`, `area_id`, `remark`) VALUES ('A1-100', 1, 100, 1, 0, '', '0004-1', NULL); INSERT INTO `t_app_etag_tag_info` (`tag_name`, `controller_id`, `tag_id`, `tag_type`, `business_type`, `tunnel_no`, `area_id`, `remark`) VALUES ('A1-101', 1, 101, 6, 0, '234', 'ADD', NULL); @@ -769,7 +794,7 @@ INSERT INTO `t_app_etag_tag_info` (`tag_name`, `controller_id`, `tag_id`, `tag_t INSERT INTO `t_app_etag_tag_info` (`tag_name`, `controller_id`, `tag_id`, `tag_type`, `business_type`, `tunnel_no`, `area_id`, `remark`) VALUES ('A1-17', 1, 17, 1, 0, '', '0003-1', NULL); INSERT INTO `t_app_etag_tag_info` (`tag_name`, `controller_id`, `tag_id`, `tag_type`, `business_type`, `tunnel_no`, `area_id`, `remark`) VALUES ('A1-18', 1, 18, 1, 0, '', '0003-1', NULL); INSERT INTO `t_app_etag_tag_info` (`tag_name`, `controller_id`, `tag_id`, `tag_type`, `business_type`, `tunnel_no`, `area_id`, `remark`) VALUES ('A1-19', 1, 19, 1, 0, '', '0003-1', NULL); -INSERT INTO `t_app_etag_tag_info` (`tag_name`, `controller_id`, `tag_id`, `tag_type`, `business_type`, `tunnel_no`, `area_id`, `remark`) VALUES ('A1-2', 1, 2, 1, 0, '-', '0003-1', NULL); +INSERT INTO `t_app_etag_tag_info` (`tag_name`, `controller_id`, `tag_id`, `tag_type`, `business_type`, `tunnel_no`, `area_id`, `remark`) VALUES ('A1-2', 1, 2, 1, 2, '---', '0003-1', NULL); INSERT INTO `t_app_etag_tag_info` (`tag_name`, `controller_id`, `tag_id`, `tag_type`, `business_type`, `tunnel_no`, `area_id`, `remark`) VALUES ('A1-20', 1, 20, 1, 0, '', '0003-1', NULL); INSERT INTO `t_app_etag_tag_info` (`tag_name`, `controller_id`, `tag_id`, `tag_type`, `business_type`, `tunnel_no`, `area_id`, `remark`) VALUES ('A1-21', 1, 21, 1, 0, '', '0003-1', NULL); INSERT INTO `t_app_etag_tag_info` (`tag_name`, `controller_id`, `tag_id`, `tag_type`, `business_type`, `tunnel_no`, `area_id`, `remark`) VALUES ('A1-22', 1, 22, 1, 0, '', '0003-1', NULL); @@ -790,7 +815,7 @@ INSERT INTO `t_app_etag_tag_info` (`tag_name`, `controller_id`, `tag_id`, `tag_t INSERT INTO `t_app_etag_tag_info` (`tag_name`, `controller_id`, `tag_id`, `tag_type`, `business_type`, `tunnel_no`, `area_id`, `remark`) VALUES ('A1-37', 1, 37, 1, 0, '', '0004-1', NULL); INSERT INTO `t_app_etag_tag_info` (`tag_name`, `controller_id`, `tag_id`, `tag_type`, `business_type`, `tunnel_no`, `area_id`, `remark`) VALUES ('A1-38', 1, 38, 1, 0, '', '0004-1', NULL); INSERT INTO `t_app_etag_tag_info` (`tag_name`, `controller_id`, `tag_id`, `tag_type`, `business_type`, `tunnel_no`, `area_id`, `remark`) VALUES ('A1-39', 1, 39, 1, 0, '', '0004-1', NULL); -INSERT INTO `t_app_etag_tag_info` (`tag_name`, `controller_id`, `tag_id`, `tag_type`, `business_type`, `tunnel_no`, `area_id`, `remark`) VALUES ('A1-4', 1, 4, 1, 0, '', '0003-1', NULL); +INSERT INTO `t_app_etag_tag_info` (`tag_name`, `controller_id`, `tag_id`, `tag_type`, `business_type`, `tunnel_no`, `area_id`, `remark`) VALUES ('A1-4', 1, 4, 3, 0, '0', '0003-1', NULL); INSERT INTO `t_app_etag_tag_info` (`tag_name`, `controller_id`, `tag_id`, `tag_type`, `business_type`, `tunnel_no`, `area_id`, `remark`) VALUES ('A1-40', 1, 40, 1, 0, '', '0004-1', NULL); INSERT INTO `t_app_etag_tag_info` (`tag_name`, `controller_id`, `tag_id`, `tag_type`, `business_type`, `tunnel_no`, `area_id`, `remark`) VALUES ('A1-41', 1, 41, 1, 0, '', '0004-1', NULL); INSERT INTO `t_app_etag_tag_info` (`tag_name`, `controller_id`, `tag_id`, `tag_type`, `business_type`, `tunnel_no`, `area_id`, `remark`) VALUES ('A1-42', 1, 42, 1, 0, '', '0004-1', NULL); @@ -989,7 +1014,7 @@ CREATE TABLE `t_app_etag_tag_location` ( -- Records of t_app_etag_tag_location -- ---------------------------- BEGIN; -INSERT INTO `t_app_etag_tag_location` (`record_id`, `location`, `tag_name`, `location_type`, `stand`, `remark`) VALUES ('1766470737254010000', '1-102', '2233', 1, '66', '9090'); +INSERT INTO `t_app_etag_tag_location` (`record_id`, `location`, `tag_name`, `location_type`, `stand`, `remark`) VALUES ('1766470737254010000', '1-102', 'A1-1', 1, '66', '9090'); COMMIT; -- ---------------------------- @@ -1024,23 +1049,24 @@ CREATE TABLE `t_app_etag_task` ( -- Records of t_app_etag_task -- ---------------------------- BEGIN; -INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('0000001465', '78412W24122300002', 1, 'SF1649488540362', '78412S230314000006', 'GZ-J2-01-04-03', '3110246', '消毒液1.8L', 6.00, NULL, 1, 0, 'WMS_API', 'WMS', '2024-12-24 14:32:43', NULL, NULL, NULL, NULL, NULL); -INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('0000001466', '78412W24122300002', 1, 'SF1613717093943', '78412S230314000009', 'GZ-J2-01-04-03', '3110246', '消毒液1.8L', 1.00, NULL, 9, 0, 'WMS_API', 'WMS', '2024-12-24 14:32:43', NULL, NULL, NULL, NULL, NULL); -INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('00000gdfgd', '78412W24122300002', 1, 'SF1613717093943', '78412S230314000009', 'GZ-J2-01-04-03', '3110246', '消毒液1.8L', 1.00, NULL, 9, 0, 'WMS_API', 'WMS', '2024-12-24 14:32:43', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('0000001465', '78412W24122300002', 1, 'SF1649488540362', '78412S230314000006', 'GZ-J2-01-04-03', '3110246', '消毒液1.8L', 6.00, NULL, 1, 1, 'WMS_API', 'WMS', '2024-12-24 14:32:43', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('0000001466', '78412W24122300002', 1, 'SF1613717093943', '78412S230314000009', 'GZ-J2-01-04-03', '3110246', '消毒液1.8L', 1.00, NULL, 9, 1, 'WMS_API', 'WMS', '2024-12-24 14:32:43', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('00000gdfgd', '78412W24122300002', 1, 'SF1613717093943', '78412S230314000009', 'GZ-J2-01-04-03', '3110246', '消毒液1.8L', 1.00, NULL, 9, 1, 'WMS_API', 'WMS', '2024-12-24 14:32:43', NULL, NULL, NULL, NULL, NULL); INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('1766646518792010000', '1766646518792010000', 1, 'V0001', '7878', 'L-0101', '555', 'yyy', 1.00, NULL, 1, 1, '', 'dev', '2025-12-25 15:08:39', NULL, NULL, NULL, NULL, '1111'); -INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('fghfghfgh', '011', 1, 'SF3131742242758', '54', 'C1-L2-03', '454321', '123131', 50.00, 50.00, 2, 0, '245', '4545', '2024-12-11 19:35:05', '2024-12-22 16:34:56', '2024-12-22 16:35:40', '192.168.110.223', '2024-12-14 14:24:38', 'QQ'); -INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('srewrwerwer', 'TS00002517', 3, '-', '3205967', 'GZ-J1-01-03-03', '6974214220087', '001 3只', 120.00, NULL, 9, 0, 'WMS', 'WMS_API', '2024-12-25 10:28:05', NULL, NULL, NULL, NULL, NULL); -INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('T00004', '011', 3, 'SF3131742242758', '54', 'B1-L2-04', 'G0001', '一杯水', 500.00, 5002.00, 2, 0, '245', '4545', '2024-12-11 19:35:05', '2024-12-22 16:36:48', '2024-12-22 16:37:02', '192.168.110.222', '2024-12-14 14:24:38', 'QQ'); -INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('T00004dfgdfgdf', '011', 3, 'SF3131742242758', '54', 'B1-L2-04', 'G0001', '一杯水', 500.00, 5002.00, 2, 0, '245', '4545', '2024-12-11 19:35:05', '2024-12-22 16:36:48', '2024-12-22 16:37:02', '192.168.110.222', '2024-12-14 14:24:38', 'QQ'); -INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('T00005', '011', 3, 'SF3131742242758', '54', 'B1-L2-06', 'G0002', '一瓶茶', 500.00, 5002.00, 2, 0, '245', '4545', '2024-12-11 19:35:05', '2024-12-22 16:36:47', '2024-12-22 16:37:09', '192.168.110.222', '2024-12-14 14:24:38', 'QQ'); -INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('T001', '011', 1, 'SF3131742242758', '54', 'C1-L2-03', '454321', '123131', 50.00, 50.00, 2, 0, '245', '4545', '2024-12-11 19:35:05', '2024-12-22 16:34:56', '2024-12-22 16:35:40', '192.168.110.223', '2024-12-14 14:24:38', 'QQ'); -INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('T002', '011', 1, 'SF3131742242758', '54', 'A1-07', '454321', '123131', 400.00, 400.00, 2, 0, '245', '4545', '2024-12-11 19:35:05', '2024-12-22 13:53:23', '2024-12-22 13:53:28', '192.168.110.223', '2024-11-28 19:35:35', 'QQ'); -INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('T003', '011', 1, 'SF3131742242758', '54', 'B1-L2-03', '454321', '123131', 20.00, 20.00, 2, 0, '245', '4545', '2024-12-11 19:35:05', '2024-12-22 16:34:56', '2024-12-22 16:35:49', '192.168.110.222', '2024-12-14 14:24:38', 'QQ'); -INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('T00hfgjgfjjh', '011', 3, 'SF3131742242758', '54', 'B1-L2-06', 'G0002', '一瓶茶', 500.00, 5002.00, 2, 0, '245', '4545', '2024-12-11 19:35:05', '2024-12-22 16:36:47', '2024-12-22 16:37:09', '192.168.110.222', '2024-12-14 14:24:38', 'QQ'); -INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('T0345456456', '011', 1, 'SF3131742242758', '54', 'A1-07', '454321', '123131', 400.00, 400.00, 2, 0, '245', '4545', '2024-12-11 19:35:05', '2024-12-22 13:53:23', '2024-12-22 13:53:28', '192.168.110.223', '2024-11-28 19:35:35', 'QQ'); -INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('Tghjghjghjghj', '011', 1, 'SF3131742242758', '54', 'B1-L2-03', '454321', '123131', 20.00, 20.00, 2, 0, '245', '4545', '2024-12-11 19:35:05', '2024-12-22 16:34:56', '2024-12-22 16:35:49', '192.168.110.222', '2024-12-14 14:24:38', 'QQ'); -INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('TS00002517', 'TS00002517', 3, '-', '3205967', 'GZ-J1-01-03-03', '6974214220087', '001 3只', 120.00, NULL, 9, 0, 'WMS', 'WMS_API', '2024-12-25 10:28:05', NULL, NULL, NULL, NULL, NULL); -INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('w23423423', '78412W24122300002', 1, 'SF1649488540362', '78412S230314000006', 'GZ-J2-01-04-03', '3110246', '消毒液1.8L', 6.00, NULL, 1, 0, 'WMS_API', 'WMS', '2024-12-24 14:32:43', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('1768876802098010000', '1768876802098010000', 1, 'Z0001', NULL, 'A01-00-21', NULL, NULL, 1.00, NULL, 1, 1, '', 'dev', '2026-01-20 10:40:02', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('fghfghfgh', '011', 1, 'SF3131742242758', 'D2290899', 'C1-L2-03', '454321', '测试物料232', 50.00, 8.00, 2, 1, '245', '4545', '2024-12-11 19:35:05', '2024-12-22 16:34:56', '2024-12-22 16:35:40', '192.168.110.223', '2024-12-14 14:24:38', 'QQ'); +INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('srewrwerwer', 'TS00002517', 3, '-', '3205967', 'GZ-J1-01-03-03', '6974214220087', '001 3只', 120.00, NULL, 9, 1, 'WMS', 'WMS_API', '2024-12-25 10:28:05', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('T00004', '011', 3, 'SF3131742242758', 'WMS123456789', 'B1-L2-04', 'G0001', '一杯水', 500.00, 5002.00, 2, 1, '245', '4545', '2024-12-11 19:35:05', '2024-12-22 16:36:48', '2024-12-22 16:37:02', '192.168.110.222', '2024-12-14 14:24:38', 'QQ'); +INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('T00004dfgdfgdf', '011', 3, 'SF3131742242758', '54', 'B1-L2-04', 'G0001', '一杯水', 500.00, 5002.00, 2, 1, '245', '4545', '2024-12-11 19:35:05', '2024-12-22 16:36:48', '2024-12-22 16:37:02', '192.168.110.222', '2024-12-14 14:24:38', 'QQ'); +INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('T00005', '011', 3, 'SF3131742242758', '54', 'B1-L2-06', 'G0002', '一瓶茶', 500.00, 5002.00, 2, 1, '245', '4545', '2024-12-11 19:35:05', '2024-12-22 16:36:47', '2024-12-22 16:37:09', '192.168.110.222', '2024-12-14 14:24:38', 'QQ'); +INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('T001', '011', 1, 'SF3131742242758', '54', 'C1-L2-03', '454321', '123131', 50.00, 50.00, 2, 1, '245', '4545', '2024-12-11 19:35:05', '2024-12-22 16:34:56', '2024-12-22 16:35:40', '192.168.110.223', '2024-12-14 14:24:38', 'QQ'); +INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('T002', '011', 1, 'SF3131742242758', '54', 'A1-07', '454321', '123131', 400.00, 400.00, 2, 1, '245', '4545', '2024-12-11 19:35:05', '2024-12-22 13:53:23', '2024-12-22 13:53:28', '192.168.110.223', '2024-11-28 19:35:35', 'QQ'); +INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('T003', '011', 1, 'SF3131742242758', '54', 'B1-L2-03', '454321', '123131', 20.00, 20.00, 2, 2, '245', '4545', '2024-12-11 19:35:05', '2024-12-22 16:34:56', '2024-12-22 16:35:49', '192.168.110.222', '2024-12-14 14:24:38', 'QQ'); +INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('T00hfgjgfjjh', '011', 3, 'SF3131742242758', '54', 'B1-L2-06', 'G0002', '一瓶茶', 500.00, 5002.00, 2, 2, '245', '4545', '2024-12-11 19:35:05', '2024-12-22 16:36:47', '2024-12-22 16:37:09', '192.168.110.222', '2024-12-14 14:24:38', 'QQ'); +INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('T0345456456', '011', 1, 'SF3131742242758', '54', 'A1-07', '454321', '123131', 400.00, 400.00, 2, 2, '245', '4545', '2024-12-11 19:35:05', '2024-12-22 13:53:23', '2024-12-22 13:53:28', '192.168.110.223', '2024-11-28 19:35:35', 'QQ'); +INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('Tghjghjghjghj', '011', 1, 'SF3131742242758', '54', 'B1-L2-03', '454321', '123131', 20.00, 20.00, 2, 2, '245', '4545', '2024-12-11 19:35:05', '2024-12-22 16:34:56', '2024-12-22 16:35:49', '192.168.110.222', '2024-12-14 14:24:38', 'QQ'); +INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('TS00002517', 'TS00002517', 3, '-', '3205967', 'GZ-J1-01-03-03', '6974214220087', '001 3只', 120.00, NULL, 9, 2, 'WMS', 'WMS_API', '2024-12-25 10:28:05', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_app_etag_task` (`task_id`, `task_group`, `task_type`, `vehicle_no`, `order_id`, `location`, `goods_id`, `goods_name`, `light_num`, `confirm_num`, `task_status`, `light_model`, `task_source`, `create_person`, `create_time`, `light_time`, `confirm_time`, `confirm_person`, `completed_time`, `remark`) VALUES ('w23423423', '78412W24122300002', 1, 'SF1649488540362', '78412S230314000006', 'GZ-J2-01-04-03', '3110246', '消毒液1.8L', 6.00, NULL, 1, 2, 'WMS_API', 'WMS', '2024-12-24 14:32:43', NULL, NULL, NULL, NULL, NULL); COMMIT; -- ---------------------------- @@ -1251,9 +1277,11 @@ CREATE TABLE `t_app_quartz_config` ( -- ---------------------------- BEGIN; INSERT INTO `t_app_quartz_config` (`class_name`, `job_desc`, `status`, `cron`, `create_time`, `update_time`, `remark`) VALUES ('CleanDataJob', '数据清理', 0, '5/2 * * * * ? *', '2025-05-20 09:04:24', '2025-09-03 09:25:11', NULL); +INSERT INTO `t_app_quartz_config` (`class_name`, `job_desc`, `status`, `cron`, `create_time`, `update_time`, `remark`) VALUES ('EtagJob', '电子标签点亮定时任务', 0, '5/1 * * * * ? *', '2026-01-28 09:27:12', '2026-01-28 09:27:12', NULL); INSERT INTO `t_app_quartz_config` (`class_name`, `job_desc`, `status`, `cron`, `create_time`, `update_time`, `remark`) VALUES ('ExecuteStackerTaskJob', '执行堆垛机任务定时任务', 0, '5/1 * * * * ? *', '2025-07-04 13:20:40', '2025-09-03 09:25:28', NULL); INSERT INTO `t_app_quartz_config` (`class_name`, `job_desc`, `status`, `cron`, `create_time`, `update_time`, `remark`) VALUES ('ResolveStockTaskJob', '解析仓库任务', 0, '2/2 * * * * ? *', '2025-09-03 09:25:01', '2025-10-07 15:19:17', NULL); INSERT INTO `t_app_quartz_config` (`class_name`, `job_desc`, `status`, `cron`, `create_time`, `update_time`, `remark`) VALUES ('RetryApiRequestJob', '接口重试定时任务', 0, '5/2 * * * * ? *', '2025-09-16 11:34:41', '2025-09-16 11:34:56', NULL); +INSERT INTO `t_app_quartz_config` (`class_name`, `job_desc`, `status`, `cron`, `create_time`, `update_time`, `remark`) VALUES ('ScannerJob', '扫码器数据读取定时任务', 0, '5/1 * * * * ? *', '2026-01-22 14:58:28', '2026-01-22 14:58:28', NULL); INSERT INTO `t_app_quartz_config` (`class_name`, `job_desc`, `status`, `cron`, `create_time`, `update_time`, `remark`) VALUES ('TestQuartzJob', '测试2', 0, '0/2 * * * * ? *', '2025-05-20 09:05:16', '2025-05-21 08:04:01', '-'); INSERT INTO `t_app_quartz_config` (`class_name`, `job_desc`, `status`, `cron`, `create_time`, `update_time`, `remark`) VALUES ('TrayConveyJob', '托盘线定时任务', 0, '5/2 * * * * ? *', '2025-12-22 17:24:33', '2025-12-22 17:24:39', NULL); COMMIT; @@ -1623,7 +1651,7 @@ INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weigh INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735004533338010000', '0003', 'NoRead', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 09:42:13', 'PLC'); INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735004540313010000', '0003', 'NoRead', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 09:42:20', 'PLC'); INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735004548547010000', '0001', 'NoRead', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 09:42:29', 'PLC'); -INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735004551790010000', 'P1', '', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 09:42:32', 'PLC'); +INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735004551790010000', 'P1', '4456456', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 09:42:32', 'PLC'); INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735004580743010000', '0001', 'NoRead', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 09:43:01', 'PLC'); INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735005002734010000', '0001', 'NoRead', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 09:50:03', 'PLC'); INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735005004728010000', '0003', 'NoRead', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 09:50:05', 'PLC'); @@ -1640,14 +1668,14 @@ INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weigh INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735005148091010000', '0003', 'NoRead', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 09:52:28', 'PLC'); INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735005148091010001', '0003', 'NoRead', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 09:52:28', 'PLC'); INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735006030923010000', 'P1', '', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 10:07:11', 'PLC'); -INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735006460966010000', '0007', '', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 10:14:21', 'PLC'); -INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735006956351010000', '0007', '', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 10:22:36', 'PLC'); -INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735007088814010000', '0007', '', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 10:24:49', 'PLC'); -INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735007164134010000', '0007', '', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 10:26:04', 'PLC'); -INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735008100026010000', '0007', '', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 10:41:40', 'PLC'); -INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735008245941010000', '0007', '', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 10:44:06', 'PLC'); -INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735008887930010000', '0007', '', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 10:54:48', 'PLC'); -INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735013556515010000', '0007', '', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 12:12:37', 'PLC'); +INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735006460966010000', '0007', 'DE348890', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 10:14:21', 'PLC'); +INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735006956351010000', '0007', 'DE348890', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 10:22:36', 'PLC'); +INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735007088814010000', '0007', 'DE348890', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 10:24:49', 'PLC'); +INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735007164134010000', '0007', 'DE348890', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 10:26:04', 'PLC'); +INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735008100026010000', '0007', 'DE348890', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 10:41:40', 'PLC'); +INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735008245941010000', '0007', 'DE348890', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 10:44:06', 'PLC'); +INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735008887930010000', '0007', 'DE348890', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 10:54:48', 'PLC'); +INSERT INTO `t_app_record_scan` (`record_id`, `location`, `code`, `size`, `weight`, `length`, `width`, `height`, `scan_time`, `remark`) VALUES ('1735013556515010000', '0007', 'DE348890', '0', 0.0000, 0.0000, 0.0000, 0.0000, '2024-12-24 12:12:37', 'PLC'); COMMIT; -- ---------------------------- @@ -9481,7 +9509,7 @@ CREATE TABLE `t_app_stock_compose_task` ( -- Records of t_app_stock_compose_task -- ---------------------------- BEGIN; -INSERT INTO `t_app_stock_compose_task` (`task_id`, `task_group`, `upper_task_id`, `task_type`, `origin`, `destination`, `task_status`, `step_status`, `can_cancel`, `priority`, `vehicle_no`, `vehicle_size`, `weight`, `create_time`, `update_time`, `start_time`, `complete_time`, `end_time`, `task_source`, `create_person`, `task_msg`) VALUES ('1759820293397010000', '1759820293397010001', NULL, 2, 'A1-001-02-2', '101', 1, 0, 1, 5, 'T1001', 0, 0.0000, '2025-10-07 14:58:13', '2025-10-07 14:58:13', NULL, NULL, NULL, 'WCS', 'developer', '任务解析完成'); +INSERT INTO `t_app_stock_compose_task` (`task_id`, `task_group`, `upper_task_id`, `task_type`, `origin`, `destination`, `task_status`, `step_status`, `can_cancel`, `priority`, `vehicle_no`, `vehicle_size`, `weight`, `create_time`, `update_time`, `start_time`, `complete_time`, `end_time`, `task_source`, `create_person`, `task_msg`) VALUES ('1759820293397010000', '1759820293397010001', '67889900', 2, 'A1-001-02-2', '101', 1, 0, 1, 5, 'T1001', 0, 0.0000, '2025-10-07 14:58:13', '2025-10-07 14:58:13', NULL, NULL, NULL, 'WCS', 'developer', '任务解析完成'); INSERT INTO `t_app_stock_compose_task` (`task_id`, `task_group`, `upper_task_id`, `task_type`, `origin`, `destination`, `task_status`, `step_status`, `can_cancel`, `priority`, `vehicle_no`, `vehicle_size`, `weight`, `create_time`, `update_time`, `start_time`, `complete_time`, `end_time`, `task_source`, `create_person`, `task_msg`) VALUES ('1759820351955010000', '1759820351955010001', NULL, 1, '203', 'A1-011-02-2', 1, 0, 1, 5, 'T1002', 0, 0.0000, '2025-10-07 14:59:12', '2025-10-07 14:59:12', NULL, NULL, NULL, 'WCS', 'developer', '任务解析完成'); INSERT INTO `t_app_stock_compose_task` (`task_id`, `task_group`, `upper_task_id`, `task_type`, `origin`, `destination`, `task_status`, `step_status`, `can_cancel`, `priority`, `vehicle_no`, `vehicle_size`, `weight`, `create_time`, `update_time`, `start_time`, `complete_time`, `end_time`, `task_source`, `create_person`, `task_msg`) VALUES ('1759821023022010000', '1759821023023010000', NULL, 1, '202', 'A1-012-02-2', 1, 0, 1, 5, 'T1003', 0, 0.0000, '2025-10-07 15:10:23', '2025-10-07 15:10:23', NULL, NULL, NULL, 'WCS', 'developer', '任务解析完成'); COMMIT; @@ -9594,7 +9622,7 @@ CREATE TABLE `t_app_stock_single_task` ( BEGIN; INSERT INTO `t_app_stock_single_task` (`task_id`, `task_group`, `plc_task_id`, `upper_task_id`, `execute_machine`, `task_type`, `origin`, `destination`, `compose_destination`, `task_status`, `can_cancel`, `priority`, `vehicle_no`, `vehicle_no_number`, `vehicle_size`, `weight`, `create_time`, `update_time`, `start_time`, `complete_time`, `end_time`, `task_source`, `create_person`, `task_msg`) VALUES ('1759820294025010000', '1759820293397010001', 100011, NULL, 1, 2, 'A1-001-02-2', '101', '101', 3, 1, 5, 'T1001', 0, 0, 0.0000, '2025-11-01 14:58:14', '2025-10-07 14:58:34', NULL, NULL, NULL, 'WCS', 'developer', NULL); INSERT INTO `t_app_stock_single_task` (`task_id`, `task_group`, `plc_task_id`, `upper_task_id`, `execute_machine`, `task_type`, `origin`, `destination`, `compose_destination`, `task_status`, `can_cancel`, `priority`, `vehicle_no`, `vehicle_no_number`, `vehicle_size`, `weight`, `create_time`, `update_time`, `start_time`, `complete_time`, `end_time`, `task_source`, `create_person`, `task_msg`) VALUES ('1759820352008010000', '1759820351955010001', 100012, NULL, 1, 1, '102', 'A1-011-02-2', 'A1-011-02-2', 3, 1, 5, 'T1002', 0, 0, 0.0000, '2025-11-01 14:59:12', '2025-10-07 14:59:12', NULL, NULL, NULL, 'WCS', 'developer', NULL); -INSERT INTO `t_app_stock_single_task` (`task_id`, `task_group`, `plc_task_id`, `upper_task_id`, `execute_machine`, `task_type`, `origin`, `destination`, `compose_destination`, `task_status`, `can_cancel`, `priority`, `vehicle_no`, `vehicle_no_number`, `vehicle_size`, `weight`, `create_time`, `update_time`, `start_time`, `complete_time`, `end_time`, `task_source`, `create_person`, `task_msg`) VALUES ('1759821024039010000', '1759821023023010000', 100015, NULL, 1, 3, 'A1-011-02-2', 'A1-012-02-2', 'A1-012-02-2', 3, 1, 5, 'T1003', 0, 0, 0.0000, '2025-11-02 15:10:24', '2025-10-07 15:10:24', NULL, NULL, NULL, 'WCS', 'developer', NULL); +INSERT INTO `t_app_stock_single_task` (`task_id`, `task_group`, `plc_task_id`, `upper_task_id`, `execute_machine`, `task_type`, `origin`, `destination`, `compose_destination`, `task_status`, `can_cancel`, `priority`, `vehicle_no`, `vehicle_no_number`, `vehicle_size`, `weight`, `create_time`, `update_time`, `start_time`, `complete_time`, `end_time`, `task_source`, `create_person`, `task_msg`) VALUES ('1759821024039010000', '1759821023023010000', 100142, NULL, 1, 3, 'A1-011-02-2', 'A1-012-02-2', 'A1-012-02-2', 3, 1, 5, 'T1003', 0, 0, 0.0000, '2025-11-02 15:10:24', '2026-01-28 13:14:22', NULL, NULL, NULL, 'WCS', 'developer', NULL); COMMIT; -- ---------------------------- diff --git a/wcs/src/main/java/org/wcs/mapper/AppConveyDeliverStandMapper.java b/wcs/src/main/java/org/wcs/mapper/AppConveyDeliverStandMapper.java new file mode 100644 index 0000000..d278b77 --- /dev/null +++ b/wcs/src/main/java/org/wcs/mapper/AppConveyDeliverStandMapper.java @@ -0,0 +1,12 @@ +package org.wcs.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.wcs.model.po.app.AppConveyDeliverStand; + +/** + * 输送线发货站台表的 Mapper 类 + */ +@Mapper +public interface AppConveyDeliverStandMapper extends BaseMapper { +} diff --git a/wcs/src/main/java/org/wcs/mapper/impl/AppConveyDeliverStandStandDao.java b/wcs/src/main/java/org/wcs/mapper/impl/AppConveyDeliverStandStandDao.java new file mode 100644 index 0000000..ec2f517 --- /dev/null +++ b/wcs/src/main/java/org/wcs/mapper/impl/AppConveyDeliverStandStandDao.java @@ -0,0 +1,131 @@ +package org.wcs.mapper.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.wcs.mapper.AppConveyDeliverStandMapper; +import org.wcs.mapper.intf.AppConveyDeliverStandService; +import org.wcs.model.bo.db.DataBaseActionResult; +import org.wcs.model.bo.tuple.Tuple2; +import org.wcs.model.dto.serve.conveyStand.QueryDeliverStandReq; +import org.wcs.model.po.app.AppConveyDeliverStand; + +import java.util.List; + +/** + * 输送线站台数据访问实现类 + */ +@Service +public class AppConveyDeliverStandStandDao extends ServiceImpl implements AppConveyDeliverStandService { + + /** + * 查询输送线站台 + * @param request 查询参数 + * @param pageSize 每页数量 + * @param pageIndex 页码 + * @return 站台列表 + */ + @Override + public Tuple2> query(QueryDeliverStandReq request, Integer pageSize, Integer pageIndex) { + if(request == null || pageSize == null || pageIndex == null || pageSize <= 0 || pageIndex <= 0) { + return null; + } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(request.getAreaId() != null, AppConveyDeliverStand::getAreaId, request.getAreaId()); + queryWrapper.like(request.getStandId() != null, AppConveyDeliverStand::getStandId, request.getStandId()); + queryWrapper.eq(request.getStandStatus() != null, AppConveyDeliverStand::getStandStatus, request.getStandStatus()); + queryWrapper.orderByAsc(AppConveyDeliverStand::getStandId); + try { + Page page = new Page<>(pageIndex, pageSize); + Page conveyDeliverStandPage = baseMapper.selectPage(page, queryWrapper); + return new Tuple2<>(conveyDeliverStandPage.getTotal(), conveyDeliverStandPage.getRecords()); + } catch (Exception e) { + return null; + } + } + + /** + * 根据站台ID查询 + * @param standId 站台ID + * @return 站台列表 + */ + @Override + public List queryByStandId(String standId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(AppConveyDeliverStand::getStandId, standId); + queryWrapper.orderByAsc(AppConveyDeliverStand::getStandId); + try { + return super.list(queryWrapper); + } catch (Exception e) { + return null; + } + } + + /** + * 添加数据 + * @param appConveyDeliverStand 添加参数 + * @return 添加结果 + */ + @Override + public DataBaseActionResult insert(AppConveyDeliverStand appConveyDeliverStand) { + if(appConveyDeliverStand == null) { + return new DataBaseActionResult<>(0, new Exception("参数错误")); + } + try { + int insert = baseMapper.insert(appConveyDeliverStand); + return new DataBaseActionResult<>(insert); + } catch (Exception e) { + return new DataBaseActionResult<>(0, e); + } + } + + /** + * 修改数据 + * @param appConveyDeliverStand 修改参数 + * @return 修改结果 + */ + @Override + public DataBaseActionResult update(AppConveyDeliverStand appConveyDeliverStand) { + if(appConveyDeliverStand == null) { + return new DataBaseActionResult<>(0, new Exception("参数错误")); + } + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(AppConveyDeliverStand::getStandId, appConveyDeliverStand.getStandId()); + updateWrapper.set(AppConveyDeliverStand::getAreaId, appConveyDeliverStand.getAreaId()) + .set(AppConveyDeliverStand::getStandName, appConveyDeliverStand.getStandName()) + .set(AppConveyDeliverStand::getPlcId, appConveyDeliverStand.getPlcId()) + .set(AppConveyDeliverStand::getStandStatus, appConveyDeliverStand.getStandStatus()) + .set(AppConveyDeliverStand::getRouter, appConveyDeliverStand.getRouter()) + .set(AppConveyDeliverStand::getReadArriveAddress, appConveyDeliverStand.getReadArriveAddress()) + .set(AppConveyDeliverStand::getWriteTaskAddress, appConveyDeliverStand.getWriteTaskAddress()) + .set(AppConveyDeliverStand::getRemark, appConveyDeliverStand.getRemark()); + try { + int update = baseMapper.update(appConveyDeliverStand, updateWrapper); + return new DataBaseActionResult<>(update); + } catch (Exception e) { + return new DataBaseActionResult<>(0, e); + } + } + + /** + * 删除数据 + * @param standId 站台ID + * @return 删除结果 + */ + @Override + public DataBaseActionResult delete(String standId) { + if(standId == null) { + return new DataBaseActionResult<>(0, new Exception("参数错误")); + } + try { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(AppConveyDeliverStand::getStandId, standId); + int delete = baseMapper.delete(queryWrapper); + return new DataBaseActionResult<>(delete); + } catch (Exception e) { + return new DataBaseActionResult<>(0, e); + } + } +} diff --git a/wcs/src/main/java/org/wcs/mapper/intf/AppConveyDeliverStandService.java b/wcs/src/main/java/org/wcs/mapper/intf/AppConveyDeliverStandService.java new file mode 100644 index 0000000..ba6704a --- /dev/null +++ b/wcs/src/main/java/org/wcs/mapper/intf/AppConveyDeliverStandService.java @@ -0,0 +1,21 @@ +package org.wcs.mapper.intf; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.wcs.model.bo.db.DataBaseActionResult; +import org.wcs.model.bo.tuple.Tuple2; +import org.wcs.model.dto.serve.conveyStand.QueryDeliverStandReq; +import org.wcs.model.po.app.AppConveyDeliverStand; + +import java.util.List; + +/** + * 输送线站台表服务接口 + */ +public interface AppConveyDeliverStandService extends IService { + + Tuple2> query(QueryDeliverStandReq request, Integer pageSize, Integer pageIndex); // 查询 + List queryByStandId(String standId); // 根据站台ID查询 + DataBaseActionResult insert(AppConveyDeliverStand appConveyDeliverStand); // 添加输送机发货站台 + DataBaseActionResult update(AppConveyDeliverStand appConveyDeliverStand); // 修改站台信息 + DataBaseActionResult delete(String standId); // 删除一个站台 +} diff --git a/wcs/src/main/java/org/wcs/model/dto/serve/conveyStand/AddConveyDeliverStandReq.java b/wcs/src/main/java/org/wcs/model/dto/serve/conveyStand/AddConveyDeliverStandReq.java new file mode 100644 index 0000000..657040d --- /dev/null +++ b/wcs/src/main/java/org/wcs/model/dto/serve/conveyStand/AddConveyDeliverStandReq.java @@ -0,0 +1,74 @@ +package org.wcs.model.dto.serve.conveyStand; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class AddConveyDeliverStandReq { + + /** + * 站台ID + */ + @NotBlank(message = "站台ID不能为空") + @JsonProperty("standId") + private String standId; + + /** + * 站台名称 + */ + @NotBlank(message = "站台名称不能为空") + @JsonProperty("standName") + private String standName; + + /** + * PLC编号 + */ + @NotNull(message = "PLC编号不能为空") + @JsonProperty("plcId") + private Integer plcId; + + /** + * 区域ID + */ + @NotBlank(message = "区域ID不能为空") + @JsonProperty("areaId") + private String areaId; + + /** + * 站台状态 + */ + @NotNull(message = "站台状态不能为空") + @JsonProperty("standStatus") + private Integer standStatus; + + /** + * 路由 + */ + @NotNull(message = "路由不能为空") + @JsonProperty("router") + private Integer router; + + /** + * 读取到达站台地址 + */ + @JsonProperty("readArriveAddress") + private String readArriveAddress; + + /** + * 写任务地址 + */ + @JsonProperty("writeTaskAddress") + private String writeTaskAddress; + + /** + * 站台描述 + */ + @JsonProperty("remark") + private String remark; + + +} diff --git a/wcs/src/main/java/org/wcs/model/dto/serve/conveyStand/QueryDeliverStandReq.java b/wcs/src/main/java/org/wcs/model/dto/serve/conveyStand/QueryDeliverStandReq.java new file mode 100644 index 0000000..3d11618 --- /dev/null +++ b/wcs/src/main/java/org/wcs/model/dto/serve/conveyStand/QueryDeliverStandReq.java @@ -0,0 +1,31 @@ +package org.wcs.model.dto.serve.conveyStand; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Getter; +import lombok.Setter; + +/** + * 查询发货站台参数 + */ +@Setter +@Getter +public class QueryDeliverStandReq { + + /** + * 站台ID + */ + @JsonProperty("standId") + private String standId; + + /** + * 区域号 + */ + @JsonProperty("areaId") + private String areaId; + + /** + * 站台状态 + */ + @JsonProperty("standStatus") + private Integer standStatus; +} diff --git a/wcs/src/main/java/org/wcs/model/dto/serve/conveyStand/UpdateConveyDeliverStandReq.java b/wcs/src/main/java/org/wcs/model/dto/serve/conveyStand/UpdateConveyDeliverStandReq.java new file mode 100644 index 0000000..5c0eafa --- /dev/null +++ b/wcs/src/main/java/org/wcs/model/dto/serve/conveyStand/UpdateConveyDeliverStandReq.java @@ -0,0 +1,72 @@ +package org.wcs.model.dto.serve.conveyStand; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class UpdateConveyDeliverStandReq { + + /** + * 站台ID + */ + @NotBlank(message = "站台ID不能为空") + @JsonProperty("standId") + private String standId; + + /** + * 站台名称 + */ + @NotBlank(message = "站台名称不能为空") + @JsonProperty("standName") + private String standName; + + /** + * PLC编号 + */ + @NotNull(message = "PLC编号不能为空") + @JsonProperty("plcId") + private Integer plcId; + + /** + * 区域ID + */ + @NotBlank(message = "区域ID不能为空") + @JsonProperty("areaId") + private String areaId; + + /** + * 站台状态 + */ + @NotNull(message = "站台状态不能为空") + @JsonProperty("standStatus") + private Integer standStatus; + + /** + * 路由 + */ + @NotNull(message = "路由不能为空") + @JsonProperty("router") + private Integer router; + + /** + * 读取到达站台地址 + */ + @JsonProperty("readArriveAddress") + private String readArriveAddress; + + /** + * 写任务地址 + */ + @JsonProperty("writeTaskAddress") + private String writeTaskAddress; + + /** + * 站台描述 + */ + @JsonProperty("remark") + private String remark; +} diff --git a/wcs/src/main/java/org/wcs/model/po/app/AppConveyDeliverStand.java b/wcs/src/main/java/org/wcs/model/po/app/AppConveyDeliverStand.java new file mode 100644 index 0000000..4754e2f --- /dev/null +++ b/wcs/src/main/java/org/wcs/model/po/app/AppConveyDeliverStand.java @@ -0,0 +1,70 @@ +package org.wcs.model.po.app; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; + +/** + * 输送线发货站台 + */ +@Getter +@Setter +@TableName("t_app_convey_deliver_stand") +public class AppConveyDeliverStand { + + /** + * 站台编号 + */ + @TableId(value = "stand_id") + private String standId; + + /** + * 站台名称 + */ + @TableField(value = "stand_name") + private String standName; + + /** + * 管辖的PLC编号 + */ + @TableField(value = "plc_id") + private Integer plcId; + + /** + * 站台所属区域编号 + */ + @TableField(value = "area_id") + private String areaId; + + /** + * 站台状态 + */ + @TableField(value = "stand_status") + private Integer standStatus; + + /** + * 站台路由 + */ + @TableField(value = "router") + private Integer router; + + /** + * 站台读取任务到达地址 + */ + @TableField(value = "read_arrive_address") + private String readArriveAddress; + + /** + * 站台写入任务地址 + */ + @TableField(value = "write_task_address") + private String writeTaskAddress; + + /** + * 站台描述 + */ + @TableField(value = "remark") + private String remark; +} diff --git a/wcs/src/main/java/org/wcs/model/vo/serve/conveyStand/ConveyDeliverStandVo.java b/wcs/src/main/java/org/wcs/model/vo/serve/conveyStand/ConveyDeliverStandVo.java new file mode 100644 index 0000000..5a419d6 --- /dev/null +++ b/wcs/src/main/java/org/wcs/model/vo/serve/conveyStand/ConveyDeliverStandVo.java @@ -0,0 +1,67 @@ +package org.wcs.model.vo.serve.conveyStand; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Getter; +import lombok.Setter; + +/** + * 输送线发货站台信息 + */ +@Getter +@Setter +public class ConveyDeliverStandVo { + + /** + * 站台编号 + */ + @JsonProperty(value = "standId") + private String standId; + + /** + * 站台名称 + */ + @JsonProperty(value = "standName") + private String standName; + + /** + * 管辖的PLC编号 + */ + @JsonProperty(value = "plcId") + private Integer plcId; + + /** + * 站台所属区域编号 + */ + @JsonProperty(value = "areaId") + private String areaId; + + /** + * 站台状态 + */ + @JsonProperty(value = "standStatus") + private Integer standStatus; + + /** + * 站台路由 + */ + @JsonProperty(value = "router") + private Integer router; + + /** + * 站台读取任务到达地址 + */ + @JsonProperty(value = "readArriveAddress") + private String readArriveAddress; + + /** + * 站台写入任务地址 + */ + @JsonProperty(value = "writeTaskAddress") + private String writeTaskAddress; + + /** + * 站台描述 + */ + @JsonProperty(value = "remark") + private String remark; +} diff --git a/wcs/src/main/java/org/wcs/serve/controller/app/ConveyStandController.java b/wcs/src/main/java/org/wcs/serve/controller/app/ConveyStandController.java index 850e91a..bd78b44 100644 --- a/wcs/src/main/java/org/wcs/serve/controller/app/ConveyStandController.java +++ b/wcs/src/main/java/org/wcs/serve/controller/app/ConveyStandController.java @@ -9,6 +9,7 @@ import org.wcs.model.vo.serve.AppServeDataResponse; import org.wcs.model.vo.serve.AppServeResponse; import org.wcs.model.vo.serve.common.PageDataResponse; import org.wcs.model.vo.serve.conveyStand.ConveyCheckStandVo; +import org.wcs.model.vo.serve.conveyStand.ConveyDeliverStandVo; import org.wcs.model.vo.serve.conveyStand.ConveyPickStandVo; import org.wcs.serve.service.intf.IConveyStandService; @@ -108,5 +109,45 @@ public class ConveyStandController { return conveyStandService.updateConveyCheckStand(request); } + /** + * 查询输送线发货站台 + * @param request 添加参数 + * @return 添加结果 + */ + @PostMapping("queryDeliverStand") + public AppServeDataResponse> queryDeliverStand(@RequestBody QueryDeliverStandReq request, @RequestParam("pageSize") Integer pageSize, @RequestParam("pageIndex") Integer pageIndex) { + return conveyStandService.queryDeliverStand(request, pageSize, pageIndex); + } + + /** + * 添加输送线发货站台 + * @param request 添加参数 + * @return 添加结果 + */ + @PostMapping("addConveyDeliverStand") + public AppServeResponse addConveyDeliverStand(@RequestBody @Validated AddConveyDeliverStandReq request) { + return conveyStandService.addConveyDeliverStand(request); + } + + /** + * 删除输送线发货站台 + * @param standId 站台ID + * @return 删除结果 + */ + @DeleteMapping("deleteConveyDeliverStand") + public AppServeResponse deleteConveyDeliverStand(@RequestParam("standId") @NotBlank(message = "站台ID不能为空") String standId) { + return conveyStandService.deleteConveyDeliverStand(standId); + } + + /** + * 修改输送线发货站台 + * @param request 添加参数 + * @return 添加结果 + */ + @PostMapping("updateConveyDeliverStand") + public AppServeResponse updateConveyDeliverStand(@RequestBody @Validated UpdateConveyDeliverStandReq request) { + return conveyStandService.updateConveyDeliverStand(request); + } + } diff --git a/wcs/src/main/java/org/wcs/serve/service/impl/ConveyStandService.java b/wcs/src/main/java/org/wcs/serve/service/impl/ConveyStandService.java index b09d2af..801f56d 100644 --- a/wcs/src/main/java/org/wcs/serve/service/impl/ConveyStandService.java +++ b/wcs/src/main/java/org/wcs/serve/service/impl/ConveyStandService.java @@ -4,15 +4,18 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.wcs.factory.AppServeResponseFactory; import org.wcs.mapper.intf.AppConveyCheckStandService; +import org.wcs.mapper.intf.AppConveyDeliverStandService; import org.wcs.mapper.intf.AppConveyPickStandService; import org.wcs.model.bo.tuple.Tuple2; import org.wcs.model.dto.serve.conveyStand.*; import org.wcs.model.po.app.AppConveyCheckStand; +import org.wcs.model.po.app.AppConveyDeliverStand; import org.wcs.model.po.app.AppConveyPickStand; import org.wcs.model.vo.serve.AppServeDataResponse; import org.wcs.model.vo.serve.AppServeResponse; import org.wcs.model.vo.serve.common.PageDataResponse; import org.wcs.model.vo.serve.conveyStand.ConveyCheckStandVo; +import org.wcs.model.vo.serve.conveyStand.ConveyDeliverStandVo; import org.wcs.model.vo.serve.conveyStand.ConveyPickStandVo; import org.wcs.serve.service.intf.IConveyStandService; import org.wcs.utils.AppBeanUtils; @@ -29,6 +32,7 @@ public class ConveyStandService implements IConveyStandService { private final AppConveyPickStandService conveyPickStandService; // 捡选站台操作类 private final AppConveyCheckStandService conveyCheckStandService; // 复核站台操作类 + private final AppConveyDeliverStandService conveyDeliverStandService; // 发货站台操作类 /** * 查询捡货站台 @@ -210,4 +214,98 @@ public class ConveyStandService implements IConveyStandService { } return AppServeResponseFactory.success(); } + + /** + * 获取发货站台 + * @param request 获取参数 + * @param pageSize 每页数量 + * @param pageIndex 页码 + * @return 站台列表 + */ + @Override + public AppServeDataResponse> queryDeliverStand(QueryDeliverStandReq request, Integer pageSize, Integer pageIndex) { + Tuple2> queryResult = conveyDeliverStandService.query(request, pageSize, pageIndex); + if(queryResult == null) { + return AppServeResponseFactory.fail("数据服务异常", null); + } + List conveyDeliverStandVos = AppBeanUtils.copyListProperties(queryResult.getItem2(), ConveyDeliverStandVo::new); + PageDataResponse response = new PageDataResponse<>(); + response.setPageIndex(pageIndex); + response.setPageSize(pageSize); + response.setTotalCount(queryResult.getItem1()); + response.setData(conveyDeliverStandVos); + return AppServeResponseFactory.success(response); + } + + /** + * 添加发货站台 + * @param request 添加参数 + * @return 添加结果 + */ + @Override + public AppServeResponse addConveyDeliverStand(AddConveyDeliverStandReq request) { + List conveyDeliverStands = conveyDeliverStandService.queryByStandId(request.getStandId()); + if(conveyDeliverStands == null) { + return AppServeResponseFactory.fail("数据服务异常"); + } + if(!conveyDeliverStands.isEmpty()) { + return AppServeResponseFactory.fail("站台已存在"); + } + AppConveyDeliverStand newDeliverStand = new AppConveyDeliverStand(); + AppBeanUtils.copyProperties(request, newDeliverStand); + Integer result = conveyDeliverStandService.insert(newDeliverStand).result(); + if(result <= 0) { + return AppServeResponseFactory.fail("添加失败，数据服务异常"); + } + return AppServeResponseFactory.success(); + } + + /** + * 删除发货站台 + * @param standId 站台号 + * @return 操作结果 + */ + @Override + public AppServeResponse deleteConveyDeliverStand(String standId) { + List conveyDeliverStands = conveyDeliverStandService.queryByStandId(standId); + if(conveyDeliverStands == null) { + return AppServeResponseFactory.fail("数据服务异常"); + } + if(conveyDeliverStands.isEmpty()) { + return AppServeResponseFactory.fail("站台不存在"); + } + Integer result = conveyDeliverStandService.delete(standId).result(); + if(result <= 0) { + return AppServeResponseFactory.fail("数据服务异常", null); + } + return AppServeResponseFactory.success(); + } + + /** + * 更新发货站台信息 + * @param request 要更新的数据 + * @return 操作结果 + */ + @Override + public AppServeResponse updateConveyDeliverStand(UpdateConveyDeliverStandReq request) { + List conveyDeliverStands = conveyDeliverStandService.queryByStandId(request.getStandId()); + if(conveyDeliverStands == null) { + return AppServeResponseFactory.fail("数据服务异常"); + } + if(conveyDeliverStands.isEmpty()) { + return AppServeResponseFactory.fail("站台不存在"); + } + AppConveyDeliverStand conveyDeliverStand = new AppConveyDeliverStand(); + conveyDeliverStand.setStandId(request.getStandId()); + conveyDeliverStand.setStandName(request.getStandName()); + conveyDeliverStand.setPlcId(request.getPlcId()); + conveyDeliverStand.setAreaId(request.getAreaId()); + conveyDeliverStand.setStandStatus(request.getStandStatus()); + conveyDeliverStand.setRouter(request.getRouter()); + conveyDeliverStand.setReadArriveAddress(request.getReadArriveAddress()); + conveyDeliverStand.setWriteTaskAddress(request.getWriteTaskAddress()); + conveyDeliverStand.setRemark(request.getRemark()); + Integer result = conveyDeliverStandService.update(conveyDeliverStand).result(); + return result > 0 ? AppServeResponseFactory.success() : AppServeResponseFactory.fail("数据服务异常"); + } } diff --git a/wcs/src/main/java/org/wcs/serve/service/intf/IConveyStandService.java b/wcs/src/main/java/org/wcs/serve/service/intf/IConveyStandService.java index 5ccb8b4..b37e753 100644 --- a/wcs/src/main/java/org/wcs/serve/service/intf/IConveyStandService.java +++ b/wcs/src/main/java/org/wcs/serve/service/intf/IConveyStandService.java @@ -5,6 +5,7 @@ import org.wcs.model.vo.serve.AppServeDataResponse; import org.wcs.model.vo.serve.AppServeResponse; import org.wcs.model.vo.serve.common.PageDataResponse; import org.wcs.model.vo.serve.conveyStand.ConveyCheckStandVo; +import org.wcs.model.vo.serve.conveyStand.ConveyDeliverStandVo; import org.wcs.model.vo.serve.conveyStand.ConveyPickStandVo; public interface IConveyStandService { @@ -19,4 +20,9 @@ public interface IConveyStandService { AppServeResponse addConveyCheckStand(AddConveyCheckStandReq request); AppServeResponse deleteConveyCheckStand(String standId); AppServeResponse updateConveyCheckStand(UpdateConveyCheckStandReq request); + /* 输送线发货站台 */ + AppServeDataResponse> queryDeliverStand(QueryDeliverStandReq request, Integer pageSize, Integer pageIndex); // 查询发货站台 + AppServeResponse addConveyDeliverStand(AddConveyDeliverStandReq request); // 添加发货站台 + AppServeResponse deleteConveyDeliverStand(String standId); // 删除发货站台 + AppServeResponse updateConveyDeliverStand(UpdateConveyDeliverStandReq request); // 修改发货站台 } diff --git a/wcs_web/src/api/conveyStand.ts b/wcs_web/src/api/conveyStand.ts index f1749a7..f6206ea 100644 --- a/wcs_web/src/api/conveyStand.ts +++ b/wcs_web/src/api/conveyStand.ts @@ -2,6 +2,9 @@ import type {IConveyPickStandSearch} from "@/interface/page/convey/IConveyPickSt import axiosInstance from "@/api/axios.ts"; import type {IAppConveyPickStand} from "@/model/table/IAppConveyPickStand.ts"; import type {IConveyCheckStandSearch} from "@/interface/page/convey/IConveyCheckStandSearch.ts"; +import type {IConveyDeliverStandSearch} from "@/interface/page/convey/IConveyDeliverStandSearch.ts"; +import type {IAppConveyDeliverStand} from "@/model/table/IAppConveyDeliverStand.ts"; +import type {IAppConveyCheckStand} from "@/model/table/IAppConveyCheckStand.ts"; export default class ConveyStandApi { @@ -50,7 +53,7 @@ export default class ConveyStandApi { * 添加复核站台数据 * @param params */ - static addCheckStand(params: IAppConveyPickStand): Promise { + static addCheckStand(params: IAppConveyCheckStand): Promise { return axiosInstance.post('/app/conveyStand/addConveyCheckStand', params); }; @@ -70,11 +73,55 @@ export default class ConveyStandApi { * 修改复核站台信息 * @param params */ - static updateCheckStand(params: IAppConveyPickStand): Promise { + static updateCheckStand(params: IAppConveyCheckStand): Promise { return axiosInstance.post('/app/conveyStand/updateConveyCheckStand', params); }; + /** + * 分页查询发货站台信息 + * @param params + * @param pageSize + * @param pageIndex + */ + static queryDeliverStand(params: IConveyDeliverStandSearch, pageSize: number, pageIndex: number): Promise { + return axiosInstance.post('/app/conveyStand/queryDeliverStand', params, { + params: { + pageSize: pageSize, + pageIndex: pageIndex + } + }); + }; + + /** + * 添加发货站台数据 + * @param params + */ + static addDeliverStand(params: IAppConveyDeliverStand): Promise { + return axiosInstance.post('/app/conveyStand/addConveyDeliverStand', params); + }; + + /** + * 删除发货站台 + * @param standId + */ + static deleteDeliverStand(standId: string): Promise { + return axiosInstance.delete('/app/conveyStand/deleteConveyDeliverStand', { + params: { + standId: standId + } + }); + }; + + /** + * 修改发货站台信息 + * @param params + */ + static updateDeliverStand(params: IAppConveyDeliverStand): Promise { + return axiosInstance.post('/app/conveyStand/updateConveyDeliverStand', params); + }; + + } \ No newline at end of file diff --git a/wcs_web/src/components/page/conveyStand/AddDeliverStand.vue b/wcs_web/src/components/page/conveyStand/AddDeliverStand.vue new file mode 100644 index 0000000..1396aa6 --- /dev/null +++ b/wcs_web/src/components/page/conveyStand/AddDeliverStand.vue @@ -0,0 +1,96 @@ + + + + + \ No newline at end of file diff --git a/wcs_web/src/components/page/conveyStand/DeliverStandDetail.vue b/wcs_web/src/components/page/conveyStand/DeliverStandDetail.vue new file mode 100644 index 0000000..78118e7 --- /dev/null +++ b/wcs_web/src/components/page/conveyStand/DeliverStandDetail.vue @@ -0,0 +1,113 @@ + + + + + \ No newline at end of file diff --git a/wcs_web/src/interface/page/convey/IConveyDeliverStandSearch.ts b/wcs_web/src/interface/page/convey/IConveyDeliverStandSearch.ts new file mode 100644 index 0000000..acd7b77 --- /dev/null +++ b/wcs_web/src/interface/page/convey/IConveyDeliverStandSearch.ts @@ -0,0 +1,8 @@ +/** + * 输送线发货站台查询参数 + */ +export interface IConveyDeliverStandSearch { + standId? : string; + areaId? : string; + standStatus?: number; +} \ No newline at end of file diff --git a/wcs_web/src/model/table/IAppConveyDeliverStand.ts b/wcs_web/src/model/table/IAppConveyDeliverStand.ts new file mode 100644 index 0000000..a46e7b6 --- /dev/null +++ b/wcs_web/src/model/table/IAppConveyDeliverStand.ts @@ -0,0 +1,14 @@ +/** + * 发货站台表格数据 + */ +export interface IAppConveyDeliverStand { + standId?: string; + standName?: string; + plcId?: number; + standStatus?: number; + areaId?: string; + router?: number; + readArriveAddress?: string; + writeTaskAddress?: string; + remark?: string; +} \ No newline at end of file diff --git a/wcs_web/src/router/index.ts b/wcs_web/src/router/index.ts index a4559f8..2c043be 100644 --- a/wcs_web/src/router/index.ts +++ b/wcs_web/src/router/index.ts @@ -41,6 +41,7 @@ const router = createRouter({ { path: 'conveyTaskBak', name: 'conveyTaskBak', component: () => import('@/views/tabs/ConveyTaskBak.vue') }, { path: 'conveyPickStand', name: 'conveyPickStand', component: () => import('@/views/tabs/ConveyPickStand.vue')}, { path: 'conveyCheckStand', name: 'conveyCheckStand', component: () => import('@/views/tabs/ConveyCheckStand.vue')}, + { path: 'conveyDeliverStand', name: 'conveyDeliverStand', component: () => import('@/views/tabs/ConveyDeliverStand.vue')}, { path: 'baseError', name: 'baseError', component: () => import('@/views/tabs/ErrorBase.vue')}, { path: 'equipmentError', name: 'equipmentError', component: () => import('@/views/tabs/RecordEquipmentError.vue')}, { path: 'ledManage', name: 'ledManage', component: () => import('@/views/tabs/LedBaseManage.vue')}, diff --git a/wcs_web/src/views/tabs/ConveyDeliverStand.vue b/wcs_web/src/views/tabs/ConveyDeliverStand.vue new file mode 100644 index 0000000..396a144 --- /dev/null +++ b/wcs_web/src/views/tabs/ConveyDeliverStand.vue @@ -0,0 +1,146 @@ + + + + + \ No newline at end of file