周俊杰
|
fe9bbce33c
|
fix:auto
|
2023-12-06 17:13:51 +08:00 |
|
|
|
4d339161b7
|
fix: CustomPolicy
|
2023-12-06 17:10:28 +08:00 |
|
|
|
d45e352ce2
|
Merge remote-tracking branch 'origin/master'
|
2023-12-06 16:25:17 +08:00 |
|
|
|
af130c327d
|
fix: Address
|
2023-12-06 16:25:02 +08:00 |
|
yanps
|
3a235b8f76
|
add: 历史模块添加设备报警记录
|
2023-12-06 16:12:36 +08:00 |
|
yanps
|
17d364714e
|
add: 历史模块添加设备报警记录
|
2023-12-06 16:08:37 +08:00 |
|
|
|
126490ffad
|
Merge remote-tracking branch 'origin/master'
|
2023-12-06 16:07:11 +08:00 |
|
|
|
1f680c1b0a
|
add: 常量池类
|
2023-12-06 16:06:57 +08:00 |
|
USER-20220102CG\noblelift
|
655a5abb83
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_two
# Conflicts:
# acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/taskscreen/service/impl/TaskScreenServiceImpl.java
|
2023-12-06 09:58:33 +08:00 |
|
USER-20220102CG\noblelift
|
c2be716ca7
|
rev 更新目录结构
|
2023-12-06 09:56:09 +08:00 |
|
|
|
059a47f595
|
fix：界面优化，代码规约
|
2023-12-05 18:49:53 +08:00 |
|
USER-20220102CG\noblelift
|
57a0b71916
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_two
|
2023-12-05 18:06:09 +08:00 |
|
USER-20220102CG\noblelift
|
6abe6c2322
|
rev 修改枚举类与一期统一
|
2023-12-05 18:05:50 +08:00 |
|
yanps
|
9398535dcc
|
add: 历史记录模块添加导出功能
|
2023-12-05 18:01:27 +08:00 |
|
|
|
1156f212cf
|
fix: 双工位堆垛机修改
|
2023-12-05 17:45:26 +08:00 |
|
|
|
b50fb70cd6
|
Merge branch 'lzhl_tow_acs_ls'
# Conflicts:
# acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/double_station_stacker/DoubleStationStackerDeviceDriver.java
# acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/double_station_stacker/ItemProtocol.java
|
2023-12-05 16:29:40 +08:00 |
|
|
|
66178ff39f
|
add: 双工位堆垛机
|
2023-12-05 16:18:43 +08:00 |
|
USER-20220102CG\noblelift
|
b0c1d7c221
|
rev 代码规范
|
2023-12-05 15:47:11 +08:00 |
|
USER-20220102CG\noblelift
|
a558838f14
|
ren 更新枚举类
|
2023-12-05 14:07:17 +08:00 |
|
|
|
564c78bc2b
|
'add:双工位堆垛机开发'
|
2023-12-04 10:55:51 +08:00 |
|
|
|
5f529cd1c7
|
add: 堆垛机开发
|
2023-12-01 15:46:28 +08:00 |
|
yanps
|
438e82d222
|
fix: 解决堆垛机出库,移库路由问题
|
2023-12-01 10:12:23 +08:00 |
|
|
|
a839f95e59
|
add: 基础配置国际化开发
|
2023-11-30 10:40:31 +08:00 |
|
|
|
88509b463c
|
fix:优化
|
2023-11-30 09:41:50 +08:00 |
|
yanps
|
137544f067
|
add: 历史记录模块实现国际化
|
2023-11-29 19:09:22 +08:00 |
|
USER-20220102CG\noblelift
|
4d2408de3b
|
rev 新增堆垛机策略类型
|
2023-11-29 17:38:04 +08:00 |
|
yanps
|
c077c1ef85
|
add: 任务列表实现国际化
|
2023-11-29 16:11:53 +08:00 |
|
yanps
|
eb88bd8c22
|
add: 任务列表实现国际化
|
2023-11-29 16:09:29 +08:00 |
|
USER-20220102CG\noblelift
|
7ca7031b9d
|
rev 更新线程无法启动问题
|
2023-11-28 20:29:29 +08:00 |
|
|
|
c8d804cb74
|
驱动框架搭建
|
2023-11-28 19:41:36 +08:00 |
|
yanps
|
97e9cbd556
|
add: 添加三色灯等驱动
|
2023-11-28 16:34:03 +08:00 |
|
yanps
|
f8a42c402e
|
fix: 修改设备驱动重复的问题
|
2023-11-28 14:01:52 +08:00 |
|
|
|
970dbd8d7b
|
opt:任务看板代码优化
|
2023-11-28 13:25:47 +08:00 |
|
yanps
|
4cd0853589
|
opt: 堆垛机驱动优化
|
2023-11-28 13:20:05 +08:00 |
|
yanps
|
5e8a7e3cf6
|
opt: 堆垛机驱动优化
|
2023-11-28 08:54:37 +08:00 |
|
zhangzq
|
70652a6bfa
|
add:国际化配置文件
|
2023-11-27 19:12:18 +08:00 |
|
yanps
|
06c36a2d73
|
opt: 优化堆垛机驱动
|
2023-11-27 15:45:33 +08:00 |
|
|
|
c46e41f3e8
|
feat: acs国际化
|
2023-11-27 15:17:01 +08:00 |
|
yanps
|
ce4f06a789
|
opt: 优化定时任务创建堆垛机出库指令
|
2023-11-27 14:15:24 +08:00 |
|
zhangzq
|
c56961a4af
|
rev:配置文件
|
2023-11-27 11:28:48 +08:00 |
|
zhangzq
|
94bee1d28f
|
add:初始化国际化语言配置；sql文件别忘记跑
|
2023-11-27 11:17:31 +08:00 |
|
yanps
|
c7ed465eab
|
add: 增加堆垛机驱动选择策略,优化堆垛机和输送机驱动
|
2023-11-24 17:00:43 +08:00 |
|
yanps
|
28c02b328c
|
opt:标准版-单工位堆垛机驱动优化
|
2023-11-24 15:36:28 +08:00 |
|
yanps
|
a64384159b
|
opt:标准版-单工位堆垛机驱动优化
|
2023-11-24 14:51:55 +08:00 |
|
yanps
|
64f0daffda
|
opt: 标准版-单工位堆垛机驱动优化
|
2023-11-24 14:47:46 +08:00 |
|
yanps
|
67f522ceae
|
opt: 标准版-单工位堆垛机驱动优化
|
2023-11-24 14:47:00 +08:00 |
|
|
|
460992d258
|
排序、初始化策略加载
|
2023-11-24 13:11:59 +08:00 |
|
|
|
5a63c40d70
|
add:新增任务看板功能和LED驱动
|
2023-11-24 10:23:45 +08:00 |
|
|
|
d9a58f6aa9
|
启动报错
|
2023-11-24 09:19:29 +08:00 |
|
|
|
c77cd72d38
|
Merge remote-tracking branch 'origin/master'
|
2023-11-23 18:22:36 +08:00 |
|
