|
|
ea9cb45a3a
|
fix: 现场联调行家
|
2024-03-20 13:42:36 +08:00 |
|
|
|
d99c0d8437
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
|
2024-03-20 09:04:32 +08:00 |
|
|
|
2eac4ea4e3
|
fix: 现场联调
|
2024-03-20 09:01:40 +08:00 |
|
yanps
|
c9fb151de5
|
fix: 解决连续创建多个指令
|
2024-03-19 18:23:10 +08:00 |
|
yanps
|
ecbf9077c7
|
opt: 自动门优化
|
2024-03-19 13:08:35 +08:00 |
|
|
|
6903bdfa6d
|
add: 行架缓存为页面
|
2024-03-18 11:03:09 +08:00 |
|
|
|
2fa7a54247
|
add: 行架缓存为页面
|
2024-03-18 10:59:44 +08:00 |
|
|
|
5303bf4828
|
Merge remote-tracking branch 'origin/master'
|
2024-03-18 08:46:07 +08:00 |
|
|
|
0783af09c2
|
fix: 堆垛机联调
|
2024-03-18 08:45:37 +08:00 |
|
yanps
|
c83881410f
|
opt: 流量限制优化
|
2024-03-15 09:11:49 +08:00 |
|
|
|
5ad7a02093
|
rev:解决联调问题
|
2024-03-14 18:02:00 +08:00 |
|
yanps
|
f90070f8e5
|
fix: 修复入烘箱不创建第二条指令问题
|
2024-03-11 17:15:37 +08:00 |
|
|
|
f4e14eb6ba
|
rev:修复报错
|
2024-03-11 14:19:28 +08:00 |
|
|
|
e19fa045a3
|
rev:设备监控优化
|
2024-03-11 14:08:36 +08:00 |
|
|
|
4d18c231b9
|
fix: 行架对接位添加
|
2024-03-11 13:55:10 +08:00 |
|
yanps
|
19615e8ca7
|
opt: 路由同步，设备监控优化
|
2024-03-08 09:52:05 +08:00 |
|
|
|
0b7945a149
|
rev:新增请求接口，驱动代码优化
|
2024-03-07 18:12:53 +08:00 |
|
|
|
f16b6a6795
|
fix:国际化导包报错
|
2024-03-06 13:19:19 +08:00 |
|
|
|
832366d6d6
|
测试
|
2024-03-06 09:59:53 +08:00 |
|
yanps
|
385fc2dac1
|
opt: 更改创建者显示，页面优化
|
2024-03-05 17:52:04 +08:00 |
|
|
|
bf36bed276
|
fix :判断光电信号
|
2024-03-04 16:23:02 +08:00 |
|
|
|
d4593bbf8f
|
fix :国际化修改
|
2024-03-01 14:05:31 +08:00 |
|
|
|
36155bac2e
|
fix :国际化修改
|
2024-02-29 14:45:10 +08:00 |
|
|
|
881ade414e
|
Merge remote-tracking branch 'origin/master'
|
2024-02-29 13:14:05 +08:00 |
|
|
|
864990b446
|
fix :修改
|
2024-02-29 13:13:32 +08:00 |
|
|
|
f278b71ca0
|
rev:优化
|
2024-02-29 10:38:29 +08:00 |
|
|
|
1608d34733
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java
# acs2/nladmin-ui/src/views/system/monitor/device/index.vue
|
2024-02-29 10:37:12 +08:00 |
|
|
|
544e5dfaea
|
add：新增后端二楼驱动国际化
|
2024-02-29 10:30:48 +08:00 |
|
yanps
|
ae3b25f35a
|
opt: 异常日志，流量限制，创建任务优化
|
2024-02-28 16:35:50 +08:00 |
|
|
|
c010166c28
|
add :堆垛机异样处理
|
2024-02-28 16:14:34 +08:00 |
|
|
|
42e572a003
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties
# acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties
# acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_in_ID.properties
# acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties
|
2024-02-26 16:33:08 +08:00 |
|
|
|
2f85b23948
|
fix :lms联调
|
2024-02-26 16:31:33 +08:00 |
|
yanps
|
7282a6ef66
|
opt: 设备优化
|
2024-02-23 16:37:01 +08:00 |
|
|
|
2498dea59f
|
rev:代码优化
|
2024-02-23 15:23:39 +08:00 |
|
|
|
6c42abffde
|
Merge remote-tracking branch 'origin/master'
|
2024-02-22 17:59:25 +08:00 |
|
|
|
ff04f40bbc
|
fix :测试、对接点位
|
2024-02-22 17:55:13 +08:00 |
|
|
|
5b096969a2
|
rev:优化kep信号读取
|
2024-02-21 09:11:29 +08:00 |
|
|
|
7c97cb116e
|
add :设备国际化
|
2024-02-20 17:16:58 +08:00 |
|
|
|
17c1843fea
|
Merge remote-tracking branch 'origin/master'
|
2024-02-19 10:49:03 +08:00 |
|
|
|
e95b1b46cf
|
add: 设备监控国际化
|
2024-02-19 10:48:28 +08:00 |
|
USER-20220102CG\noblelift
|
8cc21065aa
|
rev 解决系统日志失效问题
|
2024-02-18 16:24:50 +08:00 |
|
|
|
b45e089e7f
|
fix：脱机设备监控为红色
|
2024-02-18 15:56:25 +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 |
|
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 |
|
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 |
|
