Commit Graph

383 Commits

Author SHA1 Message Date
yanps
6f7db9502c fix: 分切行架任务就绪不下发 2024-01-10 11:11:36 +08:00
yanps
cbe1348684 opt: 内包间日志优化 2024-01-09 16:50:38 +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
yanps
8e5c76a0a1 fix: 行架任务被分切输送线截取 2023-12-31 09:10:09 +08:00
yanps
624898d4fb fix:内包间行架 2023-12-29 13:36:20 +08:00
d296565a51 fix:内包间行架日志添加 2023-12-28 09:32:12 +08:00
f1e4d5f3f8 fix:内包间行架rgv问题修复 2023-12-27 16:51:41 +08:00
c5915c8434 fix:内包间行架rgv问题修复 2023-12-27 15:47:09 +08:00
d53c970bf0 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java
2023-12-27 10:32:42 +08:00
6e5ba08885 fix:内包间行架rgv问题修复 2023-12-27 10:29:08 +08:00
yanps
adc6d7f74d opt: 优化内包间行架任务下发 2023-12-26 21:55:40 +08:00
116f8a0cfe Merge remote-tracking branch 'origin/master' 2023-12-26 19:34:17 +08:00
7739e9062b fix:rgv行架冲突问题 2023-12-26 19:33:19 +08:00
ludj
0ec00360d5 rev:去掉ACS的SWAGGER、日志修改 2023-12-26 16:51:54 +08:00
fc48074907 fix:rgv行架冲突问题 2023-12-26 10:24:22 +08:00
2677fa3a39 fix:载具还没横移,下发in到载具任务问题解决 2023-12-25 17:00:53 +08:00
2287effa7c Merge remote-tracking branch 'origin/master' 2023-12-25 12:36:58 +08:00
9dcef9e939 fix:提前完场任务 2023-12-25 12:36:29 +08:00
cbebb04175 rev:解决异步多次请求 2023-12-25 11:15:15 +08:00
885d1ec962 fix:反馈尺寸太慢 2023-12-24 09:55:41 +08:00
460e6ebadc fix:日志修改 2023-12-23 17:34:35 +08:00
74385c16a6 fix: out到in点修改 2023-12-23 08:45:07 +08:00
yanps
3e6099da0e fix: 西门子输送线横移修复 2023-12-22 14:47:53 +08:00
yanps
7ae3d877f0 Merge branch 'master' of 121.40.234.130:root/lanzhouhailiang_one 2023-12-22 13:53:35 +08:00
yanps
b3554a7c63 fix: 申请套管修复 2023-12-22 13:53:11 +08:00
d6e553d8f5 fix:修改 2023-12-22 13:52:58 +08:00
USER-20220102CG\noblelift
46f36461c2 rev 优化 2023-12-22 09:44:46 +08:00
USER-20220102CG\noblelift
66e6b8f961 REV 接口异步 2023-12-22 03:50:41 +08:00
yanps
ac809deac4 rev 2023-12-21 21:57:37 +08:00
5f8b795902 fix:现场测试 2023-12-20 18:31:21 +08:00
yanps
ee6fd716bc fix: 内包间行架任务被输送线给下发命令 2023-12-20 18:23:30 +08:00
6e425d4b3c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java
2023-12-20 13:39:35 +08:00
bc4142feb5 fix:现场测试,大屏显示修改 2023-12-20 11:32:14 +08:00
yanps
0a6ccbf76b fix: 指令未满足条件,变成执行中 2023-12-20 10:58:01 +08:00
6560d294f8 fix:tosize添加 2023-12-19 09:39:07 +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
USER-20220102CG\noblelift
f04013cf3d rev 更新 2023-12-17 11:37:40 +08:00
yanps
24286d5e57 fix: 修改paper_array的转换异常 2023-12-17 11:03:01 +08:00
be12fd8773 fix:写入修改 2023-12-17 10:53:49 +08:00
USER-20220102CG\noblelift
8b63fa3ae0 rev 修改bug 2023-12-16 10:19:18 +08:00
USER-20220102CG\noblelift
7a43f4679d rev 删除多余日志 2023-12-14 17:45:30 +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
USER-20220102CG\noblelift
b517f41682 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-12-13 15:49:47 +08:00