Commit Graph

55 Commits

Author SHA1 Message Date
USER-20220102CG\noblelift
71b5617841 fix 双工位RGV 2023-07-18 09:49:41 +08:00
USER-20220102CG\noblelift
2c4820fff7 add 当前码垛位上报lms 2023-06-01 17:16:14 +08:00
USER-20220102CG\noblelift
cdd4592594 add 包装码垛机械手工位 2023-05-04 16:13:34 +08:00
USER-20220102CG\noblelift
2a527249ee fix 线程 2023-04-20 21:51:31 +08:00
USER-20220102CG\noblelift
eb9833ce20 fix udw 2023-04-20 19:37:12 +08:00
zhangjiangwei
e234b8782c 更新 2023-03-15 09:20:07 +08:00
loujf
f5bdddaf82 更新 2023-02-17 14:05:42 +08:00
loujf
2d2c4116ff mes新增接口 2023-02-12 10:33:11 +08:00
loujf
b8bcdd7dce NDC调度接口更新 2022-11-22 16:56:56 +08:00
loujf
8ab1445ef4 更新 2022-11-02 21:16:25 +08:00
loujf
5d64cdebcb 嘉耐更新 2022-09-28 18:22:33 +08:00
lyd
a7639b0332 日志过长换行显示 2022-09-27 17:19:47 +08:00
lyd
497869ca50 修复-日志检索-滚动监听事件未销毁问题 2022-09-08 17:06:16 +08:00
lyd
70edf108f8 更新-日志检索-点击日期可以直接查询 2022-09-06 15:00:58 +08:00
loujf
95c0d478ac 更新 2022-09-05 11:10:35 +08:00
loujf
03b0d4ab50 更新 2022-09-05 11:10:21 +08:00
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