|
|
f1e4d5f3f8
|
fix:内包间行架rgv问题修复
|
2023-12-27 16:51:41 +08:00 |
|
|
|
09b420978c
|
Merge remote-tracking branch 'origin/master'
|
2023-12-27 15:47:35 +08:00 |
|
|
|
c5915c8434
|
fix:内包间行架rgv问题修复
|
2023-12-27 15:47:09 +08:00 |
|
|
|
d90e133f82
|
add: 报废出库回传mes
|
2023-12-27 15:29:43 +08:00 |
|
|
|
d53c970bf0
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java
|
2023-12-27 10:32:42 +08:00 |
|
|
|
6e5ba08885
|
fix:内包间行架rgv问题修复
|
2023-12-27 10:29:08 +08:00 |
|
yanps
|
adc6d7f74d
|
opt: 优化内包间行架任务下发
|
2023-12-26 21:55:40 +08:00 |
|
|
|
116f8a0cfe
|
Merge remote-tracking branch 'origin/master'
|
2023-12-26 19:34:17 +08:00 |
|
|
|
7739e9062b
|
fix:rgv行架冲突问题
|
2023-12-26 19:33:19 +08:00 |
|
|
|
3f50358523
|
rev：系统参数修改
|
2023-12-26 17:13:32 +08:00 |
|
|
|
2d20869770
|
rev：成品日报更新
|
2023-12-26 17:08:39 +08:00 |
|
ludj
|
0ec00360d5
|
rev:去掉ACS的SWAGGER、日志修改
|
2023-12-26 16:51:54 +08:00 |
|
|
|
ceaa8a0b34
|
Merge remote-tracking branch 'origin/master'
|
2023-12-26 10:24:47 +08:00 |
|
|
|
fc48074907
|
fix:rgv行架冲突问题
|
2023-12-26 10:24:22 +08:00 |
|
ludj
|
e316b1a60e
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2023-12-25 17:09:17 +08:00 |
|
ludj
|
9695725e76
|
rev: 日志配置更新
|
2023-12-25 17:08:57 +08:00 |
|
|
|
24026c4c2e
|
Merge remote-tracking branch 'origin/master'
|
2023-12-25 17:02:09 +08:00 |
|
|
|
2677fa3a39
|
fix:载具还没横移，下发in到载具任务问题解决
|
2023-12-25 17:00:53 +08:00 |
|
|
|
2b2bc9de54
|
rev：新版日报修改
|
2023-12-25 15:30:33 +08:00 |
|
|
|
2287effa7c
|
Merge remote-tracking branch 'origin/master'
|
2023-12-25 12:36:58 +08:00 |
|
|
|
9dcef9e939
|
fix:提前完场任务
|
2023-12-25 12:36:29 +08:00 |
|
|
|
cbebb04175
|
rev：解决异步多次请求
|
2023-12-25 11:15:15 +08:00 |
|
|
|
3d34802611
|
rev:内包间页面优化
|
2023-12-25 10:37:47 +08:00 |
|
|
|
1024462f13
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2023-12-25 09:49:40 +08:00 |
|
|
|
543801a5dc
|
rev:搬运气胀轴条件优化
|
2023-12-25 09:49:31 +08:00 |
|
|
|
885d1ec962
|
fix:反馈尺寸太慢
|
2023-12-24 09:55:41 +08:00 |
|
|
|
490664c317
|
Merge remote-tracking branch 'origin/master'
|
2023-12-23 17:34:59 +08:00 |
|
|
|
460e6ebadc
|
fix:日志修改
|
2023-12-23 17:34:35 +08:00 |
|
|
|
5688e305cf
|
rev:内包间代码优化
|
2023-12-23 16:59:05 +08:00 |
|
|
|
9e7675574e
|
Merge remote-tracking branch 'origin/master'
|
2023-12-23 08:51:23 +08:00 |
|
|
|
74385c16a6
|
fix: out到in点修改
|
2023-12-23 08:45:07 +08:00 |
|
|
|
2c804c1a19
|
rev：兰州需求开发
|
2023-12-22 16:03:54 +08:00 |
|
|
|
478dbc91e9
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2023-12-22 14:49:53 +08:00 |
|
|
|
511f4f34eb
|
rev:内包间优化
|
2023-12-22 14:49:44 +08:00 |
|
yanps
|
3e6099da0e
|
fix: 西门子输送线横移修复
|
2023-12-22 14:47:53 +08:00 |
|
yanps
|
7ae3d877f0
|
Merge branch 'master' of 121.40.234.130:root/lanzhouhailiang_one
|
2023-12-22 13:53:35 +08:00 |
|
yanps
|
b3554a7c63
|
fix: 申请套管修复
|
2023-12-22 13:53:11 +08:00 |
|
|
|
d6e553d8f5
|
fix:修改
|
2023-12-22 13:52:58 +08:00 |
|
songxiaopeng
|
0cbdf3ccbd
|
rev：页面增加查询条件，提升响应速度；出库管理界面增加显示内容、导出增加显示内容
|
2023-12-22 10:49:17 +08:00 |
|
songxiaopeng
|
246f396a40
|
rev：页面增加查询条件，提升响应速度；出库管理界面增加显示内容、导出增加显示内容
|
2023-12-22 10:42:36 +08:00 |
|
USER-20220102CG\noblelift
|
46f36461c2
|
rev 优化
|
2023-12-22 09:44:46 +08:00 |
|
USER-20220102CG\noblelift
|
66e6b8f961
|
REV 接口异步
|
2023-12-22 03:50:41 +08:00 |
|
yanps
|
bde94691da
|
Merge branch 'master' of 121.40.234.130:root/lanzhouhailiang_one
|
2023-12-21 21:58:09 +08:00 |
|
yanps
|
ac809deac4
|
rev
|
2023-12-21 21:57:37 +08:00 |
|
|
|
489a0a4b35
|
rev:内包间改造代码提交
|
2023-12-21 14:07:02 +08:00 |
|
|
|
5f8b795902
|
fix:现场测试
|
2023-12-20 18:31:21 +08:00 |
|
yanps
|
ee6fd716bc
|
fix: 内包间行架任务被输送线给下发命令
|
2023-12-20 18:23:30 +08:00 |
|
|
|
6e425d4b3c
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java
|
2023-12-20 13:39:35 +08:00 |
|
|
|
bc4142feb5
|
fix:现场测试，大屏显示修改
|
2023-12-20 11:32:14 +08:00 |
|
yanps
|
0a6ccbf76b
|
fix: 指令未满足条件,变成执行中
|
2023-12-20 10:58:01 +08:00 |
|
