Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 9ecc870369 opt:优化子卷装箱校验逻辑 gongbaoxiong 2024-06-30 18:10:59 +08:00
• 1206370204 fix: 字符拼接 liyongde 2024-06-30 17:56:23 +08:00
• 7caf3d0f97 Merge remote-tracking branch 'origin/b_lms' into master_merge liyongde 2024-06-30 16:05:34 +08:00
• 1f9ee5dfe7 rev:删除agv进出自动门对烘箱逻辑判断 tuqiang 2024-06-30 15:34:24 +08:00
• 1b3075007d Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge zhouz 2024-06-30 15:19:00 +08:00
• 35ccff0564 fix:重量校验 zhouz 2024-06-30 15:18:44 +08:00
• 17032c858a opt: 备货区与气胀轴库优化-前端 liyongde 2024-06-30 14:24:14 +08:00
• eb95498a07 opt: 备货区与气胀轴库优化 liyongde 2024-06-30 14:22:54 +08:00
• 8c8c08b8f3 Merge remote-tracking branch 'origin/b_lms' into master_merge liyongde 2024-06-30 10:43:33 +08:00
• 23bfb3ce1c fix:修复修改密码报错问题 tuqiang 2024-06-30 09:52:27 +08:00
• 170f925202 Merge remote-tracking branch 'origin/b_lms' into b_lms liyongde 2024-06-30 09:49:43 +08:00
• 274fd9f624 feat: 套轴异常处理情况v1 liyongde 2024-06-30 09:49:31 +08:00
• 0750e6c16f fix: bug修复 lishuai 2024-06-30 09:31:54 +08:00
• c0ba71e24b Merge branch 'refs/heads/b_lms' into master_merge zhouz 2024-06-29 21:53:14 +08:00
• 79d0e10a43 fix:WQL文件修改 zhouz 2024-06-29 21:52:46 +08:00
• 371cc4abee Merge branch 'refs/heads/b_lms' into master_merge zhouz 2024-06-29 19:10:34 +08:00
• 236ef6bedb Merge remote-tracking branch 'origin/b_lms' into b_lms zhouz 2024-06-29 19:09:52 +08:00
• 3ca403632d fix:WQL合并 zhouz 2024-06-29 19:09:29 +08:00
• 964ce2a306 fix: 备货纸管扣除 liyongde 2024-06-29 18:12:21 +08:00
• 9e32eca116 fix:WQL修改 zhouz 2024-06-29 17:55:59 +08:00
• 3886dce826 fix: 纸管信息 liyongde 2024-06-29 17:34:46 +08:00
• 2e69177359 Merge branch 'refs/heads/b_lms' into master_merge zhouz 2024-06-29 16:50:20 +08:00
• 0fd7a3cf64 add:增加二次分配请求频繁处理 gongbaoxiong 2024-06-29 16:45:31 +08:00
• 43d7236761 fix: 二次分配任务指令前端添加字段 lishuai 2024-06-29 16:41:54 +08:00
• 23c7d3ab4a fix:WQL优化 zhouz 2024-06-29 16:40:24 +08:00
• f8d9ad12e4 fix:MES变更库区 zhouz 2024-06-29 16:37:34 +08:00
• c79bd1a186 add:增加二次分配请求频繁处理 gongbaoxiong 2024-06-29 15:49:55 +08:00
• 022eff8245 Merge remote-tracking branch 'origin/master' lishuai 2024-06-29 15:11:05 +08:00
• 47613fdbbc fix: 仙宫日志添加 lishuai 2024-06-29 15:10:35 +08:00
• d851b6c6ba fix: 备货区任务修改 liyongde 2024-06-29 14:10:32 +08:00
• 898b1ab452 fix:下发电气信号添加区域 zhouz 2024-06-29 13:59:56 +08:00
• a96df9b8a6 fix:套管优化 zhouz 2024-06-29 13:19:49 +08:00
• ad068ed538 Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge zhouz 2024-06-29 10:48:28 +08:00
• 946857d454 fix:问题优化 zhouz 2024-06-29 10:48:17 +08:00
• 1a86159e34 add:增加自动执行等待的桁架任务 gongbaoxiong 2024-06-29 09:21:25 +08:00
• 830a523d56 rev：木箱类型 liuxy 2024-06-28 16:31:32 +08:00
• a627c9c74c opt: 优化 yanps 2024-06-28 16:06:14 +08:00
• ed59096b16 opt: 添加普通站点取货完成反馈 yanps 2024-06-28 16:04:18 +08:00
• 956e6c99df add：木箱类型 liuxy 2024-06-28 15:13:10 +08:00
• 66212b6ed4 fix: 手持下拉框 liyongde 2024-06-28 14:59:21 +08:00
• e17eed36ca fix: 手持点位下拉框过滤 liyongde 2024-06-28 14:49:30 +08:00
• a7bd40dcbd fix: 备货区反馈acs纸管信息改为string liyongde 2024-06-28 14:44:17 +08:00
• b9cf783ccd fix: 97信号校验 liyongde 2024-06-28 13:58:52 +08:00
• 5b96e256ad Merge branch 'master' of 121.40.234.130:root/lanzhouhailiang_one yanps 2024-06-28 11:29:04 +08:00
• 6955df3274 opt: 取货完成反馈日志优化 yanps 2024-06-28 11:28:54 +08:00
• 9d8e61c259 add:添加行架-agv对接位取货完成反馈 yanps 2024-06-28 11:27:19 +08:00
• f614e469cb fix: 日志更新 lishuai 2024-06-28 10:37:15 +08:00
• 142fc1dfea rev: 二期出库报错修改 liuxy 2024-06-28 10:31:23 +08:00
• c053f7a2dd fix：二期出库完成报错bug修复 liuxy 2024-06-28 10:13:23 +08:00
• 217e8d86d2 Merge remote-tracking branch 'origin/b_lms' into master_merge liyongde 2024-06-28 09:19:18 +08:00
• aa53ece8ab rev:优化日志检索页面 tuqiang 2024-06-28 09:08:04 +08:00
• b0d72c6db7 fix: 1、分切下料缓存 2、内包间新增97信号直接套轴完成 3、手持分切暂存送料到内包间 4、手持清理分切暂存数据 liyongde 2024-06-28 09:06:08 +08:00
• 2874439aa1 Merge remote-tracking branch 'origin/b_lms' into b_lms gongbaoxiong 2024-06-28 01:30:16 +08:00
• a9ef3d8f69 fix:增加二次分配任务重复校验 gongbaoxiong 2024-06-28 01:30:03 +08:00
• 2134dcfd33 rev 对接工位信号写入 USER-20220102CG\noblelift 2024-06-27 20:35:45 +08:00
• ce1d9377d5 opt tuqiang 2024-06-27 18:50:58 +08:00
• d5fc48cc85 Merge remote-tracking branch 'origin/master' tuqiang 2024-06-27 18:49:04 +08:00
• 8762465bba rev:优化异常分切行架任务排序 tuqiang 2024-06-27 18:48:41 +08:00
• df318c8e45 add: 添加行架-agv对接位取货完成反馈LMS yanps 2024-06-27 18:47:46 +08:00
• 97a3bb970a rev:优化分切行架任务排序 tuqiang 2024-06-27 18:34:06 +08:00
• 81201f1bf8 opt: 取消行架-agv对接位的取货放货完成校验 yanps 2024-06-27 17:15:14 +08:00
• 3d1bada4c9 add: 添加AGV进入离开烘箱区域反馈,下发管芯托盘信息 yanps 2024-06-27 17:01:01 +08:00
• 2a370376be Merge remote-tracking branch 'origin/master_merge' into master_merge zhouz 2024-06-27 17:00:21 +08:00
• 430f4c795a fix:WQL更新 zhouz 2024-06-27 16:58:02 +08:00
• e88415bada Merge remote-tracking branch 'origin/b_lms' into master_merge liyongde 2024-06-27 16:00:57 +08:00
• cd7c68d61d fix:代码合并 zhouz 2024-06-27 15:56:08 +08:00
• cab08052ec 代码合并 zhouz 2024-06-27 15:23:15 +08:00
• 1cbbe0a9fd Merge remote-tracking branch 'origin/b_lms' into b_lms liyongde 2024-06-27 15:20:06 +08:00
• c9c93cd2cc fix: api错误 liyongde 2024-06-27 15:19:36 +08:00
• a714b8e2d6 fix:修复前端子卷号重复校验 gongbaoxiong 2024-06-27 15:11:31 +08:00
• 39f10ae18f rev：代码合并 liuxy 2024-06-27 15:09:32 +08:00
• 07452b1630 Merge branch 'b_lms' into master_merge liuxy 2024-06-27 15:08:28 +08:00
• cf0368756e fix：二期出库打印无法打印发货单 liuxy 2024-06-27 15:05:42 +08:00
• 2a92d9b11e fix: 追加诺宝封口 lishuai 2024-06-27 14:05:57 +08:00
• cba03a45ad Merge branch 'refs/heads/b_lms' into master_merge zhouz 2024-06-27 11:04:21 +08:00
• 590e7ec713 fix:websocket更新 zhouz 2024-06-27 11:03:47 +08:00
• 250280db08 add: 添加二次分配顶点任务 lishuai 2024-06-27 09:43:20 +08:00
• 759deb6f34 add: 添加二次分配顶点任务 lishuai 2024-06-27 09:35:47 +08:00
• 5b1c96f39f add: 添加二次分配顶点任务 lishuai 2024-06-27 09:32:39 +08:00
• d1a269d284 fix:优化 zhouz 2024-06-27 09:27:01 +08:00
• 2ae476a67a Merge pull request 'b_lms_master_merge' (#3) from b_lms into master_merge 龚宝雄 2024-06-27 08:54:19 +08:00
• 18ea719b9f Merge remote-tracking branch 'origin/b_lms' into b_lms gongbaoxiong 2024-06-27 08:49:12 +08:00
• 0fac3a2554 fix:修复前端子卷号重复校验 gongbaoxiong 2024-06-27 08:48:41 +08:00
• 6240eb9a72 代码合并 zhouz 2024-06-26 23:09:09 +08:00
• 32188cc4fe Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms zhouz 2024-06-26 21:49:24 +08:00
• 2fad0075c6 fix:MES相关优化 zhouz 2024-06-26 21:49:19 +08:00
• 35d18e93b0 remove: 去除备注 liyongde 2024-06-26 17:46:19 +08:00
• 0473d9529e rev：空木箱入库：优先将相同木箱规格的木箱放在同一深浅货位 liuxy 2024-06-26 17:13:34 +08:00
• ea8b70ec38 fix:修复前端子卷规格无法显示问题 gongbaoxiong 2024-06-26 14:17:15 +08:00
• 4d729392c9 fix:修复前端子卷规格无法显示问题，装箱对接位子卷装箱数量问题 gongbaoxiong 2024-06-26 12:46:51 +08:00
• a0a7240975 fix: 堆垛机command顺序修改 lishuai 2024-06-26 10:31:34 +08:00
• bd153c9044 add:增加二次分配代码逻辑 gongbaoxiong 2024-06-25 19:06:07 +08:00
• fb6fe5f0b5 Merge remote-tracking branch 'remotes/origin/b_lms' into master_merge liuxy 2024-06-25 17:41:06 +08:00
• 2f396a9a71 add：仓位页面新增 巷道管理 liuxy 2024-06-25 17:10:06 +08:00
• 968e2540a6 fix: 堆垛机command顺序修改 lishuai 2024-06-25 15:13:13 +08:00
• 18cc9ccb61 fix: 诺宝修改 lishuai 2024-06-25 14:59:13 +08:00
• a52386ddcb fix: 诺宝修改 lishuai 2024-06-25 14:58:37 +08:00
• 43d4d66d61 Merge remote-tracking branch 'origin/master' lishuai 2024-06-25 14:56:08 +08:00
• 036f38c00e fix: 诺宝修改 lishuai 2024-06-25 14:55:40 +08:00
• 94aa93b096 Merge branch 'b_lms' into master_merge liuxy 2024-06-24 17:47:15 +08:00