|
|
eaadc6b971
|
Merge commit '1f9ea990ecd9811e2002ef491e2fc57ae1848490' into master_merge
|
2024-07-03 16:45:36 +08:00 |
|
yanps
|
f9fc6e8a50
|
opt: 仙工驱动监控页面实现国际化,NDC反馈行架还原
|
2024-07-02 17:24:26 +08:00 |
|
|
|
413f876247
|
Merge branch 'master' into master_merge
|
2024-06-21 10:30:00 +08:00 |
|
yanps
|
0be3799d6d
|
opt: 国际化,页面优化
|
2024-06-21 09:45:04 +08:00 |
|
|
|
1ae9b12cdc
|
Merge branch 'master' into master_merge
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/WmsToAcsController.java
# lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java
# lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java
|
2024-06-20 17:16:42 +08:00 |
|
yanps
|
9a6afe1c2f
|
opt: 输送机称重驱动优化
|
2024-06-19 17:10:20 +08:00 |
|
yanps
|
8037d14a47
|
opt: 立库输送机写入信号判断优化,添加输送机称重驱动
|
2024-06-19 15:44:50 +08:00 |
|
zhangzq
|
c33ffe440b
|
Merge branch 'master' into b_lms2
|
2024-06-07 16:21:32 +08:00 |
|
|
|
6ebf142c23
|
add:新增定时清理设备故障表任务
|
2024-05-27 10:58:53 +08:00 |
|
yanps
|
fa4a85ebcc
|
add: agv偏移功能
|
2024-05-21 18:38:01 +08:00 |
|
yanps
|
fb8cf98363
|
opt: 日志文件大小调整
|
2024-05-11 17:23:20 +08:00 |
|
yanps
|
d342c2a9ab
|
fix: 手持机下发任务报错修改,添加下发信号日志
|
2024-04-15 09:24:24 +08:00 |
|
yanps
|
0a3772f510
|
opt: 现场与设备联调测试优化
|
2024-04-13 10:00:05 +08:00 |
|
|
|
0bcffd1d63
|
add:强制完成添加
|
2024-04-10 17:20:04 +08:00 |
|
yanps
|
b4e31c71a2
|
fix: 烘箱下发信号指令错误解决
|
2024-03-29 18:55:20 +08:00 |
|
yanps
|
c9fb151de5
|
fix: 解决连续创建多个指令
|
2024-03-19 18:23:10 +08:00 |
|
yanps
|
ecbf9077c7
|
opt: 自动门优化
|
2024-03-19 13:08:35 +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 |
|
yanps
|
d4c89bc50f
|
opt: 三色灯回退,OPC连接优化
|
2024-02-23 15:38:33 +08:00 |
|
yanps
|
407c8b5152
|
opt: 设备监控
|
2024-02-21 09:56:25 +08:00 |
|
yanps
|
42a6aa3e4b
|
opt: 一期设备断连优化
|
2024-02-21 08:45:27 +08:00 |
|
yanps
|
3021a83d0c
|
opt: 出烘箱,信号断连优化
|
2024-02-20 14:03:10 +08:00 |
|
yanps
|
fd08038078
|
add: 信号未连接,在监控显示感叹号
|
2024-02-19 17:00:57 +08:00 |
|
yanps
|
bd2b3057ba
|
add: 添加自动清理任务和指令,优化操作日志
|
2024-02-02 16:56:42 +08:00 |
|
|
|
bf368ec156
|
fix : 申请任务先找指令
|
2024-02-01 16:37:50 +08:00 |
|
yanps
|
6da99e2db8
|
fix: 修复烘箱报警还出入烘箱的问题
|
2024-01-29 08:52:14 +08:00 |
|
yanps
|
8966921312
|
opt: 输送线优化和界面优化
|
2024-01-26 17:49:35 +08:00 |
|
yanps
|
f2fb475e2e
|
fix: 修复烘箱行架不给2的问题
|
2024-01-24 13:38:13 +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
|
d104a41d39
|
add: 添加AGV取放烘箱对接位校验,添加创建任务权限控制
|
2024-01-23 15:04:16 +08:00 |
|
yanps
|
37ac298f91
|
opt: 内包间优化
|
2024-01-22 19:27:06 +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 |
|
yanps
|
42cd7d1258
|
add: 添加插拔机取货完成反馈
|
2024-01-17 18:57:02 +08:00 |
|
USER-20220102CG\noblelift
|
6bd088f008
|
rev 更新线程休眠时间
|
2024-01-17 10:06:34 +08:00 |
|
USER-20220102CG\noblelift
|
18b5ca31b8
|
rev 更新
|
2024-01-16 21:07:58 +08:00 |
|
USER-20220102CG\noblelift
|
d238f62957
|
rev 更新日志
|
2024-01-16 20:04:44 +08:00 |
|
yanps
|
6f603ac7a0
|
fix: 修复分切行架一直写信号的问题
|
2024-01-15 13:15:05 +08:00 |
|
|
|
9c6a234211
|
rev：设备驱动空指针打印详细堆栈信息
|
2024-01-15 11:31:27 +08:00 |
|
yanps
|
6f7db9502c
|
fix: 分切行架任务就绪不下发
|
2024-01-10 11:11:36 +08:00 |
|
yanps
|
cbe1348684
|
opt: 内包间日志优化
|
2024-01-09 16:50:38 +08:00 |
|
yanps
|
fb79480ae1
|
add: 内包间日志增加
|
2024-01-09 09:30:09 +08:00 |
|
yanps
|
ad01512522
|
opt: 内包间A1优化
|
2024-01-06 18:18:39 +08:00 |
|
yanps
|
f69d754c9c
|
add: 烘箱行架增加日志和套轴等待
|
2024-01-04 09:36:49 +08:00 |
|
yanps
|
8e5c76a0a1
|
fix: 行架任务被分切输送线截取
|
2023-12-31 09:10:09 +08:00 |
|
yanps
|
624898d4fb
|
fix:内包间行架
|
2023-12-29 13:36:20 +08:00 |
|
|
|
d296565a51
|
fix:内包间行架日志添加
|
2023-12-28 09:32:12 +08:00 |
|
|
|
f1e4d5f3f8
|
fix:内包间行架rgv问题修复
|
2023-12-27 16:51:41 +08:00 |
|
