|
|
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 |
|
|
|
7701d9f0ba
|
更新日志监控
|
2022-08-17 10:01:57 +08:00 |
|
18188916393
|
3bd5e9827c
|
测试bug提交
|
2022-08-17 09:33:15 +08:00 |
|
loujf
|
5a39c3c225
|
更新
|
2022-08-16 20:34:52 +08:00 |
|
ldj_willow
|
c76c41b695
|
代码更新
|
2022-08-16 20:06:38 +08:00 |
|
USER-20220102CG\noblelift
|
cf70ac11fb
|
1
|
2022-08-16 19:48:25 +08:00 |
|
USER-20220102CG\noblelift
|
ebb5bfe01a
|
更新
|
2022-08-16 19:48:08 +08:00 |
|
loujf
|
b7c0d7e387
|
Merge branch 'master' of http://121.40.234.130:8899/root/rongLiJiaNai
|
2022-08-16 19:46:10 +08:00 |
|
loujf
|
101ab92547
|
嘉耐更新
|
2022-08-16 19:46:02 +08:00 |
|
|
|
258d35c37b
|
Merge branch 'master' of http://121.40.234.130:8899/root/rongLiJiaNai
# Conflicts:
# acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
# acs/hd/nladmin-system/src/main/java/org/nl/logicflow/service/impl/StageServiceImpl.java
|
2022-08-16 18:55:12 +08:00 |
|
|
|
8ef6a29f84
|
舞台更新
|
2022-08-16 18:48:24 +08:00 |
|
loujf
|
3d9f1fdcf7
|
Merge branch 'master' of http://121.40.234.130:8899/root/rongLiJiaNai
|
2022-08-16 17:11:01 +08:00 |
|
loujf
|
28eee4fa99
|
货位更新
|
2022-08-16 17:10:49 +08:00 |
|
ldj_willow
|
5792c72211
|
代码更新
|
2022-08-16 16:36:48 +08:00 |
|
USER-20220102CG\noblelift
|
005ec3b919
|
更新设备驱动多选下拉框
|
2022-08-16 15:50:32 +08:00 |
|
ldj_willow
|
354134b83e
|
代码更新
|
2022-08-16 15:30:23 +08:00 |
|
ldj_willow
|
3b69a5e9e7
|
代码更新
|
2022-08-16 15:11:28 +08:00 |
|
ldj_willow
|
5ac82205a9
|
代码更新
|
2022-08-16 15:11:03 +08:00 |
|
loujf
|
a4e6f58b87
|
嘉耐更新
|
2022-08-16 14:14:24 +08:00 |
|
USER-20220102CG\noblelift
|
7961205167
|
更新日志
|
2022-08-16 11:17:45 +08:00 |
|
USER-20220102CG\noblelift
|
b3d67e3da3
|
1
|
2022-08-16 09:45:21 +08:00 |
|
loujf
|
3725446988
|
嘉耐更新
|
2022-08-16 09:43:43 +08:00 |
|
loujf
|
cb2d3d5d09
|
嘉耐更新
|
2022-08-16 09:19:37 +08:00 |
|
loujf
|
4f55c8701c
|
嘉耐更新
|
2022-08-16 09:17:47 +08:00 |
|
USER-20220102CG\noblelift
|
05e42b8436
|
更新
|
2022-08-16 09:15:49 +08:00 |
|
loujf
|
704a3efaf4
|
嘉耐更新
|
2022-08-15 20:16:46 +08:00 |
|
USER-20220102CG\noblelift
|
0ddbf33058
|
1
|
2022-08-15 18:53:38 +08:00 |
|
|
|
ea12b5dc48
|
代码修改
|
2022-08-15 18:26:24 +08:00 |
|
|
|
0dece0a99e
|
代码修改
|
2022-08-15 18:24:59 +08:00 |
|
|
|
0c64a1d994
|
更新日志
|
2022-08-15 18:19:02 +08:00 |
|
