Commit Graph

119 Commits

Author SHA1 Message Date
yanps
2757ee6655 opt: AGV下发任务优化 2024-04-01 09:00:48 +08:00
yanps
b4e31c71a2 fix: 烘箱下发信号指令错误解决 2024-03-29 18:55:20 +08:00
de2bdefb24 fix:限制下发堆垛机有出入库路线相同的任务 2024-03-28 17:29:14 +08:00
635984f957 Merge remote-tracking branch 'origin/master' 2024-03-28 09:54:56 +08:00
1442d2d780 fix: 二楼到一楼输送线修改 2024-03-28 09:54:29 +08:00
yanps
9ae98c1d25 fix: 烘箱行架联调问题解决 2024-03-28 08:39:43 +08:00
5f8c856a09 add:新增仙工agv动作块以及优化任务看板 2024-03-27 15:11:55 +08:00
yanps
7dc1f2b429 opt: 优化日志和创建者 2024-03-27 08:53:58 +08:00
44d1024900 fix:修复堆垛机命令变化不能再次申请问题 2024-03-22 17:45:02 +08:00
00830d1835 fix: 堆垛机异常入库次数限制 2024-03-22 17:10:32 +08:00
6d52122194 Merge remote-tracking branch 'origin/master' 2024-03-21 17:20:56 +08:00
6119fed7f7 fix: 载具类型添加 2024-03-21 17:20:22 +08:00
84af73051c rev:任务看板优化 2024-03-21 17:14:44 +08:00
d1571b8284 fix: 现场联调加堆垛机修改 2024-03-21 16:53:49 +08:00
yanps
0b9b990262 opt: 烘箱行架监控大屏优化 2024-03-20 16:59:08 +08:00
7a50c3c230 Merge remote-tracking branch 'origin/master' 2024-03-20 15:01:19 +08:00
bb012a2c40 fix: 堆垛机 2024-03-20 15:00:59 +08:00
yanps
6da0f596bc add: 增加二楼NDC日志 2024-03-20 14:26:44 +08:00
ea9cb45a3a fix: 现场联调行家 2024-03-20 13:42:36 +08:00
yanps
72c9717169 fix: 解决日志信号变化为null的问题 2024-03-20 10:54:46 +08:00
d99c0d8437 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
2024-03-20 09:04:32 +08:00
2eac4ea4e3 fix: 现场联调 2024-03-20 09:01:40 +08:00
yanps
c9fb151de5 fix: 解决连续创建多个指令 2024-03-19 18:23:10 +08:00
yanps
ecbf9077c7 opt: 自动门优化 2024-03-19 13:08:35 +08:00
6903bdfa6d add: 行架缓存为页面 2024-03-18 11:03:09 +08:00
2fa7a54247 add: 行架缓存为页面 2024-03-18 10:59:44 +08:00
5303bf4828 Merge remote-tracking branch 'origin/master' 2024-03-18 08:46:07 +08:00
0783af09c2 fix: 堆垛机联调 2024-03-18 08:45:37 +08:00
yanps
c83881410f opt: 流量限制优化 2024-03-15 09:11:49 +08:00
5ad7a02093 rev:解决联调问题 2024-03-14 18:02:00 +08:00
yanps
f90070f8e5 fix: 修复入烘箱不创建第二条指令问题 2024-03-11 17:15:37 +08:00
f4e14eb6ba rev:修复报错 2024-03-11 14:19:28 +08:00
e19fa045a3 rev:设备监控优化 2024-03-11 14:08:36 +08:00
4d18c231b9 fix: 行架对接位添加 2024-03-11 13:55:10 +08:00
yanps
19615e8ca7 opt: 路由同步,设备监控优化 2024-03-08 09:52:05 +08:00
0b7945a149 rev:新增请求接口,驱动代码优化 2024-03-07 18:12:53 +08:00
f16b6a6795 fix:国际化导包报错 2024-03-06 13:19:19 +08:00
832366d6d6 测试 2024-03-06 09:59:53 +08:00
yanps
385fc2dac1 opt: 更改创建者显示,页面优化 2024-03-05 17:52:04 +08:00
bf36bed276 fix :判断光电信号 2024-03-04 16:23:02 +08:00
d4593bbf8f fix :国际化修改 2024-03-01 14:05:31 +08:00
36155bac2e fix :国际化修改 2024-02-29 14:45:10 +08:00
881ade414e Merge remote-tracking branch 'origin/master' 2024-02-29 13:14:05 +08:00
864990b446 fix :修改 2024-02-29 13:13:32 +08:00
f278b71ca0 rev:优化 2024-02-29 10:38:29 +08:00
1608d34733 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java
#	acs2/nladmin-ui/src/views/system/monitor/device/index.vue
2024-02-29 10:37:12 +08:00
544e5dfaea add:新增后端二楼驱动国际化 2024-02-29 10:30:48 +08:00
yanps
ae3b25f35a opt: 异常日志,流量限制,创建任务优化 2024-02-28 16:35:50 +08:00
c010166c28 add :堆垛机异样处理 2024-02-28 16:14:34 +08:00
42e572a003 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties
#	acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties
#	acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_in_ID.properties
#	acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties
2024-02-26 16:33:08 +08:00