Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 64b5a0412e fix:生箔工序优化 zhouz 2024-07-12 18:54:35 +08:00
• 9326c96f31 fix:生箔工序优化 zhouz 2024-07-12 18:45:13 +08:00
• 943acd1b4c fix:临时增加多个卷装一箱方案 gongbaoxiong 2024-07-12 17:13:45 +08:00
• e7d376f784 fix:补空任务限制为2 gongbaoxiong 2024-07-12 14:29:29 +08:00
• ee2561a19b fix:修改点位库存修改问题 gongbaoxiong 2024-07-12 14:18:56 +08:00
• 24b45d33c2 opt:优化取空载具逻辑 gongbaoxiong 2024-07-12 12:46:09 +08:00
• cefdb02a7b Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2024-07-12 11:27:41 +08:00
• 4a0269f63a fix: 改制用母卷为空做判断 liyongde 2024-07-12 11:27:19 +08:00
• 38f2e933ef opt:优化二次分配日志记录 gongbaoxiong 2024-07-12 10:21:57 +08:00
• 4bc1860944 opt:优化二次分配日志记录 gongbaoxiong 2024-07-12 09:35:02 +08:00
• 1702a4558c Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2024-07-12 09:17:26 +08:00
• 886c8af826 add: 手持维护气胀轴库库存信息 liyongde 2024-07-12 09:16:55 +08:00
• af9192bee8 fix:增加桁架任务及二次分配任务完成情况校验 gongbaoxiong 2024-07-11 21:39:19 +08:00
• 62774053a3 fix:增加桁架任务及二次分配任务完成情况校验 gongbaoxiong 2024-07-11 19:26:58 +08:00
• e3da38f4f9 Merge branch 'b_lms' into master_merge liuxy 2024-07-11 14:50:10 +08:00
• 23cd49cfb3 add：木箱信息页面 liuxy 2024-07-11 14:47:17 +08:00
• 94a7b5b431 Merge remote-tracking branch 'origin/master_merge' into master_merge gongbaoxiong 2024-07-11 09:39:20 +08:00
• 52cc5d7dfd fix:增加二次分配任务完成情况校验 gongbaoxiong 2024-07-11 09:39:11 +08:00
• 3b4fdf64dd fix: 单元测试 lishuai 2024-07-11 09:33:48 +08:00
• ae0b82dd04 fix:生箔工序优化、出库托盘、木箱解绑 zhouz 2024-07-11 09:17:01 +08:00
• 600076bc59 Merge remote-tracking branch 'origin/master' lishuai 2024-07-11 08:42:40 +08:00
• 22944ce7ea fix: 堆叠行架修改、日志优化、定时器优化 lishuai 2024-07-11 08:42:17 +08:00
• 8884ef7c59 fix:增加二次分配任务完成情况校验 gongbaoxiong 2024-07-10 22:53:06 +08:00
• db067c980a Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2024-07-10 18:54:44 +08:00
• 192ff5f65a fix: 回滚 liyongde 2024-07-10 18:54:24 +08:00
• b4c7444670 fix: 分切计划维护结束时间 liyongde 2024-07-10 18:52:13 +08:00
• 4b75167f19 add: 添加LMS下发信号到西门子称重位 yanps 2024-07-10 17:52:11 +08:00
• ed493f29fa Merge branch 'master' into master_merge liuxy 2024-07-10 13:58:56 +08:00
• ccbfb652ec fix:增加已分配满轴点位判断 gongbaoxiong 2024-07-10 13:06:01 +08:00
• f362699d28 fix:增加已分配满轴点位判断 gongbaoxiong 2024-07-10 11:05:12 +08:00
• d1861b5fd5 Merge branch 'b_lms' into master_merge liuxy 2024-07-10 10:32:51 +08:00
• ab1235c584 rev：发货任务二次分配新增逻辑判断 liuxy 2024-07-10 10:32:02 +08:00
• 25730dfb22 fix:增加已分配执行中的空载具任务判断 gongbaoxiong 2024-07-10 08:51:32 +08:00
• 93c1c11f04 rev:出库报表新增原销售订单 liuxy 2024-07-10 08:51:07 +08:00
• 8287c2d0c2 Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2024-07-09 23:15:34 +08:00
• c8004cf002 fix: 定时任务新增指定调度IP liyongde 2024-07-09 23:14:59 +08:00
• 1105f0dd28 fix:获取堆叠模版优化 zhouz 2024-07-09 19:19:14 +08:00
• aa86828ea2 Merge remote-tracking branch 'origin/master_merge' into master_merge zhouz 2024-07-09 19:13:48 +08:00
• 2c7bb98af5 fix:获取堆叠模版优化 zhouz 2024-07-09 19:09:27 +08:00
• c29798e1b3 fix:获取堆叠模版优化 zhouz 2024-07-09 19:08:53 +08:00
• 35550db2a7 Merge branch 'b_lms' into master_merge liuxy 2024-07-09 16:16:28 +08:00
• 0b7f0783e7 rev：出库明细更新状态修改 liuxy 2024-07-09 16:12:59 +08:00
• 9397be254d fix:增加放货类型判断 gongbaoxiong 2024-07-09 15:29:06 +08:00
• b029409489 fix:增加放货类型判断 gongbaoxiong 2024-07-09 15:28:28 +08:00
• d9cff93a11 fix: 分切下料去除B1 liyongde 2024-07-09 15:21:10 +08:00
• 254b4f4a65 rev：返检/改切出库回传删除子卷包装关系，成品入库报表新增查询条件 liuxy 2024-07-09 14:42:54 +08:00
• 44ed477346 opt: 接口日志显示优化 yanps 2024-07-09 13:40:06 +08:00
• d652148c1f Merge remote-tracking branch 'origin/master' lishuai 2024-07-09 13:28:27 +08:00
• 6b82cc7967 fix: 异步循环依赖报错 lishuai 2024-07-09 13:28:08 +08:00
• c660472ae9 Merge remote-tracking branch 'origin/master_merge' into master_merge zhouz 2024-07-09 12:49:51 +08:00
• 3c443bc438 fix:库存更新优化 zhouz 2024-07-09 12:49:26 +08:00
• 42d280edd7 Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2024-07-09 10:44:57 +08:00
• b343a5c054 remove：手持绑定数据不在根据气胀轴上下轴赋值 liyongde 2024-07-09 10:44:42 +08:00
• b38e1152ac add:新增agv交互逻辑 tuqiang 2024-07-09 10:29:46 +08:00
• a7f879588c Merge remote-tracking branch 'origin/master_merge' into master_merge zhouz 2024-07-09 10:28:28 +08:00
• da43d91708 fix:捆扎优化 zhouz 2024-07-09 10:28:03 +08:00
• a0b7e39b4d fix:修复清除点位库存bug gongbaoxiong 2024-07-09 10:13:01 +08:00
• a231610675 fix：日志打印 liyongde 2024-07-09 09:49:53 +08:00
• d9a12ca3df fix: 配置文件修改 lishuai 2024-07-09 08:57:03 +08:00
• 486a7708b1 fix: 日志优化，任务指令异步 lishuai 2024-07-09 08:50:30 +08:00
• 4801eb9271 fix:修复清除点位库存bug gongbaoxiong 2024-07-08 21:04:50 +08:00
• 325da2be8f opt:优化取货完成点位修改 gongbaoxiong 2024-07-08 18:34:56 +08:00
• 769081dc48 Merge remote-tracking branch 'origin/master_merge' into master_merge zhouz 2024-07-08 17:28:03 +08:00
• 313b9182c0 fix:出库代码优化 zhouz 2024-07-08 17:27:47 +08:00
• da4d4c0352 Merge remote-tracking branch 'origin/master' lishuai 2024-07-08 17:26:18 +08:00
• 050daf64d6 opt: 页面国际化,agv货位地址优化 yanps 2024-07-08 16:58:39 +08:00
• ec073ecb03 opt:优化取货完成点位修改 gongbaoxiong 2024-07-08 16:57:14 +08:00
• 344a20d331 Merge branch 'b_lms' into master_merge liuxy 2024-07-08 16:46:08 +08:00
• 2b37eea4a0 revb：二期移库修改 liuxy 2024-07-08 16:14:54 +08:00
• 79bd061eac opt:桁架任务未完成取空载具不分配点位 gongbaoxiong 2024-07-08 16:06:25 +08:00
• 83cc93e573 Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2024-07-08 15:50:22 +08:00
• b3e62b8d47 fix：内包间套轴异常处理 liyongde 2024-07-08 15:49:56 +08:00
• 447c175049 fix: 内包间优化 lishuai 2024-07-08 13:44:20 +08:00
• f2b969fcbb opt:桁架任务未完成取空载具不分配点位 gongbaoxiong 2024-07-08 13:42:17 +08:00
• 7ef201a891 opt:暂时注释无子卷包装关系报错 gongbaoxiong 2024-07-08 11:32:13 +08:00
• 2fe2d685af opt:优化二次分配任务类型判断逻辑 gongbaoxiong 2024-07-08 11:14:00 +08:00
• 5698d4165e Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2024-07-08 10:28:37 +08:00
• 2e20507052 fix： 绑定子卷 liyongde 2024-07-08 10:28:08 +08:00
• 3eb7fda866 opt:成品入库修改空载具任务触发逻辑 gongbaoxiong 2024-07-08 09:39:29 +08:00
• 476a761699 Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2024-07-08 09:30:51 +08:00
• 37471bec9a feat: 优化、新增B1车间分切 liyongde 2024-07-08 09:30:13 +08:00
• deddeb1f26 fix:代码合并 zhouz 2024-07-08 09:26:13 +08:00
• d62c155d92 fix:B1生箔、烘箱、分切上料流程修改 zhouz 2024-07-08 09:18:42 +08:00
• b64b216e23 rev：木箱重量异常通知飞书 liuxy 2024-07-08 08:47:32 +08:00
• ac229c4823 opt:成品入库修改被注释的空木箱MES查询 gongbaoxiong 2024-07-07 14:21:07 +08:00
• 59dace36a0 rev：去除jetcache框架(存在bug) ludj 2024-07-07 13:29:13 +08:00
• d810379d1e rev:优化测试出现的问题 tuqiang 2024-07-06 17:30:10 +08:00
• 4f678392e0 Merge remote-tracking branch 'origin/master' lishuai 2024-07-06 16:20:53 +08:00
• d1dcf6a200 fix: rgv、标准版机械手、定时删除Lucene日志 lishuai 2024-07-06 16:20:32 +08:00
• cc2c7dd47a opt:装箱区补空载具优先补外侧区域 gongbaoxiong 2024-07-06 15:38:45 +08:00
• 7d83dbab58 opt:去除一楼内包间所有任务下发ACS的子卷号 gongbaoxiong 2024-07-06 14:50:14 +08:00
• b2a1e57417 opt:去除一楼内包间所有任务下发ACS的子卷号 gongbaoxiong 2024-07-06 14:37:23 +08:00
• fd1961181c opt:优化子卷装箱逻辑 gongbaoxiong 2024-07-06 08:34:51 +08:00
• b30fb9cfca opt:优化子卷装箱逻辑 gongbaoxiong 2024-07-05 22:14:15 +08:00
• 6cc8921e1b opt:优化满轴位满或空载具位空的行架任务 gongbaoxiong 2024-07-05 16:42:37 +08:00
• c927e79704 opt:优化一楼子卷下卷桁架任务放货动作 gongbaoxiong 2024-07-05 14:16:54 +08:00
• c95dc50c49 rev:优化测试出现的问题 tuqiang 2024-07-04 18:39:47 +08:00
• 5ac116d1f0 fix:查询木箱信息优化 zhouz 2024-07-04 18:07:09 +08:00
• 8cb1cf1a09 Merge branch 'refs/heads/b_lms' into master_merge zhouz 2024-07-04 15:32:01 +08:00
• f0d1390ed7 Merge remote-tracking branch 'origin/master_merge' into master_merge zhouz 2024-07-04 15:31:19 +08:00