Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• f2fb475e2e fix: 修复烘箱行架不给2的问题 yanps 2024-01-24 13:38:13 +08:00
• db57ef0d0f rev:定时器优化 ZHOUZ\Noble'lift 2024-01-24 10:13:07 +08:00
• 5bcec4b32e Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2024-01-23 17:44:17 +08:00
• 14090a0d46 rev：集群相关修改 ZHOUZ\Noble'lift 2024-01-23 17:44:07 +08:00
• 41904ecbb5 opt: 拔轴机申请套轴优化 yanps 2024-01-23 17:39:49 +08:00
• bb99c99e68 Merge remote-tracking branch 'origin/master' lishuai 2024-01-23 17:24:27 +08:00
• 131b820f4d add : 出库开发 lishuai 2024-01-23 17:24:09 +08:00
• ac74cd0e97 opt: 优化烘箱行架驱动 yanps 2024-01-23 15:05:22 +08:00
• d104a41d39 add: 添加AGV取放烘箱对接位校验,添加创建任务权限控制 yanps 2024-01-23 15:04:16 +08:00
• 54bcba8ef4 add : 测试入库 lishuai 2024-01-23 09:54:20 +08:00
• f4f822d073 add : 测试入库 lishuai 2024-01-23 09:36:12 +08:00
• b3b343c075 fix: 启动报错修改 yanps 2024-01-22 19:35:21 +08:00
• 47b3889c5b add: 添加仙工AGV,流量限制界面;实现流量限制国际化 yanps 2024-01-22 19:31:00 +08:00
• 37ac298f91 opt: 内包间优化 yanps 2024-01-22 19:27:06 +08:00
• 6cd78775ef rev：更新 tuqiang 2024-01-22 09:54:11 +08:00
• cfeabb4c04 opt: 优化创建任务的扩展字段 yanps 2024-01-22 09:44:08 +08:00
• f06dec27bf Merge remote-tracking branch 'origin/master' lishuai 2024-01-20 18:31:57 +08:00
• 449082c03c add : 测试入库 lishuai 2024-01-20 18:31:26 +08:00
• 4c0ec35e98 opt: 创建任务中的扩展字段优化 yanps 2024-01-20 17:16:12 +08:00
• 91d1102f9e Merge remote-tracking branch 'origin/master' lishuai 2024-01-20 16:14:46 +08:00
• 8b6e6d547a add : 测试入库 lishuai 2024-01-20 16:14:25 +08:00
• d93fe3a4ed add：pc成品入库 liuxy 2024-01-19 18:36:27 +08:00
• 4b82e5a764 add:添加prometheushttp监控 zhangzq 2024-01-19 16:57:12 +08:00
• 56071e13fe Merge remote-tracking branch 'origin/master' lishuai 2024-01-19 13:10:23 +08:00
• 7ecd9c6cc0 add : 测试入库 lishuai 2024-01-19 13:10:03 +08:00
• 1dfc62bd36 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2024-01-19 11:20:10 +08:00
• 1a7d4afd68 rev:气涨轴编码维护 ZHOUZ\Noble'lift 2024-01-19 11:20:02 +08:00
• 3b7035173d Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one USER-20220102CG\noblelift 2024-01-19 10:21:28 +08:00
• d26939d6b0 rev 更新 USER-20220102CG\noblelift 2024-01-19 10:20:32 +08:00
• 2ecc7994ff Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2024-01-18 15:54:56 +08:00
• a2c03da1c8 rev:气涨轴编码变更 ZHOUZ\Noble'lift 2024-01-18 15:54:44 +08:00
• d8945feaf4 Merge remote-tracking branch 'origin/master' lishuai 2024-01-17 20:37:06 +08:00
• 54f0a10efd add: 开发 lishuai 2024-01-17 20:36:44 +08:00
• 90f4593346 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2024-01-17 20:09:14 +08:00
• 58417bf12c rev:穿拔轴机库存更新 ZHOUZ\Noble'lift 2024-01-17 17:09:08 +08:00
• 42cd7d1258 add: 添加插拔机取货完成反馈 yanps 2024-01-17 18:57:02 +08:00
• 1e96343e7e rev:新增表处相关逻辑和任务类 ZHOUZ\Noble'lift 2024-01-17 17:34:06 +08:00
• 1473ba1a72 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms ZHOUZ\Noble'lift 2024-01-17 17:09:16 +08:00
• 42b598a49b rev:穿拔轴机库存更新 ZHOUZ\Noble'lift 2024-01-17 17:09:08 +08:00
• 99242f4c78 rev：二期入库增删改查 liuxy 2024-01-17 16:15:33 +08:00
• edf858a244 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms ZHOUZ\Noble'lift 2024-01-17 10:56:41 +08:00
• c7bf3bf17a rev:新增表处库存点位页面 ZHOUZ\Noble'lift 2024-01-17 10:56:30 +08:00
• 62fc812853 Merge remote-tracking branch 'origin/master' lishuai 2024-01-17 10:09:20 +08:00
• 6bd088f008 rev 更新线程休眠时间 USER-20220102CG\noblelift 2024-01-17 10:06:34 +08:00
• 5b99185f24 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one USER-20220102CG\noblelift 2024-01-16 21:08:50 +08:00
• a1e888ffe4 rev USER-20220102CG\noblelift 2024-01-16 21:08:32 +08:00
• 18b5ca31b8 rev 更新 USER-20220102CG\noblelift 2024-01-16 21:07:58 +08:00
• af43ab7830 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ludj 2024-01-16 20:36:48 +08:00
• 34b626a726 Merge remote-tracking branch 'origin/master' lishuai 2024-01-16 20:31:41 +08:00
• 3fca1045f1 add: 装箱\开箱驱动开发 lishuai 2024-01-16 20:30:42 +08:00
• bae7969474 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ludj 2024-01-16 20:19:59 +08:00
• d2476700fa rev: 去掉swagger ludj 2024-01-16 20:17:22 +08:00
• 885237fcae rev 更新 USER-20220102CG\noblelift 2024-01-16 20:06:45 +08:00
• 92fe7f2440 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one USER-20220102CG\noblelift 2024-01-16 20:05:12 +08:00
• d238f62957 rev 更新日志 USER-20220102CG\noblelift 2024-01-16 20:04:44 +08:00
• b647c81219 rev：出库手工分配修改 liuxy 2024-01-16 20:03:42 +08:00
• fde6ad67fd add：入库查询 liuxy 2024-01-16 20:00:42 +08:00
• 0cea3574a8 rev:定时任务线程修复 ludj 2024-01-16 19:53:57 +08:00
• e56706c66a add：出入库目录结构、框架 liuxy 2024-01-16 17:49:42 +08:00
• 73f21e342d rev:新增目录 ZHOUZ\Noble'lift 2024-01-16 17:21:18 +08:00
• 1e7de370dc Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2024-01-16 17:17:46 +08:00
• 924f83f0ce rev:人工拔轴判断创建任务 ZHOUZ\Noble'lift 2024-01-16 17:17:29 +08:00
• 3da40b153d init 二期ACS USER-20220102CG\noblelift 2024-01-16 16:31:20 +08:00
• 2b40bf51ee rev:前端页面子卷包装字段位置更换 liuxy 2024-01-15 14:38:47 +08:00
• f1abb2901a rev：出库管理：发货单取理论重量 liuxy 2024-01-15 14:18:18 +08:00
• 6f603ac7a0 fix: 修复分切行架一直写信号的问题 yanps 2024-01-15 13:15:05 +08:00
• 9c6a234211 rev：设备驱动空指针打印详细堆栈信息 gengby 2024-01-15 11:31:27 +08:00
• b4f25156c7 rev:贴标增加开关 ZHOUZ\Noble'lift 2024-01-12 14:36:24 +08:00
• 8a864c7212 rev： 成品日报、发货区监控 liuxy 2024-01-12 13:45:20 +08:00
• 99fbb6494b 0 ZHOUZ\Noble'lift 2024-01-11 16:23:17 +08:00
• 38628e518c Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2024-01-11 15:42:24 +08:00
• 54fe5a6e84 rev:内包间代码优化 ZHOUZ\Noble'lift 2024-01-11 15:42:16 +08:00
• 9cd78f0d25 rev：出库业务强制确认按钮 liuxy 2024-01-11 10:56:40 +08:00
• 2e22f2a2c2 rev:成品日报 liuxy 2024-01-11 09:52:02 +08:00
• fc3f2501b3 rev：成品报废 liuxy 2024-01-11 09:48:47 +08:00
• 6f7db9502c fix: 分切行架任务就绪不下发 yanps 2024-01-10 11:11:36 +08:00
• e25dd57009 rev：默认时间 liuxy 2024-01-09 17:40:21 +08:00
• cbe1348684 opt: 内包间日志优化 yanps 2024-01-09 16:50:38 +08:00
• fb79480ae1 add: 内包间日志增加 yanps 2024-01-09 09:30:09 +08:00
• fefdead3f5 rev:内包间逻辑优化 ZHOUZ\Noble'lift 2024-01-09 08:38:37 +08:00
• eeeffbb708 opt:发货区管理接口优化 zhangzq 2024-01-08 17:39:11 +08:00
• f6f19e73a1 rev：logo图标更换 rev：木箱外表打印校验 liuxy 2024-01-08 09:53:46 +08:00
• d9e041712b Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2024-01-08 08:58:22 +08:00
• 6bbd9a33e5 rev:内包间优化 ZHOUZ\Noble'lift 2024-01-08 08:58:14 +08:00
• ad01512522 opt: 内包间A1优化 yanps 2024-01-06 18:18:39 +08:00
• 7850601b6c rev：成品报废回传修改 liuxy 2024-01-05 17:53:44 +08:00
• 1db820fccd rev:pom文件更新 ludj 2024-01-05 16:27:25 +08:00
• b413168cac Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2024-01-05 15:57:25 +08:00
• 65ac6ccf47 rev:内包间优化 ZHOUZ\Noble'lift 2024-01-05 15:57:04 +08:00
• ee632a69cd add: 线程、tomcat监控 liyongde 2024-01-05 14:09:39 +08:00
• 62023a452e opt:日志优化2 zhangzq 2024-01-05 01:45:43 +08:00
• ba5c9ad5d1 rev:配置文件更新 ludj 2024-01-04 20:00:13 +08:00
• 4d4f35bd21 Merge branch 'master' of 121.40.234.130:root/lanzhouhailiang_one yanps 2024-01-04 09:37:30 +08:00
• f69d754c9c add: 烘箱行架增加日志和套轴等待 yanps 2024-01-04 09:36:49 +08:00
• 13d3d648f7 rev:出库导出 liuxy 2024-01-02 16:05:04 +08:00
• c883a4d1ee rev:内包间优化 ZHOUZ\Noble'lift 2023-12-31 12:41:59 +08:00
• 8e5c76a0a1 fix: 行架任务被分切输送线截取 yanps 2023-12-31 09:10:09 +08:00
• a40bc3fa12 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2023-12-29 16:17:39 +08:00
• 49f0f677ad rev：出库导出 liuxy 2023-12-29 16:17:05 +08:00
• e458d66bb6 rev:搬运气胀轴 ZHOUZ\Noble'lift 2023-12-29 16:03:16 +08:00