loujf
|
95c0d478ac
|
更新
|
2022-09-05 11:10:35 +08:00 |
|
loujf
|
03b0d4ab50
|
更新
|
2022-09-05 11:10:21 +08:00 |
|
loujf
|
65924cf795
|
更新
|
2022-09-02 09:33:11 +08:00 |
|
18188916393
|
643d790311
|
no message
|
2022-09-01 17:37:55 +08:00 |
|
18188916393
|
182d4f498b
|
新增借口
|
2022-09-01 15:43:06 +08:00 |
|
loujf
|
8fb99f4e9b
|
更新
|
2022-09-01 15:34:42 +08:00 |
|
18188916393
|
69d0587407
|
新需求修改
|
2022-08-29 17:02:47 +08:00 |
|
18188916393
|
15abb16868
|
后续问题提交
|
2022-08-26 16:27:07 +08:00 |
|
USER-20220102CG\noblelift
|
a1dc5cef0b
|
更新接口
|
2022-08-26 14:41:15 +08:00 |
|
18188916393
|
a538efbef1
|
no message
|
2022-08-25 17:48:13 +08:00 |
|
18188916393
|
505a99978f
|
Merge branch 'master' of http://121.40.234.130:8899/root/rongLiJiaNai
|
2022-08-25 17:33:58 +08:00 |
|
18188916393
|
0ebda94be5
|
no message
|
2022-08-25 17:33:27 +08:00 |
|
18188916393
|
5014df9aed
|
no message
|
2022-08-25 17:32:40 +08:00 |
|
USER-20220102CG\noblelift
|
6dea55ed40
|
1
|
2022-08-25 17:23:33 +08:00 |
|
18188916393
|
8cc98575cd
|
跟mes对接提交
|
2022-08-24 17:42:20 +08:00 |
|
18188916393
|
844b93de98
|
提交
|
2022-08-23 13:42:33 +08:00 |
|
loujf
|
84ec044f3d
|
更新
|
2022-08-23 13:05:11 +08:00 |
|
18188916393
|
2bffb17dae
|
no message
|
2022-08-23 11:29:54 +08:00 |
|
18188916393
|
e2b11f64e9
|
no message
|
2022-08-23 09:01:28 +08:00 |
|
loujf
|
fb888a0f5b
|
更新
|
2022-08-22 13:25:44 +08:00 |
|
|
|
ce7da68064
|
舞台编辑更新
|
2022-08-22 10:43:29 +08:00 |
|
18188916393
|
006198d39f
|
提交
|
2022-08-22 10:26:54 +08:00 |
|
USER-20220102CG\noblelift
|
7c7ed6f1b1
|
Merge branch 'master' of http://121.40.234.130:8899/root/rongLiJiaNai
|
2022-08-22 10:18:31 +08:00 |
|
USER-20220102CG\noblelift
|
02b1236ce8
|
更新
|
2022-08-22 10:18:20 +08:00 |
|
|
|
e6646ecf92
|
舞台编辑修复-下拉框实时更新信息
|
2022-08-22 09:43:33 +08:00 |
|
loujf
|
2d60244b82
|
嘉耐更新
|
2022-08-20 16:37:30 +08:00 |
|
|
|
e395d856c7
|
日志优化修改-设备监控优化
|
2022-08-19 15:11:58 +08:00 |
|
loujf
|
7f7265e5fc
|
分拣机械手驱动更新
|
2022-08-19 14:35:51 +08:00 |
|
loujf
|
478c760ea3
|
码垛机械手驱动更新
|
2022-08-18 18:39:39 +08:00 |
|
|
|
a326fe39aa
|
设备图片上传更新与编辑功能提示
|
2022-08-18 17:21:04 +08:00 |
|
ldj_willow
|
861cdfea72
|
代码重构
|
2022-08-18 16:54:49 +08:00 |
|
ldj_willow
|
451e51877e
|
代码重构
|
2022-08-18 15:06:07 +08:00 |
|
USER-20220102CG\noblelift
|
b7b7296189
|
1
|
2022-08-18 15:01:33 +08:00 |
|
ldj_willow
|
f1cad6b34d
|
代码重构
|
2022-08-18 15:00:19 +08:00 |
|
ldj_willow
|
fe95314152
|
Merge branch 'master' of http://121.40.234.130:8899/root/rongLiJiaNai
# Conflicts:
# acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java
# acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java
# acs/hd/nladmin-system/src/main/java/org/nl/acs/monitor/DeviceStageMonitor.java
# acs/hd/nladmin-system/src/main/java/org/nl/acs/monitor/rest/DeviceStageMonitorController.java
# acs/hd/nladmin-system/src/main/java/org/nl/acs/monitor/service/DeviceStageMonitorService.java
# acs/hd/nladmin-system/src/main/java/org/nl/acs/monitor/service/impl/DeviceStageMonitorServiceImpl.java
# acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
# acs/qd/.env.development
|
2022-08-18 14:59:22 +08:00 |
|
ldj_willow
|
ff1670185d
|
代码重构
|
2022-08-18 14:54:58 +08:00 |
|
|
|
ca396b7022
|
Merge branch 'master' of http://121.40.234.130:8899/root/rongLiJiaNai
|
2022-08-18 11:31:04 +08:00 |
|
|
|
c5d9162548
|
修改
|
2022-08-18 11:30:35 +08:00 |
|
loujf
|
5db280bbbf
|
监控更新
|
2022-08-18 11:14:35 +08:00 |
|
USER-20220102CG\noblelift
|
9eeaf46426
|
更新
|
2022-08-18 10:33:07 +08:00 |
|
|
|
091cf4e8dd
|
添加舞台编辑设备绑定可搜索和优化操作按钮为svg图标
|
2022-08-18 10:18:46 +08:00 |
|
USER-20220102CG\noblelift
|
5a7d010c93
|
更新
|
2022-08-18 08:52:16 +08:00 |
|
18188916393
|
512cd3acd3
|
测试提交
|
2022-08-18 08:50:52 +08:00 |
|
USER-20220102CG\noblelift
|
97756e5a41
|
更新
|
2022-08-17 19:01:13 +08:00 |
|
|
|
8a65e47bbd
|
设备监控驱动更新
|
2022-08-17 18:29:26 +08:00 |
|
loujf
|
a02a2279f0
|
更新
|
2022-08-17 16:57:38 +08:00 |
|
|
|
a3626ea095
|
舞台接口更新
|
2022-08-17 16:01:18 +08:00 |
|
|
|
e17604b6d7
|
设备监控部分代码，日志监控修复排序
|
2022-08-17 15:40:49 +08:00 |
|
USER-20220102CG\noblelift
|
785bc93613
|
更新
|
2022-08-17 14:07:01 +08:00 |
|
|
|
a177e3bc21
|
前端更新
|
2022-08-17 13:43:16 +08:00 |
|
