|
|
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 |
|
|
|
10c25d60a6
|
fix : 测试流程
|
2024-01-31 08:56:34 +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 |
|
|
|
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 |
|
|
|
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 |
|
USER-20220102CG\noblelift
|
686e3d33ae
|
rev 更新驱动字符串读取
|
2024-01-24 16:56:38 +08:00 |
|
yanps
|
f2fb475e2e
|
fix: 修复烘箱行架不给2的问题
|
2024-01-24 13:38:13 +08:00 |
|
|
|
db57ef0d0f
|
rev:定时器优化
|
2024-01-24 10:13:07 +08:00 |
|
|
|
5bcec4b32e
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-01-23 17:44:17 +08:00 |
|
|
|
14090a0d46
|
rev：集群相关修改
|
2024-01-23 17:44:07 +08:00 |
|
yanps
|
41904ecbb5
|
opt: 拔轴机申请套轴优化
|
2024-01-23 17:39:49 +08:00 |
|
|
|
bb99c99e68
|
Merge remote-tracking branch 'origin/master'
|
2024-01-23 17:24:27 +08:00 |
|
|
|
131b820f4d
|
add : 出库开发
|
2024-01-23 17:24:09 +08:00 |
|
yanps
|
ac74cd0e97
|
opt: 优化烘箱行架驱动
|
2024-01-23 15:05:22 +08:00 |
|
yanps
|
d104a41d39
|
add: 添加AGV取放烘箱对接位校验,添加创建任务权限控制
|
2024-01-23 15:04:16 +08:00 |
|
|
|
54bcba8ef4
|
add : 测试入库
|
2024-01-23 09:54:20 +08:00 |
|
|
|
f4f822d073
|
add : 测试入库
|
2024-01-23 09:36:12 +08:00 |
|
yanps
|
b3b343c075
|
fix: 启动报错修改
|
2024-01-22 19:35:21 +08:00 |
|
yanps
|
47b3889c5b
|
add: 添加仙工AGV,流量限制界面;实现流量限制国际化
|
2024-01-22 19:31:00 +08:00 |
|
yanps
|
37ac298f91
|
opt: 内包间优化
|
2024-01-22 19:27:06 +08:00 |
|
|
|
6cd78775ef
|
rev：更新
|
2024-01-22 09:54:11 +08:00 |
|
yanps
|
cfeabb4c04
|
opt: 优化创建任务的扩展字段
|
2024-01-22 09:44:08 +08:00 |
|
|
|
f06dec27bf
|
Merge remote-tracking branch 'origin/master'
|
2024-01-20 18:31:57 +08:00 |
|
|
|
449082c03c
|
add : 测试入库
|
2024-01-20 18:31:26 +08:00 |
|
yanps
|
4c0ec35e98
|
opt: 创建任务中的扩展字段优化
|
2024-01-20 17:16:12 +08:00 |
|
|
|
91d1102f9e
|
Merge remote-tracking branch 'origin/master'
|
2024-01-20 16:14:46 +08:00 |
|
|
|
8b6e6d547a
|
add : 测试入库
|
2024-01-20 16:14:25 +08:00 |
|
zhangzq
|
4b82e5a764
|
add:添加prometheushttp监控
|
2024-01-19 16:57:12 +08:00 |
|
|
|
56071e13fe
|
Merge remote-tracking branch 'origin/master'
|
2024-01-19 13:10:23 +08:00 |
|
|
|
7ecd9c6cc0
|
add : 测试入库
|
2024-01-19 13:10:03 +08:00 |
|
|
|
1dfc62bd36
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-01-19 11:20:10 +08:00 |
|
|
|
1a7d4afd68
|
rev:气涨轴编码维护
|
2024-01-19 11:20:02 +08:00 |
|
USER-20220102CG\noblelift
|
3b7035173d
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-01-19 10:21:28 +08:00 |
|
USER-20220102CG\noblelift
|
d26939d6b0
|
rev 更新
|
2024-01-19 10:20:32 +08:00 |
|
|
|
2ecc7994ff
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-01-18 15:54:56 +08:00 |
|
|
|
a2c03da1c8
|
rev:气涨轴编码变更
|
2024-01-18 15:54:44 +08:00 |
|
|
|
d8945feaf4
|
Merge remote-tracking branch 'origin/master'
|
2024-01-17 20:37:06 +08:00 |
|
|
|
54f0a10efd
|
add: 开发
|
2024-01-17 20:36:44 +08:00 |
|
|
|
90f4593346
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-01-17 20:09:14 +08:00 |
|
|
|
58417bf12c
|
rev:穿拔轴机库存更新
|
2024-01-17 20:07:23 +08:00 |
|
