|
|
1faf1dd652
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-03-01 16:50:44 +08:00 |
|
|
|
3da9bfe761
|
rev:定时导出EXCEL并上传到服务器
|
2024-03-01 14:11:34 +08:00 |
|
|
|
257864494e
|
Merge remote-tracking branch 'origin/master'
|
2024-03-01 14:06:40 +08:00 |
|
|
|
d4593bbf8f
|
fix :国际化修改
|
2024-03-01 14:05:31 +08:00 |
|
|
|
3af7a34c26
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-03-01 10:04:20 +08:00 |
|
|
|
fda88b222c
|
rev:新增表
|
2024-03-01 10:04:06 +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 |
|
yanps
|
d4c89bc50f
|
opt: 三色灯回退,OPC连接优化
|
2024-02-23 15:38:33 +08:00 |
|
|
|
2498dea59f
|
rev:代码优化
|
2024-02-23 15:23:39 +08:00 |
|
|
|
20d2d77a21
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-02-22 19:05:06 +08:00 |
|
|
|
da3b9e6b78
|
rev:复烤回退
|
2024-02-22 19:04:47 +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 |
|
yanps
|
407c8b5152
|
opt: 设备监控
|
2024-02-21 09:56:25 +08:00 |
|
|
|
5b096969a2
|
rev:优化kep信号读取
|
2024-02-21 09:11:29 +08:00 |
|
yanps
|
42a6aa3e4b
|
opt: 一期设备断连优化
|
2024-02-21 08:45:27 +08:00 |
|
|
|
5900712e61
|
Merge remote-tracking branch 'origin/master'
|
2024-02-20 17:17:32 +08:00 |
|
|
|
7c97cb116e
|
add :设备国际化
|
2024-02-20 17:16:58 +08:00 |
|
yanps
|
3021a83d0c
|
opt: 出烘箱,信号断连优化
|
2024-02-20 14:03:10 +08:00 |
|
|
|
d703d4ee29
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-02-20 13:29:56 +08:00 |
|
|
|
9f303916b9
|
rev:超期信息导入
|
2024-02-20 13:29:49 +08:00 |
|
yanps
|
fd08038078
|
add: 信号未连接,在监控显示感叹号
|
2024-02-19 17:00:57 +08:00 |
|
|
|
1b215a0b93
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-02-19 14:38:06 +08:00 |
|
|
|
7d8a560571
|
rev:复烤、内包间查询优化
|
2024-02-19 14:37:55 +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 |
|
|
|
8ff453316b
|
rev：出库调拨单打印 毛重计算错误
|
2024-02-18 14:04:45 +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 |
|
ludj
|
709d15f977
|
rev:移除多余代码
|
2024-02-02 15:55:00 +08:00 |
|
ludj
|
a85c88139b
|
rev:移除多余包
|
2024-02-02 15:41:34 +08:00 |
|
|
|
9f25ba7b59
|
add:新增行架-agv对接位驱动
|
2024-02-02 15:17:31 +08:00 |
|
