Commit Graph

2288 Commits

Author SHA1 Message Date
9aed674e23 add:发货任务 2024-02-18 14:01:55 +08:00
b1aa7e47ee Merge remote-tracking branch 'origin/master' 2024-02-18 13:41:58 +08:00
b038808898 add :登入粒子效果 2024-02-18 13:41:31 +08:00
3de65d80fa rev:优化agv任务下发 2024-02-18 13:34:11 +08:00
b2a578ffd5 add:捆扎任务 2024-02-06 18:01:46 +08:00
yanps
160cbd506a opt: 优化 2024-02-04 18:00:15 +08:00
yanps
95c0ce68a7 fix: 修复系统参数分页问题 2024-02-04 15:48:38 +08:00
yanps
74ca7e58ef opt: 优化流量限制功能 2024-02-04 14:12:51 +08:00
6cf6ee8f06 opt:增加点位库存表启用状态过滤查询 2024-02-02 17:01:49 +08:00
4927838346 Merge remote-tracking branch 'origin/b_lms' into b_lms 2024-02-02 16:58:49 +08:00
91df60b647 opt:增加点位库存表启用状态过滤查询 2024-02-02 16:58:33 +08:00
yanps
bd2b3057ba add: 添加自动清理任务和指令,优化操作日志 2024-02-02 16:56:42 +08:00
USER-20220102CG\noblelift
e2cfc536bb rev 去除loki 2024-02-02 16:32:30 +08:00
ludj
709d15f977 rev:移除多余代码 2024-02-02 15:55:00 +08:00
ludj
a85c88139b rev:移除多余包 2024-02-02 15:41:34 +08:00
01b8f43084 add:木箱出库 2024-02-02 15:33:56 +08:00
9f25ba7b59 add:新增行架-agv对接位驱动 2024-02-02 15:17:31 +08:00
2ea1f3497b Merge remote-tracking branch 'origin/master' 2024-02-02 14:34:26 +08:00
2ce8ed9ae1 fix : 测试流程 2024-02-02 14:34:06 +08:00
e846b623fa add:添加agv交互逻辑和驱动更新 2024-02-02 09:39:02 +08:00
39024a6484 add:增加一楼任务 2024-02-01 23:20:00 +08:00
f7f27a4f58 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java
2024-02-01 16:40:12 +08:00
bf368ec156 fix : 申请任务先找指令 2024-02-01 16:37:50 +08:00
yanps
0bd35e99bd add: ACS与LMS的接口日志添加到Lucene 2024-02-01 14:48:42 +08:00
yanps
065f422e55 add: 烘箱对接位 2024-02-01 10:37:01 +08:00
2fbac5ca01 add:木箱入库 2024-02-01 10:11:00 +08:00
10c25d60a6 fix : 测试流程 2024-01-31 08:56:34 +08:00
04d34fb12f add:木箱信息 2024-01-30 15:30:26 +08:00
yanps
6da99e2db8 fix: 修复烘箱报警还出入烘箱的问题 2024-01-29 08:52:14 +08:00
9da132eb09 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-01-27 16:29:38 +08:00
7cfe04a977 rev:套轴申请不需要任务号 2024-01-27 16:29:16 +08:00
7b880b48bc rev:redisson自动续期问题 2024-01-27 16:25:26 +08:00
1018b1fac0 rev:空托盘出入库 2024-01-27 15:53:15 +08:00
29ca5f703c refactor: 前端驼峰转下划线 2024-01-27 15:41:13 +08:00
1c6f2bd7be refactor: 驼峰统一修改成下划线 2024-01-27 15:21:13 +08:00
b0ac44072a add:空托盘出库 2024-01-26 18:04:38 +08:00
5768cf1d30 Merge remote-tracking branch 'origin/master' 2024-01-26 17:58:16 +08:00
3660c986b3 add : 下料行架开发 2024-01-26 17:57:59 +08:00
yanps
332cf10c59 opt: opc线程修复添加agv设备 2024-01-26 17:50:31 +08:00
yanps
8966921312 opt: 输送线优化和界面优化 2024-01-26 17:49:35 +08:00
510faea0ef add: 空盘出库wql 2024-01-26 15:54:26 +08:00
823c961ec6 Merge remote-tracking branch 'origin/master' 2024-01-26 13:56:35 +08:00
c27c42de8b add : 测试 2024-01-26 13:56:15 +08:00
3c7f4495da add:空托盘入库 2024-01-26 09:55:09 +08:00
27cd6217c4 rev: 代码生成器转为mybatis-plus的生成 2024-01-25 17:19:51 +08:00
USER-20220102CG\noblelift
686e3d33ae rev 更新驱动字符串读取 2024-01-24 16:56:38 +08:00
f24646754e rev:修改实体主键注解 2024-01-24 15:15:36 +08:00
2c76a7447f add:增加mapper生成 2024-01-24 15:11:55 +08:00
b3da793a4c add:二期出库 2024-01-24 14:01:54 +08:00
yanps
f2fb475e2e fix: 修复烘箱行架不给2的问题 2024-01-24 13:38:13 +08:00