Commit Graph

118 Commits

Author SHA1 Message Date
yanps
0a3772f510 opt: 现场与设备联调测试优化 2024-04-13 10:00:05 +08:00
0bcffd1d63 add:强制完成添加 2024-04-10 17:20:04 +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
yanps
d4c89bc50f opt: 三色灯回退,OPC连接优化 2024-02-23 15:38:33 +08:00
yanps
8966921312 opt: 输送线优化和界面优化 2024-01-26 17:49:35 +08:00
yanps
f2fb475e2e fix: 修复烘箱行架不给2的问题 2024-01-24 13:38:13 +08:00
yanps
d104a41d39 add: 添加AGV取放烘箱对接位校验,添加创建任务权限控制 2024-01-23 15:04:16 +08:00
yanps
37ac298f91 opt: 内包间优化 2024-01-22 19:27:06 +08:00
yanps
42cd7d1258 add: 添加插拔机取货完成反馈 2024-01-17 18:57:02 +08:00
USER-20220102CG\noblelift
d238f62957 rev 更新日志 2024-01-16 20:04:44 +08:00
yanps
fb79480ae1 add: 内包间日志增加 2024-01-09 09:30:09 +08:00
yanps
ad01512522 opt: 内包间A1优化 2024-01-06 18:18:39 +08:00
yanps
f69d754c9c add: 烘箱行架增加日志和套轴等待 2024-01-04 09:36:49 +08:00
fc48074907 fix:rgv行架冲突问题 2023-12-26 10:24:22 +08:00
yanps
b3554a7c63 fix: 申请套管修复 2023-12-22 13:53:11 +08:00
bc4142feb5 fix:现场测试,大屏显示修改 2023-12-20 11:32:14 +08:00
0b764880ad Merge remote-tracking branch 'origin/master' 2023-12-19 09:29:19 +08:00
7085c09289 fix:调试修改 2023-12-19 09:28:54 +08:00
yanps
f35bb8e115 fix: 创建任务模板修改 2023-12-17 11:45:52 +08:00
yanps
870eddad41 fix: 纸管库出货数量数据格式修改 2023-12-14 15:52:46 +08:00
yanps
4338fe8955 opt: 优化设备监控中的纸管库 2023-12-14 13:50:12 +08:00
yanps
d14c0dfa9b opt: 优化创建任务的参数和页面 2023-12-13 18:01:07 +08:00
yanps
d3dbb4191f add: 添加创建任务的字段 2023-12-13 15:55:28 +08:00
b98beff8ce rev 优化 2023-12-13 14:59:06 +08:00
188e46b0fb add:新增rgv驱动 2023-12-11 16:12:11 +08:00
c74ab66fdd opt:内包间行架,输送线出口位驱动优化 2023-11-10 10:38:27 +08:00
yanps
7ec5df941c opt: 纸管库,套管工位驱动优化 2023-11-09 14:06:57 +08:00
f36891047d rev 内包间行架 2023-11-09 10:02:16 +08:00
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
cf9213eab4 add:新增内包间行架驱动 2023-11-07 11:01:34 +08:00
yanps
4d53aaaf4e 纸管库和套管工位驱动 2023-11-07 10:57:10 +08:00
yanps
2e634be0ce 纸管库和套管工位驱动编写 2023-11-07 10:47:16 +08:00
737dbd336e add:对烘箱对接位添加允许强制进入功能 2023-10-26 18:31:01 +08:00
USER-20220102CG\noblelift
9224b0d07c rev 修复任务指令内存问题 2023-10-19 11:28:09 +08:00
USER-20220102CG\noblelift
33b546032f rev 2023-08-28 20:27:16 +08:00
USER-20220102CG\noblelift
b1a54910c1 rev 监控图片地址修改 2023-08-21 14:58:34 +08:00
张江玮
72666b45a6 add 反馈设备状态 2023-08-09 17:25:21 +08:00
pangshenghao
52b234ff9c 页面fix 2023-06-06 10:33:04 +08:00
pangshenghao
b54501fb43 页面新增 2023-06-05 13:28:33 +08:00
pangshenghao
f6d11509b7 立库设备状态同步 2023-06-05 09:34:42 +08:00
pangshenghao
bbdfe376d6 页面新增字段 2023-06-01 15:14:45 +08:00
USER-20220102CG\noblelift
a429621f46 fix agv状态显示 2023-06-01 09:48:21 +08:00
5af9c6d6e8 add 载具号提示 2023-05-08 20:35:46 +08:00
20af7e5b14 rev 下发信号 2023-05-08 11:01:05 +08:00
686a6b2a0b rev 手动补条码 2023-05-06 10:25:49 +08:00
USER-20220102CG\noblelift
6b5d0b4473 fix 纸管库 2023-04-26 19:00:36 +08:00
821741ba84 add 新增需求 2023-04-23 17:14:57 +08:00
USER-20220102CG\noblelift
49a0c61938 add 纸管库、立库接口 2023-04-18 21:25:06 +08:00
USER-20220102CG\noblelift
5dff029c15 更新 2023-04-06 20:35:52 +08:00
5f0b3c40e9 更新 2023-03-27 10:57:27 +08:00