Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• fda88b222c rev:新增表 ZHOUZ\Noble'lift 2024-03-01 10:04:06 +08:00
• 36155bac2e fix :国际化修改 lishuai 2024-02-29 14:45:10 +08:00
• 881ade414e Merge remote-tracking branch 'origin/master' lishuai 2024-02-29 13:14:05 +08:00
• 864990b446 fix :修改 lishuai 2024-02-29 13:13:32 +08:00
• 1224ab4d74 add: 分切CRUD liyongde 2024-02-29 11:26:21 +08:00
• f278b71ca0 rev:优化 tuqiang 2024-02-29 10:38:29 +08:00
• 1608d34733 Merge remote-tracking branch 'origin/master' tuqiang 2024-02-29 10:37:12 +08:00
• 544e5dfaea add：新增后端二楼驱动国际化 tuqiang 2024-02-29 10:30:48 +08:00
• 7ab17cb0a8 feat: 完善分切下料桁架任务 liyongde 2024-02-28 18:03:59 +08:00
• 797f1480b0 rev: 异常任务修改 liuxy 2024-02-28 17:55:13 +08:00
• ae3b25f35a opt: 异常日志，流量限制，创建任务优化 yanps 2024-02-28 16:35:50 +08:00
• c010166c28 add :堆垛机异样处理 lishuai 2024-02-28 16:14:34 +08:00
• a4dda6eafd opt:统一把业务id等字段的Long类型改为String类型，避免前端序列号丢失精度。 baoge 2024-02-28 16:06:16 +08:00
• 1cfbe67d67 Merge remote-tracking branch 'origin/b_lms' into b_lms baoge 2024-02-28 16:06:01 +08:00
• 0c08dfa535 rev：仓储异常处理 liuxy 2024-02-28 15:55:04 +08:00
• 30e79d3939 opt:统一把业务id等字段的Long类型改为String类型，避免前端序列号丢失精度。 baoge 2024-02-28 13:44:02 +08:00
• 8da9a4fd3c feat: 完善部分分切业务 liyongde 2024-02-27 20:39:47 +08:00
• 89371b1d5b rev：测试修改 liuxy 2024-02-27 19:42:06 +08:00
• aca9984d3f rev：代码合并 liuxy 2024-02-27 09:12:00 +08:00
• cfc21279c4 rev：木箱木库测试 liuxy 2024-02-27 09:06:59 +08:00
• 42e572a003 Merge remote-tracking branch 'origin/master' lishuai 2024-02-26 16:33:08 +08:00
• 2f85b23948 fix :lms联调 lishuai 2024-02-26 16:31:33 +08:00
• b2e2f92202 add: 分切业务开发 liyongde 2024-02-26 14:29:48 +08:00
• ca2dac7816 Merge remote-tracking branch 'origin/b_lms' into b_lms liyongde 2024-02-26 14:24:07 +08:00
• 30d1086938 opt:优化业务逻辑 baoge 2024-02-26 10:17:20 +08:00
• 7282a6ef66 opt: 设备优化 yanps 2024-02-23 16:37:01 +08:00
• d4c89bc50f opt: 三色灯回退,OPC连接优化 yanps 2024-02-23 15:38:33 +08:00
• 2498dea59f rev:代码优化 tuqiang 2024-02-23 15:23:39 +08:00
• 621fe7362e add：acstolms 接口 liuxy 2024-02-22 19:11:38 +08:00
• 20d2d77a21 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2024-02-22 19:05:06 +08:00
• da3b9e6b78 rev:复烤回退 ZHOUZ\Noble'lift 2024-02-22 19:04:47 +08:00
• 6c42abffde Merge remote-tracking branch 'origin/master' lishuai 2024-02-22 17:59:25 +08:00
• ff04f40bbc fix :测试、对接点位 lishuai 2024-02-22 17:55:13 +08:00
• 64e3d286cc add：出库一键设置 liuxy 2024-02-21 18:35:27 +08:00
• 407c8b5152 opt: 设备监控 yanps 2024-02-21 09:56:25 +08:00
• 5b096969a2 rev:优化kep信号读取 tuqiang 2024-02-21 09:11:29 +08:00
• 42a6aa3e4b opt: 一期设备断连优化 yanps 2024-02-21 08:45:27 +08:00
• 5900712e61 Merge remote-tracking branch 'origin/master' lishuai 2024-02-20 17:17:32 +08:00
• 7c97cb116e add :设备国际化 lishuai 2024-02-20 17:16:58 +08:00
• 3021a83d0c opt: 出烘箱,信号断连优化 yanps 2024-02-20 14:03:10 +08:00
• d703d4ee29 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2024-02-20 13:29:56 +08:00
• 9f303916b9 rev:超期信息导入 ZHOUZ\Noble'lift 2024-02-20 13:29:49 +08:00
• fd08038078 add: 信号未连接,在监控显示感叹号 yanps 2024-02-19 17:00:57 +08:00
• b6baccc8a9 rev：二期发货任务 liuxy 2024-02-19 16:25:04 +08:00
• 1b215a0b93 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2024-02-19 14:38:06 +08:00
• 7d8a560571 rev:复烤、内包间查询优化 ZHOUZ\Noble'lift 2024-02-19 14:37:55 +08:00
• 17c1843fea Merge remote-tracking branch 'origin/master' lishuai 2024-02-19 10:49:03 +08:00
• e95b1b46cf add: 设备监控国际化 lishuai 2024-02-19 10:48:28 +08:00
• 8cc21065aa rev 解决系统日志失效问题 USER-20220102CG\noblelift 2024-02-18 16:24:50 +08:00
• b45e089e7f fix：脱机设备监控为红色 lishuai 2024-02-18 15:56:25 +08:00
• 8ff453316b rev：出库调拨单打印 毛重计算错误 liuxy 2024-02-18 14:04:45 +08:00
• 9aed674e23 add：发货任务 liuxy 2024-02-18 14:01:55 +08:00
• b1aa7e47ee Merge remote-tracking branch 'origin/master' lishuai 2024-02-18 13:41:58 +08:00
• b038808898 add :登入粒子效果 lishuai 2024-02-18 13:41:31 +08:00
• 3de65d80fa rev:优化agv任务下发 tuqiang 2024-02-18 13:34:11 +08:00
• b2a578ffd5 add：捆扎任务 liuxy 2024-02-06 18:01:46 +08:00
• 160cbd506a opt: 优化 yanps 2024-02-04 18:00:15 +08:00
• 95c0ce68a7 fix: 修复系统参数分页问题 yanps 2024-02-04 15:48:38 +08:00
• 74ca7e58ef opt: 优化流量限制功能 yanps 2024-02-04 14:12:51 +08:00
• 6cf6ee8f06 opt:增加点位库存表启用状态过滤查询 baoge 2024-02-02 17:01:49 +08:00
• 4927838346 Merge remote-tracking branch 'origin/b_lms' into b_lms baoge 2024-02-02 16:58:49 +08:00
• 91df60b647 opt:增加点位库存表启用状态过滤查询 baoge 2024-02-02 16:58:33 +08:00
• bd2b3057ba add: 添加自动清理任务和指令,优化操作日志 yanps 2024-02-02 16:56:42 +08:00
• e2cfc536bb rev 去除loki USER-20220102CG\noblelift 2024-02-02 16:32:30 +08:00
• 709d15f977 rev:移除多余代码 ludj 2024-02-02 15:55:00 +08:00
• a85c88139b rev:移除多余包 ludj 2024-02-02 15:41:34 +08:00
• 01b8f43084 add：木箱出库 liuxy 2024-02-02 15:33:56 +08:00
• 9f25ba7b59 add:新增行架-agv对接位驱动 tuqiang 2024-02-02 15:17:31 +08:00
• 2ea1f3497b Merge remote-tracking branch 'origin/master' lishuai 2024-02-02 14:34:26 +08:00
• 2ce8ed9ae1 fix : 测试流程 lishuai 2024-02-02 14:34:06 +08:00
• e846b623fa add:添加agv交互逻辑和驱动更新 tuqiang 2024-02-02 09:39:02 +08:00
• 39024a6484 add:增加一楼任务 baoge 2024-02-01 23:20:00 +08:00
• f7f27a4f58 Merge remote-tracking branch 'origin/master' lishuai 2024-02-01 16:40:12 +08:00
• bf368ec156 fix : 申请任务先找指令 lishuai 2024-02-01 16:37:50 +08:00
• 0bd35e99bd add: ACS与LMS的接口日志添加到Lucene yanps 2024-02-01 14:48:42 +08:00
• 065f422e55 add: 烘箱对接位 yanps 2024-02-01 10:37:01 +08:00
• 2fbac5ca01 add:木箱入库 liuxy 2024-02-01 10:11:00 +08:00
• 10c25d60a6 fix : 测试流程 lishuai 2024-01-31 08:56:34 +08:00
• 04d34fb12f add：木箱信息 liuxy 2024-01-30 15:30:26 +08:00
• 6da99e2db8 fix: 修复烘箱报警还出入烘箱的问题 yanps 2024-01-29 08:52:14 +08:00
• 9da132eb09 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2024-01-27 16:29:38 +08:00
• 7cfe04a977 rev:套轴申请不需要任务号 ZHOUZ\Noble'lift 2024-01-27 16:29:16 +08:00
• 7b880b48bc rev：redisson自动续期问题 liuxy 2024-01-27 16:25:26 +08:00
• 1018b1fac0 rev：空托盘出入库 liuxy 2024-01-27 15:53:15 +08:00
• 29ca5f703c refactor: 前端驼峰转下划线 liyongde 2024-01-27 15:41:13 +08:00
• 1c6f2bd7be refactor: 驼峰统一修改成下划线 liyongde 2024-01-27 15:21:13 +08:00
• b0ac44072a add：空托盘出库 liuxy 2024-01-26 18:04:38 +08:00
• 5768cf1d30 Merge remote-tracking branch 'origin/master' lishuai 2024-01-26 17:58:16 +08:00
• 3660c986b3 add : 下料行架开发 lishuai 2024-01-26 17:57:59 +08:00
• 332cf10c59 opt: opc线程修复添加agv设备 yanps 2024-01-26 17:50:31 +08:00
• 8966921312 opt: 输送线优化和界面优化 yanps 2024-01-26 17:49:35 +08:00
• 510faea0ef add: 空盘出库wql liuxy 2024-01-26 15:54:26 +08:00
• 823c961ec6 Merge remote-tracking branch 'origin/master' lishuai 2024-01-26 13:56:35 +08:00
• c27c42de8b add : 测试 lishuai 2024-01-26 13:56:15 +08:00
• 3c7f4495da add：空托盘入库 liuxy 2024-01-26 09:55:09 +08:00
• 27cd6217c4 rev: 代码生成器转为mybatis-plus的生成 liyongde 2024-01-25 17:19:51 +08:00
• 686e3d33ae rev 更新驱动字符串读取 USER-20220102CG\noblelift 2024-01-24 16:56:38 +08:00
• f24646754e rev:修改实体主键注解 baoge 2024-01-24 15:15:36 +08:00
• 2c76a7447f add:增加mapper生成 baoge 2024-01-24 15:11:55 +08:00
• b3da793a4c add：二期出库 liuxy 2024-01-24 14:01:54 +08:00