Commit Graph

182 Commits

Author SHA1 Message Date
yanps
4742236a7c add: 创建任务添加扩展字段 2024-01-15 19:40:03 +08:00
5b483c6936 rev:task 2024-01-15 19:14:06 +08:00
4ea2e8c245 rev:合并 2024-01-15 17:26:56 +08:00
eb98aabcac Revert "add:车间"
This reverts commit f2ad3bf346.
2024-01-15 17:18:37 +08:00
f328dbcb73 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_two 2024-01-15 17:17:56 +08:00
f2ad3bf346 add:车间 2024-01-15 17:17:02 +08:00
8addf6e707 rev:任务 2024-01-15 17:16:58 +08:00
2c69607cda add: 木箱入库、装箱入库、空木箱出库驱动开发(后端) 2024-01-12 18:03:07 +08:00
486cea7de8 rev:堆叠机双向点位平均分配原则 2024-01-11 19:39:40 +08:00
db4d0db124 rev:平均分配页面显示问题 2024-01-10 18:16:16 +08:00
f928a093db Merge remote-tracking branch 'origin/master' 2024-01-10 17:46:54 +08:00
480a96a3d1 add: 一楼驱动开发(后端) 2024-01-10 17:46:35 +08:00
eb1fae7313 rev:修复无路由路线时取消任务索引越界 2024-01-10 14:09:41 +08:00
a9d36024bb rev:更新 2024-01-10 12:34:46 +08:00
80c0cf6d46 rev:lucene路径 2024-01-10 12:31:57 +08:00
2e22fbee6e rev:lucene 2024-01-10 12:28:55 +08:00
ce6f38597c add:添加驱动 2024-01-09 13:19:16 +08:00
7ef90eb8e6 add: 驱动添加(后端)and mybatisplus转换问题 2024-01-08 18:07:02 +08:00
06987b24b8 rev:修改路由路线更新设备类型 2024-01-08 08:48:25 +08:00
15eb0cb560 add:监控页面堆垛机设置及路由设备类型 2024-01-05 18:15:28 +08:00
3579c35983 rev:更新package版本 2024-01-05 13:51:21 +08:00
fe6c081c87 rev:解决项目启动opc或plc数据源不存在及驱动配置报错 2024-01-05 11:08:46 +08:00
ad27f45e62 rev:更新 2024-01-04 20:29:43 +08:00
716e13d8c3 fix 2024-01-03 08:52:22 +08:00
278a7bca69 add:新增驱动 2024-01-02 18:18:58 +08:00
624f7284f9 add:驱动前端 2024-01-02 18:01:23 +08:00
4e8a91e58d add: 驱动添加(后端) 2024-01-02 16:07:19 +08:00
40fece7656 fix 2024-01-02 12:11:26 +08:00
5342b5a657 fix 2024-01-02 09:34:23 +08:00
f150c02aa9 add:新增标准版行架机械手驱动 2023-12-28 14:11:07 +08:00
b633c1390d rev:更新 2023-12-20 16:29:47 +08:00
USER-20220102CG\noblelift
b7fd69ef1e rev 更新 2023-12-17 11:39:10 +08:00
ec18529ec3 Merge remote-tracking branch 'origin/master' 2023-12-14 18:00:17 +08:00
97a28a226c fix: 关联站点驱动测试、双工位堆垛机驱动测试 2023-12-14 17:59:57 +08:00
yanps
870f926fc6 opt: 优化首页国际化实现,并优化前端项目 2023-12-14 14:58:26 +08:00
d5f9fc472b rev:界面优化和新增点位角度 2023-12-14 14:23:50 +08:00
053751c58f fix:优化界面、完成国际化剩余部分开发 2023-12-08 17:25:33 +08:00
d06fcdbe0e add: 关联站点开发 2023-12-08 17:13:46 +08:00
d27528644e Merge branch 'lzhl_tow_acs_ls' 2023-12-08 15:37:12 +08:00
50378dedbf add:双工位输送线开发 2023-12-08 15:36:06 +08:00
557e8de75c Merge remote-tracking branch 'origin/master' 2023-12-08 14:26:56 +08:00
3da0816d90 fix: 规约修改over 2023-12-08 14:26:29 +08:00
yanps
535f241642 fix: device_driver 2023-12-08 14:22:13 +08:00
yanps
322f8c5d4f add: 定时删除设备报警记录中超十五天 2023-12-08 14:06:53 +08:00
e5588a2288 Merge remote-tracking branch 'origin/master' 2023-12-08 13:53:40 +08:00
db3cc16658 fix: 规约修改 2023-12-08 13:52:33 +08:00
yanps
e1bf2f026c opt: 优化设备报警记录页面,并且实现国际化 2023-12-08 09:04:57 +08:00
936d17a437 fix: 注释修改2 2023-12-07 18:11:29 +08:00
346214e11e fix: 注释修改 2023-12-07 17:50:07 +08:00
b74f79fd53 Merge remote-tracking branch 'origin/master' 2023-12-07 15:56:46 +08:00