Commit Graph

  • *
  • | *
  • | | *
  • | | |\
  • | | * |
  • | | | *
  • | | |/
  • | | | *
  • | | * |
  • | | * |
  • | | * |
  • | | | *
  • | | | *
  • | | | *
  • | | | *
  • | | | *
  • | | * |
  • | | | *
  • | | | *
  • | | * |
  • | | | *
  • | | * |
  • | | | *
  • | | | *
  • | | | *
  • | | | | *
  • | | * | |
  • * | | | |
  • * | | | |
  • |/ / / /
  • | * | |
  • | | * |
  • | | * |
  • | | * |
  • | | * |
  • | | * |
  • | | * |
  • | * | |
  • | | * |
  • | | * |
  • | * | |
  • | | * |
  • | | * |
  • | * | |
  • | | * |
  • | * | |
  • | |/ /
  • | | *
  • | * |
  • | | *
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | | *
  • | * |
  • | * |
  • * | |
  • * | |
  • * | |
  • * | |
  • |\ \ \
  • | |_|/
  • |/| |
  • | | *
  • * | |
  • | | *
  • | | *
  • | | *
  • | | *
  • | | *
  • | | *
  • | * |
  • * | |
  • | | *
  • | | *
  • | | *
  • | * |
  • | * |
  • | | *
  • | | *
  • | | *
  • | | *
  • * | |
  • * | |
  • d2caf5fb (茶饮配方(竖屏)) 模拟更新 by fyf 2024-01-24 14:12:07 +0800
  • a26c32fa (HEAD -> NewNaiChaPeiLiaoBaTai) 测试 by Nah 2024-01-23 15:26:12 +0800
  • 4a3f5d1f Merge remote-tracking branch 'origin/燃气自翻炒锅' into 燃气自翻炒锅 by 如意 彭 2024-01-23 13:51:24 +0800
  • f4aa0cbd 大炒调整 by 如意 彭 2024-01-23 13:51:05 +0800
  • 12f6e376 更新界面显示 by fyf 2024-01-23 13:38:23 +0800
  • 237bf315 线程通知更新 需要判断窗体是否显示 by fyf 2024-01-23 11:30:30 +0800
  • e9d06f41 5 by fyf 2024-01-22 18:02:25 +0800
  • 892fb3af 1 by fyf 2024-01-22 18:00:15 +0800
  • fcf3070c 更新主页面 by fyf 2024-01-22 17:59:22 +0800
  • 9ee8d154 4 by fyf 2024-01-22 10:45:23 +0800
  • 124689de 1.更新工序增加变化 by fyf 2024-01-21 23:30:28 +0800
  • a23f0c27 1.记录时长减去手动等待时间 2.手动等待时,暂停倒计时 3.臭鼬时间增加 by fyf 2024-01-21 14:53:06 +0800
  • 448b2e92 1.记录时长减去手动等待时间 2.手动等待时,暂停倒计时 by fyf 2024-01-21 12:30:31 +0800
  • 2c96a028 1.记录时长减去手动等待时间 2.手动等待时,暂停倒计时 by fyf 2024-01-20 13:05:26 +0800
  • 0b4677b6 更新主界面 by fyf 2024-01-19 18:02:48 +0800
  • dae62c37 日日日 by fyf 2024-01-19 14:41:43 +0800
  • 0c789fae 輕質 by fyf 2024-01-19 14:29:20 +0800
  • ee3f170e 自动控制 by fyf 2024-01-19 13:53:38 +0800
  • 7db64c0c 手动投料怎么蜂鸣器 by fyf 2024-01-18 15:36:32 +0800
  • 49ccf8ef 更新UI界面 by fyf 2024-01-18 15:21:11 +0800
  • cc122d22 41 by fyf 2024-01-17 17:59:33 +0800
  • 28104345 调整出料精度问题! by fyf 2024-01-17 17:19:52 +0800
  • 291a34ee 3333 by fyf 2024-01-17 15:43:11 +0800
  • 3f308d24 大炒调整 by 如意 彭 2024-01-17 15:27:39 +0800
  • c52f2646 3333 by fyf 2024-01-17 15:27:02 +0800
  • 6bb02e3c 333 by fyf 2024-01-17 13:34:21 +0800
  • 4de64f94 竖屏奶茶机界面调整 by fyf 2024-01-16 13:13:26 +0800
  • e0cbdd86 更新 by fyf 2024-01-15 16:32:07 +0800
  • d62a80da 更新plc日志。 by fyf 2024-01-15 14:31:31 +0800
  • dade2d5b 增加日志输出 by fyf 2024-01-13 23:16:15 +0800
  • 258766e1 现场更新自动测试项目 by fyf 2024-01-12 17:50:05 +0800
  • 2af185d8 增加并行出料 by fyf 2024-01-11 15:26:50 +0800
  • 2a47263d 45 by fyf 2024-01-11 10:10:03 +0800
  • 6acde8f1 666 by fyf 2024-01-10 18:09:12 +0800
  • 3196d8cb 9 by fyf 2024-01-10 17:52:41 +0800
  • 30fd1aa4 3 by fyf 2024-01-10 16:10:01 +0800
  • 163fd4a4 调整测试 by fyf 2024-01-10 15:42:59 +0800
  • e379b776 4444 by fyf 2024-01-10 15:04:22 +0800
  • 9ba2a12a 现场更新 by fyf 2024-01-08 06:19:46 +0800
  • 9ade48ac 增加自动测试界面 by fyf 2024-01-09 15:43:19 +0800
  • 0d24bc7f 提交燃气大炒 工艺配置界面 by fyf 2024-01-05 11:15:51 +0800
  • 6165d953 强制结束后 恢复强制结束 by fyf 2024-01-05 09:45:36 +0800
  • 227fa621 4222 by fyf 2024-01-03 18:01:18 +0800
  • 269e63d7 大炒调整 by 如意 彭 2024-01-03 09:38:40 +0800
  • 9069846c 大炒调整 by 如意 彭 2024-01-03 09:33:25 +0800
  • e6847527 大炒调整 by 如意 彭 2023-12-30 16:59:47 +0800
  • 023916a8 1.增加一拖二一拖四 强制结束任务 2.调整投料位置和炒制位置的默认 by fyf 2023-12-30 10:14:30 +0800
  • 6c8ab592 4333 by fyf 2023-12-29 10:01:55 +0800
  • cfa19971 2 by fyf 2023-12-27 17:23:51 +0800
  • 5b39ca8a 3 by fyf 2023-12-27 17:10:20 +0800
  • 0a7ada67 调整菜谱展示 by fyf 2023-12-27 17:02:17 +0800
  • 5cb110a8 422 by fyf 2023-12-26 14:25:44 +0800
  • 830d261f 4 by fyf 2023-12-25 15:24:33 +0800
  • 763ea08c 现场更新 by fyf 2023-12-22 16:56:01 +0800
  • 343fe15e 增加一拖四 by fyf 2023-12-21 18:03:13 +0800
  • 339a2afb 烹饪界面怎么输入法关闭,去掉收索框的焦点 by fyf 2023-12-20 14:09:33 +0800
  • 6afa5761 5 by fyf 2023-12-20 13:44:53 +0800
  • 19fd942f 666 by fyf 2023-12-20 13:28:52 +0800
  • 6f837bd0 777 by fyf 2023-12-20 10:42:34 +0800
  • eab642ca 444 by fyf 2023-12-19 18:50:00 +0800
  • 6725f20c 5 by fyf 2023-12-19 17:59:45 +0800
  • 7f6eccf7 444 by fyf 2023-12-19 14:20:23 +0800
  • 124ec5ee 555 by fyf 2023-12-19 13:06:37 +0800
  • acab15f3 1 by fyf 2023-12-18 14:53:06 +0800
  • 8baf6184 4 by fyf 2023-12-18 14:49:58 +0800
  • 43db2f4a 7 by fyf 2023-12-18 14:41:04 +0800
  • 0ab73d2a 4233 by fyf 2023-12-18 13:41:43 +0800
  • 179b2b4f 23 by fyf 2023-12-18 11:03:44 +0800
  • 0be7d5e1 4 by fyf 2023-12-16 16:53:01 +0800
  • b9479faa 232 by fyf 2023-12-16 16:04:17 +0800
  • cb8e8c2b 增加炒锅调试 by fyf 2023-12-16 15:54:29 +0800
  • 2a344b67 更新显示问题 by fyf 2023-12-15 17:51:35 +0800
  • 7922a63a 大炒调整 by 如意 彭 2023-12-14 13:32:25 +0800
  • b73f66f4 4213 by fyf 2023-12-11 16:03:27 +0800
  • 84ba4f8d 23 by fyf 2023-12-11 13:23:02 +0800
  • 025f0510 修改PLC读取的方法。完善手动写入值界面的功能。 by Nah 2023-12-08 13:32:12 +0800
  • d549d8f7 修改酱料校准和模拟出料功能,适配配料吧台。 by Nah 2023-12-04 14:14:42 +0800
  • a89410f3 合并分支并调整。 by Nah 2023-12-06 14:23:48 +0800
  • ecae5d47 Merge remote-tracking branch 'origin/味魔方Android' into NewNaiChaPeiLiaoBaTai by Nah 2023-12-06 13:53:42 +0800
  • 236835bb 444 by fyf 2023-12-06 13:37:08 +0800
  • 6c978751 修改了设备操作的类和接口 by Nah 2023-12-06 13:20:48 +0800
  • d573c04a 4 by fyf 2023-12-06 09:55:15 +0800
  • 0edeb850 555 by fyf 2023-12-05 16:43:44 +0800
  • 49aaf4a3 777 by fyf 2023-12-05 15:21:58 +0800
  • f6abb344 333 by fyf 2023-12-05 14:10:54 +0800
  • 43496bd3 333 by fyf 2023-12-05 13:58:25 +0800
  • b2da602f 1111 by fyf 2023-12-04 17:18:33 +0800
  • 949b58eb (味魔方Android) 添加下位设备操作的类,以及中英文字符串文件。 by Nah 2023-12-04 14:14:42 +0800
  • 8962848c 通讯库调整 by 如意 彭 2023-12-04 13:20:13 +0800
  • 28ea4959 gengx by fyf 2023-12-02 16:55:07 +0800
  • 5a602905 gengx by fyf 2023-11-30 14:18:22 +0800
  • 66a2b7e1 5555 by fyf 2023-11-29 14:55:11 +0800
  • 1e67707b 添加下位设备操作的类,以及中英文字符串文件。 by Nah 2023-11-29 11:45:55 +0800
  • 5643a69a 1. 修改仓位物料校准、满管校准、酱料校准及相应模拟出料逻辑。2. 修改配方出料及余量逻辑。3. 下发配方时添加余量检验逻辑。4.串口断线重连修改。5. 电子秤读取重量程序修改。 by Nah 2023-11-29 11:35:14 +0800
  • f0be378d 555 by fyf 2023-11-28 17:53:09 +0800
  • 412b3bb8 222 by fyf 2023-11-28 11:24:58 +0800
  • 38bc6569 1111 by fyf 2023-11-28 10:23:50 +0800
  • b8505b53 更新最小版本 by fyf 2023-11-27 16:27:52 +0800
  • a4eb280c 333 by fyf 2023-11-23 10:19:36 +0800
  • 0fd572bb 3333 by fyf 2023-11-23 09:55:36 +0800