Commit Graph

39 Commits

Author SHA1 Message Date
loujf
8fb99f4e9b 更新 2022-09-01 15:34:42 +08:00
loujf
fb888a0f5b 更新 2022-08-22 13:25:44 +08:00
lyd
ce7da68064 舞台编辑更新 2022-08-22 10:43:29 +08:00
lyd
e6646ecf92 舞台编辑修复-下拉框实时更新信息 2022-08-22 09:43:33 +08:00
loujf
2d60244b82 嘉耐更新 2022-08-20 16:37:30 +08:00
lyd
e395d856c7 日志优化修改-设备监控优化 2022-08-19 15:11:58 +08:00
loujf
478c760ea3 码垛机械手驱动更新 2022-08-18 18:39:39 +08:00
lyd
a326fe39aa 设备图片上传更新与编辑功能提示 2022-08-18 17:21:04 +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
lyd
c5d9162548 修改 2022-08-18 11:30:35 +08:00
lyd
091cf4e8dd 添加舞台编辑设备绑定可搜索和优化操作按钮为svg图标 2022-08-18 10:18:46 +08:00
USER-20220102CG\noblelift
97756e5a41 更新 2022-08-17 19:01:13 +08:00
lyd
8a65e47bbd 设备监控驱动更新 2022-08-17 18:29:26 +08:00
loujf
a02a2279f0 更新 2022-08-17 16:57:38 +08:00
lyd
a3626ea095 舞台接口更新 2022-08-17 16:01:18 +08:00
lyd
e17604b6d7 设备监控部分代码,日志监控修复排序 2022-08-17 15:40:49 +08:00
lyd
a177e3bc21 前端更新 2022-08-17 13:43:16 +08:00
lyd
7701d9f0ba 更新日志监控 2022-08-17 10:01:57 +08:00
ldj_willow
c76c41b695 代码更新 2022-08-16 20:06:38 +08:00
lyd
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
lyd
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
ldj_willow
3b69a5e9e7 代码更新 2022-08-16 15:11:28 +08:00
ldj_willow
5ac82205a9 代码更新 2022-08-16 15:11:03 +08:00
loujf
3725446988 嘉耐更新 2022-08-16 09:43:43 +08:00
loujf
704a3efaf4 嘉耐更新 2022-08-15 20:16:46 +08:00
lyd
0c64a1d994 更新日志 2022-08-15 18:19:02 +08:00
USER-20220102CG\noblelift
23c2eb9844 更新 2022-08-15 17:00:39 +08:00
USER-20220102CG\noblelift
a4ce1862c6 更新双工rgv 2022-08-15 16:59:57 +08:00
USER-20220102CG\noblelift
5a52dcb0a4 更新 2022-08-06 18:42:39 +08:00
USER-20220102CG\noblelift
2a94f9c0b8 更新 2022-08-05 20:51:10 +08:00
loujf
1500f11571 嘉耐更新 2022-08-03 18:40:38 +08:00
loujf
c6ada8d8c8 工单完成按钮添加 2022-08-01 21:48:28 +08:00
loujf
0213500632 嘉耐更新 2022-07-19 14:57:08 +08:00
loujf
9ea3216efd 嘉耐更新 2022-07-06 19:16:06 +08:00
loujf
6713bde89c init project 2022-06-30 16:35:45 +08:00