Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 0814124414 rev：二次分配修改 liuxy 2024-06-24 17:39:45 +08:00
• 431ceba003 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms zhouz 2024-06-24 16:25:46 +08:00
• 87ebb39603 fix:MES对接相关代码优化 zhouz 2024-06-24 16:25:41 +08:00
• 55cd804fa1 fix: 分切对接位区分区域 liyongde 2024-06-24 15:29:49 +08:00
• 4439cc6313 opt: 行架-agv对接位优化写入信号方法 yanps 2024-06-24 14:01:58 +08:00
• 507a440b1e fix:修复拔前行架任务下发出错 tuqiang 2024-06-24 13:14:08 +08:00
• 595d426c15 rev：代码优化 tuqiang 2024-06-24 11:25:18 +08:00
• eaefddd34d rev:现场测试优化 tuqiang 2024-06-24 11:20:43 +08:00
• 8134ecbe96 fix: bug修改 lishuai 2024-06-24 11:12:42 +08:00
• 4422f305a4 add: 当前指令信息 lishuai 2024-06-24 08:59:30 +08:00
• b31a10bb5d Merge remote-tracking branch 'origin/master' lishuai 2024-06-24 08:57:21 +08:00
• b905eacba9 fix: 日志bug修改 lishuai 2024-06-24 08:56:54 +08:00
• c86ee18d3a feat: 内包间不套轴业务 liyongde 2024-06-23 14:50:50 +08:00
• e862d69a16 add:新增二楼ndc驱动日志以及优化拔前行架测试问题 tuqiang 2024-06-23 11:30:51 +08:00
• 74db7e79e0 fix: 修复分切下料AGV任务没校验禁用点位 liyongde 2024-06-22 17:26:10 +08:00
• c11f1ed3af Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms zhouz 2024-06-22 10:48:49 +08:00
• 23a1787e7e fix:发货任务优化 zhouz 2024-06-22 10:48:42 +08:00
• 420ff2fe98 Merge remote-tracking branch 'origin/master' lishuai 2024-06-22 09:13:21 +08:00
• 6c201406e2 fix: 仙宫更新 lishuai 2024-06-22 09:12:48 +08:00
• 5a70b02fc3 rev：合并修改 liuxy 2024-06-21 18:29:43 +08:00
• 3a9e0275e9 Merge branch 'b_lms' into master_merge liuxy 2024-06-21 18:14:34 +08:00
• 387f5a77f8 add:发货新增扩展字段 liuxy 2024-06-21 18:04:20 +08:00
• 1ae38d6d86 rev：修改 liuxy 2024-06-21 14:07:27 +08:00
• 6aa375f195 Merge remote-tracking branch 'origin/b_lms' into b_lms gongbaoxiong 2024-06-21 11:40:28 +08:00
• a9d3f7d1cc add:增加二次分配代码逻辑 gongbaoxiong 2024-06-21 11:40:03 +08:00
• d95ecd0405 fix:出入库代码优化 zhouz 2024-06-21 11:01:02 +08:00
• 7bb3955a40 主分支合并 liuxy 2024-06-21 10:32:26 +08:00
• 413f876247 Merge branch 'master' into master_merge liuxy 2024-06-21 10:26:03 +08:00
• a46c59ac48 rev 拔前行架 wangsong 2024-06-21 10:26:32 +08:00
• c6214fa0fa 分支合并 liuxy 2024-06-21 10:25:34 +08:00
• b8620f0973 Merge branch 'b_lms' into master_merge liuxy 2024-06-21 10:24:13 +08:00
• cbfec25a9f rev：发货区修改 liuxy 2024-06-21 10:23:38 +08:00
• 43baf68a46 rev： 改切出库修改 liuxy 2024-06-21 10:04:42 +08:00
• be809d4132 opt:烘箱监控页面优化 yanps 2024-06-21 09:48:28 +08:00
• 0be3799d6d opt: 国际化,页面优化 yanps 2024-06-21 09:45:04 +08:00
• 769d08d77b Merge remote-tracking branch 'origin/master' lishuai 2024-06-21 09:05:59 +08:00
• c7dd36d940 fix: 叉车二次分配 lishuai 2024-06-21 08:56:49 +08:00
• cdd51816fc rev:优化拔前行架任务下发以及手动创建指令 tuqiang 2024-06-20 20:01:27 +08:00
• 06e7f163e2 Merge remote-tracking branch 'origin/master' lishuai 2024-06-20 18:36:36 +08:00
• 542ad5c293 fix: 26 lishuai 2024-06-20 18:35:59 +08:00
• 1ae9b12cdc Merge branch 'master' into master_merge liuxy 2024-06-20 17:16:42 +08:00
• ee7a406d81 add：1.新增木箱称重校验功能2.输送任务反馈执行中更新木箱毛重 liuxy 2024-06-20 17:07:40 +08:00
• a6be1338da Merge branch 'b_lms' into master_merge liuxy 2024-06-20 11:00:39 +08:00
• d04e626131 rev:发货区修改 liuxy 2024-06-20 10:57:11 +08:00
• 5ce8b8a022 分支合并 liuxy 2024-06-20 09:41:01 +08:00
• de4d79e4a7 Merge branch 'b_lms' into master_merge liuxy 2024-06-20 09:40:21 +08:00
• 3c2da9058f rev：发货任务二次分配修改 liuxy 2024-06-20 09:39:22 +08:00
• 9a6afe1c2f opt: 输送机称重驱动优化 yanps 2024-06-19 17:10:20 +08:00
• 8037d14a47 opt: 立库输送机写入信号判断优化,添加输送机称重驱动 yanps 2024-06-19 15:44:50 +08:00
• e4e4dd6fa3 rev：分支合并 liuxy 2024-06-19 15:02:15 +08:00
• 807a0af359 Merge branch 'b_lms' into master_merge liuxy 2024-06-19 15:01:02 +08:00
• 5bb695619e rev：发货区修改 liuxy 2024-06-19 14:59:15 +08:00
• dc356bf29e Merge remote-tracking branch 'origin/master' lishuai 2024-06-19 10:54:34 +08:00
• 2724907920 fix: 报错信息显示 lishuai 2024-06-19 10:54:14 +08:00
• bdadb9d622 rev:优化取消指令逻辑，拔前行架添加安全信号交互以及页面优化 tuqiang 2024-06-19 09:13:30 +08:00
• 810e8bb510 add:增加子卷质检接口 gongbaoxiong 2024-06-18 20:53:13 +08:00
• daa1a8a64e fix:修复区域问题 gongbaoxiong 2024-06-18 18:20:29 +08:00
• 87dca36386 fix:修复区域问题 gongbaoxiong 2024-06-18 18:19:23 +08:00
• bee8457496 opt:只显示存在点位的子卷信息 gongbaoxiong 2024-06-18 17:19:56 +08:00
• ceb0bac497 opt:只显示存在点位的子卷信息 gongbaoxiong 2024-06-18 17:17:57 +08:00
• 1c440c1085 rev：按钮显示 liuxy 2024-06-18 16:51:54 +08:00
• 05312a9f8a rev：分支合并 liuxy 2024-06-18 16:38:41 +08:00
• ec5279cf93 Merge commit '9186ce137f2a67a4d8d7bb1cbfcc40cf69729d22' into master_merge liuxy 2024-06-18 16:37:40 +08:00
• 2c208789ce 代码合并 liuxy 2024-06-18 16:35:05 +08:00
• c8e55ca772 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms liuxy 2024-06-18 16:34:32 +08:00
• 9186ce137f rev：1.出库六个位置在一个出库单上一起出库的时候 报错：‘仓位不足’ 2.出库捆扎的时候要进行判断此规格是否只有一个箱子，如果是直接调用acs接口放行 3.捆扎的时候捆扎位如果有一个相同规格的箱子 要优先放在这个位置上 4.生成转库任务时 需要提前确定巷道的位置 liuxy 2024-06-18 16:34:21 +08:00
• 41cf6d7466 opt:只显示存在点位的子卷信息 gongbaoxiong 2024-06-18 16:00:57 +08:00
• 39fa9a00da opt: 设备监控页面国际化优化 yanps 2024-06-18 15:56:18 +08:00
• cf95dc505c fix:发货出库木箱号解析错误导致查不到子卷问题； gongbaoxiong 2024-06-18 15:33:14 +08:00
• e8a2a779b6 add: 终点工作模式校验 lishuai 2024-06-18 14:30:48 +08:00
• 148223b01d add: 国际化 lishuai 2024-06-18 13:55:33 +08:00
• 5b279f2149 add: 前段参数添加 lishuai 2024-06-18 13:27:44 +08:00
• 15a46f0c62 opt:6.18 线上部署测试环境 gongbaoxiong 2024-06-18 12:48:01 +08:00
• e12a436783 Merge branch 'refs/heads/b_lms' into master_merge zhouz 2024-06-18 10:04:49 +08:00
• e8dec156d5 Merge remote-tracking branch 'origin/b_lms' into b_lms zhouz 2024-06-18 10:04:19 +08:00
• 212b14008f fix:BUG修改 zhouz 2024-06-18 10:03:24 +08:00
• 57defd4e0d fix:BUG修改 zhouz 2024-06-18 10:03:24 +08:00
• 170170d608 fix：出库分配页面打不开bug修改 liuxy 2024-06-18 08:54:08 +08:00
• fd7f0e488b opt:6.15上线装箱区代码修改 gongbaoxiong 2024-06-17 21:26:41 +08:00
• b8f59035dc Merge remote-tracking branch 'origin/master' lishuai 2024-06-17 19:15:03 +08:00
• 9b6291f146 fix: 扫描补码、仙宫货叉调整 lishuai 2024-06-17 19:14:29 +08:00
• 61d28d7138 rev：库存报表入库时间更新 liuxy 2024-06-17 15:38:33 +08:00
• 674685ef15 Merge branch 'refs/heads/b_lms' into master_merge zhouz 2024-06-17 13:26:21 +08:00
• 019022a5a8 Merge remote-tracking branch 'origin/b_lms' into b_lms gongbaoxiong 2024-06-17 13:12:36 +08:00
• d3f33a12d1 opt:6.15上线装箱区代码修改 gongbaoxiong 2024-06-17 13:12:24 +08:00
• 02fe21fb47 Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge zhouz 2024-06-17 11:06:27 +08:00
• 0d4f004798 Merge branch 'refs/heads/b_lms' into master_merge zhouz 2024-06-17 11:05:00 +08:00
• 8d1b82e3f9 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms zhouz 2024-06-17 11:04:35 +08:00
• 12bded91fb fix:立库代码更新 zhouz 2024-06-17 11:04:31 +08:00
• 12e72ae6fd opt:6.15上线装箱区代码修改 gongbaoxiong 2024-06-17 11:01:36 +08:00
• 8d71dad251 rev：打印米数保留2位小数 liuxy 2024-06-15 21:23:09 +08:00
• 41fea50b24 Merge remote-tracking branch 'origin/master' lishuai 2024-06-15 15:10:09 +08:00
• 01a0ebfb4e add: 诺宝agv、诺宝叉车调试开发 lishuai 2024-06-15 15:09:22 +08:00
• 78fb4e7a5f opt:6.15上线装箱区代码修改 gongbaoxiong 2024-06-15 14:18:28 +08:00
• 72cfb31714 add:新增交互字段显示 tuqiang 2024-06-15 13:36:06 +08:00
• 6d587388d6 Merge branch 'refs/heads/b_lms' into master_merge zhouz 2024-06-14 21:32:20 +08:00
• f4db63c3fe fix: 无法登录 liyongde 2024-06-14 21:29:10 +08:00
• b4e5ce473d Merge branch 'refs/heads/b_lms' into master_merge zhouz 2024-06-14 19:50:38 +08:00
• 549e9650cb fix:优化现场联调出现的问题以及添加日志 tuqiang 2024-06-14 18:31:18 +08:00
• 13cdba9ea1 rev：库存报表新增接头数 liuxy 2024-06-14 17:29:30 +08:00