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 |
|
|
|
6560d294f8
|
fix:tosize添加
|
2023-12-19 09:39:07 +08:00 |
|
|
|
0b764880ad
|
Merge remote-tracking branch 'origin/master'
|
2023-12-19 09:29:19 +08:00 |
|
|
|
7085c09289
|
fix:调试修改
|
2023-12-19 09:28:54 +08:00 |
|
yanps
|
f35bb8e115
|
fix: 创建任务模板修改
|
2023-12-17 11:45:52 +08:00 |
|
USER-20220102CG\noblelift
|
f04013cf3d
|
rev 更新
|
2023-12-17 11:37:40 +08:00 |
|
yanps
|
24286d5e57
|
fix: 修改paper_array的转换异常
|
2023-12-17 11:03:01 +08:00 |
|
|
|
be12fd8773
|
fix:写入修改
|
2023-12-17 10:53:49 +08:00 |
|
USER-20220102CG\noblelift
|
20ba259262
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2023-12-16 10:19:41 +08:00 |
|
USER-20220102CG\noblelift
|
8b63fa3ae0
|
rev 修改bug
|
2023-12-16 10:19:18 +08:00 |
|
|
|
8d3ad8ec6a
|
rev: 业务员更新
|
2023-12-15 16:02:51 +08:00 |
|
USER-20220102CG\noblelift
|
7a43f4679d
|
rev 删除多余日志
|
2023-12-14 17:45:30 +08:00 |
|
yanps
|
870eddad41
|
fix: 纸管库出货数量数据格式修改
|
2023-12-14 15:52:46 +08:00 |
|
yanps
|
4338fe8955
|
opt: 优化设备监控中的纸管库
|
2023-12-14 13:50:12 +08:00 |
|
|
|
ac19e9145e
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2023-12-14 09:28:27 +08:00 |
|
|
|
793f8c9cfe
|
rev:代码规范
|
2023-12-14 09:28:19 +08:00 |
|
yanps
|
d14c0dfa9b
|
opt: 优化创建任务的参数和页面
|
2023-12-13 18:01:07 +08:00 |
|
yanps
|
d3dbb4191f
|
add: 添加创建任务的字段
|
2023-12-13 15:55:28 +08:00 |
|
USER-20220102CG\noblelift
|
b517f41682
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2023-12-13 15:49:47 +08:00 |
|
USER-20220102CG\noblelift
|
e0808d770c
|
rev 更新套管工位
|
2023-12-13 15:48:41 +08:00 |
|
|
|
b98beff8ce
|
rev 优化
|
2023-12-13 14:59:06 +08:00 |
|
ludj
|
d1be5733b8
|
rev:代码规范:去掉未使用的import与格式化
|
2023-12-13 13:24:02 +08:00 |
|
ludj
|
074a6e78cd
|
代码规范更新
|
2023-12-13 13:13:24 +08:00 |
|
yanps
|
d7c8665c54
|
opt: 套管工位实现套管完成业务
|
2023-12-13 10:53:17 +08:00 |
|
ludj
|
82a8540504
|
rev:代码规范更新
|
2023-12-13 10:16:35 +08:00 |
|
|
|
10b0e6c2eb
|
dev:代码规范
|
2023-12-13 10:10:16 +08:00 |
|
|
|
52a0ba88ea
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2023-12-13 10:02:08 +08:00 |
|
|
|
96f06bb6d0
|
dev:前端用户名不显示
|
2023-12-13 10:02:00 +08:00 |
|
yanps
|
a2051a8e2a
|
opt: 内包间驱动优化
|
2023-12-13 09:59:13 +08:00 |
|
yanps
|
d31bdc14ce
|
opt: 优化
|
2023-12-13 09:58:18 +08:00 |
|
|
|
b5b00f0669
|
rev：更新代码
|
2023-12-13 09:48:19 +08:00 |
|
|
|
a7f50a7e90
|
Merge remote-tracking branch 'origin/master'
|
2023-12-13 09:47:15 +08:00 |
|
|
|
dacad71eac
|
rev:更新驱动点位地址
|
2023-12-13 09:45:43 +08:00 |
|
|
|
e5e6bedffc
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2023-12-13 09:00:41 +08:00 |
|
|
|
ad638ee127
|
dev:代码优化，该切计划和业务员
|
2023-12-13 09:00:32 +08:00 |
|
|
|
19ed527a0a
|
fix
|
2023-12-12 16:57:59 +08:00 |
|
|
|
7b27f86111
|
Merge remote-tracking branch 'origin/master'
|
2023-12-12 16:56:15 +08:00 |
|
|
|
6572957a09
|
fix:驱动代码修改
|
2023-12-12 16:54:49 +08:00 |
|
USER-20220102CG\noblelift
|
5ca08b760e
|
rev 优化
|
2023-12-12 16:31:03 +08:00 |
|
|
|
3b742ff9ac
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2023-12-12 15:22:03 +08:00 |
|
|
|
71d27d5daf
|
dev：回传优化
|
2023-12-12 15:20:19 +08:00 |
|
