Commit Graph

2612 Commits

Author SHA1 Message Date
zhouz
c660472ae9 Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-07-09 12:49:51 +08:00
zhouz
3c443bc438 fix:库存更新优化 2024-07-09 12:49:26 +08:00
42d280edd7 Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-07-09 10:44:57 +08:00
b343a5c054 remove:手持绑定数据不在根据气胀轴上下轴赋值 2024-07-09 10:44:42 +08:00
b38e1152ac add:新增agv交互逻辑 2024-07-09 10:29:46 +08:00
zhouz
a7f879588c Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-07-09 10:28:28 +08:00
zhouz
da43d91708 fix:捆扎优化 2024-07-09 10:28:03 +08:00
a0b7e39b4d fix:修复清除点位库存bug 2024-07-09 10:13:01 +08:00
a231610675 fix:日志打印 2024-07-09 09:49:53 +08:00
d9a12ca3df fix: 配置文件修改 2024-07-09 08:57:03 +08:00
486a7708b1 fix: 日志优化,任务指令异步 2024-07-09 08:50:30 +08:00
4801eb9271 fix:修复清除点位库存bug 2024-07-08 21:04:50 +08:00
325da2be8f opt:优化取货完成点位修改 2024-07-08 18:34:56 +08:00
zhouz
769081dc48 Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-07-08 17:28:03 +08:00
zhouz
313b9182c0 fix:出库代码优化 2024-07-08 17:27:47 +08:00
da4d4c0352 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv_car/XgAgvCarDeviceDriver.java
2024-07-08 17:26:18 +08:00
yanps
050daf64d6 opt: 页面国际化,agv货位地址优化 2024-07-08 16:58:39 +08:00
ec073ecb03 opt:优化取货完成点位修改 2024-07-08 16:57:14 +08:00
344a20d331 Merge branch 'b_lms' into master_merge 2024-07-08 16:46:08 +08:00
2b37eea4a0 revb:二期移库修改 2024-07-08 16:14:54 +08:00
79bd061eac opt:桁架任务未完成取空载具不分配点位 2024-07-08 16:06:25 +08:00
83cc93e573 Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-07-08 15:50:22 +08:00
b3e62b8d47 fix:内包间套轴异常处理 2024-07-08 15:49:56 +08:00
447c175049 fix: 内包间优化 2024-07-08 13:44:20 +08:00
f2b969fcbb opt:桁架任务未完成取空载具不分配点位 2024-07-08 13:42:17 +08:00
7ef201a891 opt:暂时注释无子卷包装关系报错 2024-07-08 11:32:13 +08:00
2fe2d685af opt:优化二次分配任务类型判断逻辑 2024-07-08 11:14:00 +08:00
5698d4165e Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-07-08 10:28:37 +08:00
2e20507052 fix: 绑定子卷 2024-07-08 10:28:08 +08:00
3eb7fda866 opt:成品入库修改空载具任务触发逻辑 2024-07-08 09:39:29 +08:00
476a761699 Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-07-08 09:30:51 +08:00
37471bec9a feat: 优化、新增B1车间分切 2024-07-08 09:30:13 +08:00
zhouz
deddeb1f26 fix:代码合并 2024-07-08 09:26:13 +08:00
zhouz
d62c155d92 fix:B1生箔、烘箱、分切上料流程修改 2024-07-08 09:18:42 +08:00
b64b216e23 rev:木箱重量异常通知飞书 2024-07-08 08:47:32 +08:00
ac229c4823 opt:成品入库修改被注释的空木箱MES查询 2024-07-07 14:21:07 +08:00
ludj
59dace36a0 rev:去除jetcache框架(存在bug) 2024-07-07 13:29:13 +08:00
d810379d1e rev:优化测试出现的问题 2024-07-06 17:30:10 +08:00
4f678392e0 Merge remote-tracking branch 'origin/master' 2024-07-06 16:20:53 +08:00
d1dcf6a200 fix: rgv、标准版机械手、定时删除Lucene日志 2024-07-06 16:20:32 +08:00
cc2c7dd47a opt:装箱区补空载具优先补外侧区域 2024-07-06 15:38:45 +08:00
7d83dbab58 opt:去除一楼内包间所有任务下发ACS的子卷号 2024-07-06 14:50:14 +08:00
b2a1e57417 opt:去除一楼内包间所有任务下发ACS的子卷号 2024-07-06 14:37:23 +08:00
fd1961181c opt:优化子卷装箱逻辑 2024-07-06 08:34:51 +08:00
b30fb9cfca opt:优化子卷装箱逻辑 2024-07-05 22:14:15 +08:00
6cc8921e1b opt:优化满轴位满或空载具位空的行架任务 2024-07-05 16:42:37 +08:00
c927e79704 opt:优化一楼子卷下卷桁架任务放货动作 2024-07-05 14:16:54 +08:00
c95dc50c49 rev:优化测试出现的问题 2024-07-04 18:39:47 +08:00
zhouz
5ac116d1f0 fix:查询木箱信息优化 2024-07-04 18:07:09 +08:00
zhouz
8cb1cf1a09 Merge branch 'refs/heads/b_lms' into master_merge 2024-07-04 15:32:01 +08:00