Commit Graph

a86ecdd6 修改morkT参数 by pengliangyang 2022-07-06 16:03:09 +0800
2221fb0d morks by NXX 2022-07-06 09:47:28 +0800
e760a0ac morks by NXX 2022-07-06 09:45:54 +0800
24ad9bd8 Morks by NXX 2022-07-06 09:41:28 +0800
b627b105 1 by fyf 2022-07-05 18:29:40 +0800
9d36aa72 更新AGV界面 by fyf 2022-07-05 18:10:54 +0800
5551a63a 更新agv 界面 by fyf 2022-07-05 17:08:08 +0800
f8507615 提交agv界面 by fyf 2022-07-04 18:29:58 +0800
b09165a1 临时数据提交 by taoye 2022-07-04 11:16:33 +0800
1dc59c22 拉取更新 by taoye 2022-07-04 10:16:18 +0800
e00fcfb9 项目整理 by 如意彭 2022-07-04 10:15:58 +0800
256b6256 Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by taoye 2022-06-30 16:24:02 +0800
5e0df1b0 180项目更新 by taoye 2022-06-30 16:23:44 +0800
3a3b253c Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by pengliangyang 2022-06-30 16:23:23 +0800
d69cb1eb 更改果汁机和制冰机的状态显示 by pengliangyang 2022-06-30 16:21:18 +0800
c42a8e5a Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by 如意彭 2022-06-30 15:27:21 +0800
653da8ae 用户管理功能优化 by 如意彭 2022-06-30 15:27:15 +0800
542c167f 解决冲突 by pengliangyang 2022-06-30 11:14:31 +0800
229dac8d 更新集装箱morkT代码 by pengliangyang 2022-06-30 11:10:52 +0800
86fa450c mqtt 断线重连 by 如意彭 2022-06-30 11:05:48 +0800
b87aed9f 冲突解决 by taoye 2022-06-29 18:33:20 +0800
a1206c1b 180界面更新 by taoye 2022-06-29 18:32:37 +0800
1c3469a0 Web api 接口测试 by 如意彭 2022-06-29 15:20:10 +0800
2d98dc82 冲突解决 by taoye 2022-06-29 13:56:58 +0800
3c675cba 180更新 by taoye 2022-06-29 13:55:46 +0800
6be2534b web api 测试 by 如意彭 2022-06-29 13:55:25 +0800
02e0954a 煮面机程序优化 by 如意彭 2022-06-28 17:39:35 +0800
35f5890e 冲突解决 by taoye 2022-06-28 09:26:31 +0800
1191bb5c 180项目更新 by taoye 2022-06-27 18:31:58 +0800
2db264b0 hub更新 by 如意彭 2022-06-27 15:52:09 +0800
0b8b3be4 Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by 如意彭 2022-06-27 14:35:39 +0800
298aa676 api服务开发 by 如意彭 2022-06-27 14:35:34 +0800
89a293ec 解决冲突 by pengliangyang 2022-06-25 17:33:42 +0800
db0f5530 集装箱最新代码 by pengliangyang 2022-06-25 17:32:27 +0800
4f8b13fc agv api 服务程序搭建 by 如意彭 2022-06-25 17:32:09 +0800
286061b9 冲突解决 by 如意彭 2022-06-25 11:39:42 +0800
eb39d1ce 产线项目搭建 by 如意彭 2022-06-25 11:39:13 +0800
36b2acd3 180项目逻辑控制更新 by taoye 2022-06-24 16:05:11 +0800
9a458f3b 冲突解决 by taoye 2022-06-22 18:27:56 +0800
baa4236c 180项目更新 by taoye 2022-06-22 18:26:50 +0800
59fc118c Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by 如意彭 2022-06-20 18:15:14 +0800
94ea337e 登录 by 如意彭 2022-06-20 18:15:08 +0800
469a5d96 解决冲突 by pengliangyang 2022-06-20 16:59:26 +0800
c3efa98f JakaDO添加 by pengliangyang 2022-06-20 16:58:00 +0800
452e9221 上位机优化 by 如意彭 2022-06-20 16:56:30 +0800
a407f9c5 Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by 如意彭 2022-06-20 09:47:14 +0800
43dd6366 调试修改 by 如意彭 2022-06-20 09:47:09 +0800
22c013c6 Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by pengliangyang 2022-06-17 17:57:02 +0800
2b2787c5 jaka代码优化更改 by pengliangyang 2022-06-17 17:56:49 +0800
4f13aa96 多配方流程下发 by 如意彭 2022-06-16 18:05:40 +0800
0d3d3bef Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by 如意彭 2022-06-16 13:53:05 +0800
b0d52bfa 吉香居配料系统 by 如意彭 2022-06-16 13:52:56 +0800
1aebc955 Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by taoye 2022-06-15 16:15:24 +0800
acb2a218 AGV更新 by taoye 2022-06-15 16:15:09 +0800
20c5c906 冲突解决 by 如意彭 2022-06-14 18:35:13 +0800
3436e94d 吉香居设备配方下发 by 如意彭 2022-06-14 18:34:08 +0800
99acecb3 Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by fyf 2022-06-14 14:47:56 +0800
2d10cbc2 222 by fyf 2022-06-14 14:47:53 +0800
a7e3dc60 Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by taoye 2022-06-14 11:12:45 +0800
e01ef448 小炒MQTT/API流程对接更新 by taoye 2022-06-14 11:12:36 +0800
2e9b2901 4 by fyf 2022-06-13 17:10:33 +0800
5d4d9234 Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by 如意彭 2022-06-13 16:39:30 +0800
3cb7be72 配方管理修改 by 如意彭 2022-06-13 16:39:24 +0800
2dc649fa Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by pengliangyang 2022-06-13 14:51:00 +0800
f282d0c5 Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by taoye 2022-06-13 14:44:16 +0800
f58ec56b 小炒更新 by taoye 2022-06-13 14:44:08 +0800
b65520e9 morkF代码更新 by pengliangyang 2022-06-13 14:39:44 +0800
358f21e7 Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by NXX 2022-06-11 16:18:08 +0800
6821a14c Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by 如意彭 2022-06-11 16:17:37 +0800
b62c732e 本地模拟 by 如意彭 2022-06-11 16:17:29 +0800
b14f307c MiorkT by NXX 2022-06-11 16:17:11 +0800
651e2f54 果汁机代码更新 by pengliangyang 2022-06-10 18:32:14 +0800
0fd9bfb0 Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by taoye 2022-06-09 11:17:00 +0800
46b5a4da 冒菜多订单调试 by taoye 2022-06-09 11:16:50 +0800
4db55efe 冲突修改 by 如意彭 2022-06-08 18:20:48 +0800
21596979 冲突解决 by 如意彭 2022-06-08 18:19:13 +0800
13287b88 精细化配料系统搭建 by 如意彭 2022-06-08 18:18:43 +0800
44926b6d wew by fyf 2022-06-08 17:57:14 +0800
5939f4aa Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by fyf 2022-06-08 15:17:17 +0800
91ab7be0 更新 by fyf 2022-06-08 15:17:16 +0800
88511b85 增mork T新的调试界面 by pengliangyang 2022-06-08 11:46:15 +0800
5c594d0a 增加单独果汁机项目 by pengliangyang 2022-06-08 11:35:21 +0800
d192ea3b 菜单还原 by 如意彭 2022-06-08 11:26:40 +0800
16658932 冲突解决 by 如意彭 2022-06-08 10:56:26 +0800
dd4a5bde 精细化配料系统修改 by 如意彭 2022-06-08 10:54:59 +0800
a532aa47 morkt by NXX 2022-06-07 18:44:06 +0800
538405a2 morktT by NXX 2022-06-07 14:00:48 +0800
e93e5ead MorkT by NXX 2022-06-07 11:40:22 +0800
a7954c4c 且时且多MorkT by NXX 2022-06-07 09:43:47 +0800
5d588c80 冲突解决 by 如意彭 2022-06-06 15:27:16 +0800
38819566 设备本地模拟，设备删除修改 by 如意彭 2022-06-06 15:26:09 +0800
9915c743 Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by taoye 2022-06-06 15:16:21 +0800
868b5c36 调试更新 by taoye 2022-06-06 15:16:15 +0800
6bf706fa Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by 如意彭 2022-06-06 10:09:02 +0800
fc2a69ab test by fyf 2022-06-06 10:08:46 +0800
6dcaae9f 通讯库修改 by 如意彭 2022-06-06 09:32:51 +0800
b1565d11 222 by fyf 2022-06-01 11:23:51 +0800
77224a22 从图解决 by 如意彭 2022-05-31 16:53:28 +0800
2c3e7ec5 morkt移植 by 如意彭 2022-05-31 16:52:56 +0800
85161fe6 eee by fyf 2022-05-31 14:07:30 +0800

... 11 12 13 14 15 ...