root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,412 Commits 1 Branch 0 Tags
ea75b54f381f33fe65ef0e38bca2f4b96f82ea80
Commit Graph

302 Commits

Author SHA1 Message Date
lishuai
ea75b54f38 报错时data注释 2023-11-16 10:19:19 +08:00
yanps
f826b0ba77 opt: NDC双工位AGV优化 2023-11-15 14:13:59 +08:00
yanps
fe25998a24 opt: NDC双工位AGV优化 2023-11-13 19:57:46 +08:00
tuqiang
247457d4a3 opt:代码优化 2023-11-13 19:35:53 +08:00
tuqiang
c74ab66fdd opt:内包间行架，输送线出口位驱动优化 2023-11-10 10:38:27 +08:00
yanps
7ec5df941c opt: 纸管库,套管工位驱动优化 2023-11-09 14:06:57 +08:00
tuqiang
1181d4c192 opt:内包间行架和插拔轴机驱动代码优化 2023-11-09 13:21:01 +08:00
tuqiang
f36891047d rev 内包间行架 2023-11-09 10:02:16 +08:00
tuqiang
293906cdb5 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	acs/nladmin-system/src/main/java/org/nl/acs/device/wql/task_inst.xls
 2023-11-09 09:58:00 +08:00
tuqiang
205798ad6e fix 2023-11-09 09:56:53 +08:00
yanps
46463e7b65 opt: 纸管库,套管工位驱动优化 2023-11-08 17:30:33 +08:00
tuqiang
78a4a4d6bd Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java
#	acs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java
#	acs/nladmin-ui/src/views/acs/device/config.vue
 2023-11-07 13:39:36 +08:00
tuqiang
fa1a3a4e68 fix 2023-11-07 12:37:07 +08:00
yanps
d5c2a0bd3e 套管工位驱动 2023-11-07 11:07:49 +08:00
tuqiang
cf9213eab4 add:新增内包间行架驱动 2023-11-07 11:01:34 +08:00
yanps
2e634be0ce 纸管库和套管工位驱动编写 2023-11-07 10:47:16 +08:00
USER-20220102CG\noblelift
82c46653e6 rev 新增任务字段 2023-11-03 14:32:40 +08:00
USER-20220102CG\noblelift
84d12e41dd add 新增lms接口 2023-11-03 13:50:17 +08:00
USER-20220102CG\noblelift
772a6e8efa add 新增纸管库驱动 2023-11-02 11:24:39 +08:00
USER-20220102CG\noblelift
b5cd16b295 rev 信号下发 2023-10-31 16:02:14 +08:00
tuqiang
737dbd336e add:对烘箱对接位添加允许强制进入功能 2023-10-26 18:31:01 +08:00
USER-20220102CG\noblelift
7740a8bbad rev 行架任务校验 2023-10-26 17:17:13 +08:00
USER-20220102CG\noblelift
c7fd9d892d rev ndc链接 2023-10-24 10:10:57 +08:00
USER-20220102CG\noblelift
9224b0d07c rev 修复任务指令内存问题 2023-10-19 11:28:09 +08:00
张江玮
740d859f34 add 桁架 x y 轴信号 2023-10-09 18:13:09 +08:00
张江玮
c5a061454f add 烘箱桁架 分切桁架 行走行信号 2023-10-09 10:40:16 +08:00
USER-20220102CG\noblelift
130928b672 rev 直管库 2023-10-07 08:45:31 +08:00
张江玮
d8769461a7 fix queryDevice 2023-09-27 14:16:07 +08:00
USER-20220102CG\noblelift
e741a8c9ea rev 读取线程 2023-09-26 13:22:02 +08:00
USER-20220102CG\noblelift
ff00076083 rev 报警信息 2023-09-21 14:53:55 +08:00
ZHOUZ\Noble'lift
f930699636 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-09-08 10:40:50 +08:00
ZHOUZ\Noble'lift
2a3f8dec83 rev:是否同时登录 2023-09-08 10:40:40 +08:00
ZHOUZ\Noble'lift
af088d123e rev:操作日志问题修改 2023-09-08 10:39:57 +08:00
USER-20220102CG\noblelift
e9d04cf9f3 rev 反馈报警过滤 2023-09-08 10:38:59 +08:00
USER-20220102CG\noblelift
bced0538ac rev 反馈报警 2023-09-06 22:05:00 +08:00
USER-20220102CG\noblelift
14dbaccdf5 rev agv監控顯示 2023-09-03 10:56:31 +08:00
USER-20220102CG\noblelift
33b546032f rev 2023-08-28 20:27:16 +08:00
张江玮
81fd26cba7 fix querydevice接口 2023-08-28 15:27:12 +08:00
张江玮
39c4a2a0d2 fix querydevice接口 2023-08-28 14:56:56 +08:00
张江玮
c9e80c3ed1 fix querydevice接口 2023-08-28 14:53:21 +08:00
张江玮
528a44245d fix 获取AGV错误信息 2023-08-24 09:56:53 +08:00
张江玮
8fe3e08a43 fix 立库设备反馈设备状态 2023-08-22 09:35:38 +08:00
张江玮
468739ecf3 rev queryDevice接口 2023-08-21 17:54:42 +08:00
张江玮
bf528e48f4 fix 反馈设备状态 2023-08-21 15:15:55 +08:00
张江玮
4772072564 fix 反馈设备状态 2023-08-18 16:11:46 +08:00
张江玮
36907a602a fix 反馈设备状态 2023-08-18 14:56:12 +08:00
USER-20220102CG\noblelift
398148cf7a rev 增加agv未到位不允许人工点确认 2023-08-18 11:09:09 +08:00
USER-20220102CG\noblelift
4f89bfbd93 rev 更新值不健康处理 2023-08-15 11:21:13 +08:00
USER-20220102CG\noblelift
f30a337738 rev 更新下发失败逻辑 2023-08-10 10:29:21 +08:00
USER-20220102CG\noblelift
9aed1364a6 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-08-09 17:52:27 +08:00