Commit Graph

  • *
  • |\
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • | *
  • * |
  • |/
  • *
  • |\
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • | *
  • * |
  • |/
  • | *
  • | |\
  • | * |
  • * | |
  • * | |
  • * | |
  • |\ \ \
  • * | | |
  • | * | |
  • | * | |
  • | |\ \ \
  • | |/ / /
  • |/| | |
  • | * | |
  • * | | |
  • |\ \ \ \
  • | |/ / /
  • * | | |
  • | * | |
  • |/ / /
  • * | |
  • |\ \ \
  • * | | |
  • | * | |
  • |/ / /
  • * | |
  • |\ \ \
  • * | | |
  • | * | |
  • |/ / /
  • * | |
  • * | |
  • |\ \ \
  • * | | |
  • | * | |
  • |/ / /
  • * | |
  • * | |
  • |\ \ \
  • * | | |
  • | * | |
  • |/ / /
  • * | |
  • | | | *
  • | | |/
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • | |/
  • |/|
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • |\ \
  • * | |
  • * | |
  • | * |
  • |/ /
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • |\ \
  • * | |
  • | * |
  • | * |
  • |/ /
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • |\ \
  • * | |
  • | * |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • 0e063689 Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 如意 彭 2023-06-20 15:24:06 +0800
  • 75089fd0 机器人模型添加 by 如意 彭 2023-06-20 15:24:00 +0800
  • ca33e181 Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by ZhaoGang 2023-06-19 18:30:40 +0800
  • ed15d6ce 修改功能编辑页面。 by ZhaoGang 2023-06-19 18:30:33 +0800
  • 3cddfb63 炒锅通讯添加 by 如意 彭 2023-06-19 18:29:39 +0800
  • cea0a593 Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 如意 彭 2023-06-19 15:25:48 +0800
  • 12274941 控制修改 by 如意 彭 2023-06-19 15:25:43 +0800
  • 4fddadf0 Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by ZhaoGang 2023-06-19 15:25:37 +0800
  • df698441 修改配方管理界面。 by ZhaoGang 2023-06-19 15:25:35 +0800
  • 34ad8dc9 原料管理 by 如意 彭 2023-06-19 15:22:05 +0800
  • c020a93b Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by Mr_z 2023-06-19 10:16:47 +0800
  • 40cbd6eb 更新 by Mr_z 2023-06-19 10:16:37 +0800
  • 8639cbf8 1 by Nah 2023-06-18 22:02:45 +0800
  • 37c1a523 修改命名空间 by ZhaoGang 2023-06-16 18:41:37 +0800
  • 4c11e4b2 Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by ZhaoGang 2023-06-16 18:33:42 +0800
  • 2c7dbd78 调整添加原料页面 by ZhaoGang 2023-06-16 18:33:38 +0800
  • 63e4cac9 1 by 如意 彭 2023-06-16 18:33:22 +0800
  • 794c948e Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 如意 彭 2023-06-16 18:33:19 +0800
  • 8b7d0947 基础配置 by 如意 彭 2023-06-16 18:33:12 +0800
  • 3f25e86d Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by ZhaoGang 2023-06-16 17:10:07 +0800
  • d95a182d 添加页面 by ZhaoGang 2023-06-16 17:10:02 +0800
  • c9b2be01 物料信息添加 by 如意 彭 2023-06-16 17:08:48 +0800
  • 11fea40c Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 如意 彭 2023-06-16 16:52:20 +0800
  • 72913d6a 框架搭建 by 如意 彭 2023-06-16 16:52:17 +0800
  • 5a1414b0 添加依赖 by ZhaoGang 2023-06-16 16:51:25 +0800
  • 4f58ecaa 新增页面 by ZhaoGang 2023-06-16 16:44:46 +0800
  • 6a6b515f 新增页面 by ZhaoGang 2023-06-16 16:40:43 +0800
  • b0784c08 1 by 如意 彭 2023-06-16 16:34:46 +0800
  • 5bb2b54c 旅游学院修改为单机设备框架。 by ZhaoGang 2023-06-16 16:07:25 +0800
  • cff11e55 1 by ZhaoGang 2023-06-16 15:59:23 +0800
  • a9adfffb 新增页面 by ZhaoGang 2023-06-16 15:57:32 +0800
  • 70aba46e 1 by 如意 彭 2023-06-16 15:54:32 +0800
  • d007bcd0 1 by 如意 彭 2023-06-16 14:53:57 +0800
  • 0973051f Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 如意 彭 2023-06-16 14:16:38 +0800
  • 04f275ff 同步更新 by 如意 彭 2023-06-16 14:16:33 +0800
  • 03d02150 修改大料站原料厂显示顺序。 by ZhaoGang 2023-06-16 14:14:08 +0800
  • 03d5d98f 1 by 如意 彭 2023-06-16 11:44:34 +0800
  • 1ad7a6e3 取消订单下发指令添加日志。 by ZhaoGang 2023-06-16 11:39:47 +0800
  • e16afc9d 分支调整合并 by 如意 彭 2023-06-16 10:53:40 +0800
  • 26eb67ee 1 by 如意 彭 2023-06-15 21:40:41 +0800
  • 7af9b871 1 by 如意 彭 2023-06-15 21:25:41 +0800
  • 3b2a2649 1 by 如意 彭 2023-06-15 21:00:54 +0800
  • 746fe78e 1 by 如意 彭 2023-06-15 20:44:13 +0800
  • 8bfe9b27 1 by 如意 彭 2023-06-15 20:38:11 +0800
  • 8d95c34a 1 by 如意 彭 2023-06-15 20:34:06 +0800
  • a97d4951 1 by 如意 彭 2023-06-15 18:32:00 +0800
  • 23bedc90 1 by 如意 彭 2023-06-15 17:58:13 +0800
  • 6af72a35 1 by 如意 彭 2023-06-15 17:58:04 +0800
  • c8c0f36f 1 by 如意 彭 2023-06-15 17:33:52 +0800
  • 4a1540a1 1 by 如意 彭 2023-06-15 17:25:57 +0800
  • 06321117 1 by 如意 彭 2023-06-15 17:05:09 +0800
  • 70ca1619 1 by 如意 彭 2023-06-15 17:05:00 +0800
  • d3b20a58 1 by 如意 彭 2023-06-15 16:09:44 +0800
  • b88868d0 旅游学院程序添加 by 如意 彭 2023-06-15 16:07:14 +0800
  • 1e426e30 1 by 如意 彭 2023-06-14 09:51:21 +0800
  • 47097ed0 1. 大料站新增用户管理界面,修改参数显示样式。2. 小料站修改参数显示样式。 by ZhaoGang 2023-06-13 11:02:57 +0800
  • 10d55b7d 1. 完善操作日志记录。2. 修改新增配方默认为已筛选。 by ZhaoGang 2023-06-10 11:26:20 +0800
  • 54498f2e 对新增配料管理系统做修改。 by ZhaoGang 2023-06-09 17:09:50 +0800
  • 0ba65406 新增一个配料管理系统的项目,并做简单修改。 by ZhaoGang 2023-06-09 17:09:01 +0800
  • d99b65c5 小料站修正手动AGV送托盘要求判定。 by ZhaoGang 2023-06-09 09:56:13 +0800
  • 25fad3cb 修改配方详情页显示,以及暂时移除AGV送托盘命令验证程序。 by ZhaoGang 2023-06-08 17:09:49 +0800
  • 31a50654 小料站新增筛选功能及修改配方修改bug by ZhaoGang 2023-06-08 14:06:00 +0800
  • 5f588b23 修改配方下发判断逻辑。 by ZhaoGang 2023-06-07 16:53:56 +0800
  • e9a74484 新增配方筛选界面以及更新取消订单功能。 by ZhaoGang 2023-06-07 15:12:28 +0800
  • 12746711 新增配方分类及配方操作二次确认。 by ZhaoGang 2023-06-07 15:09:46 +0800
  • c5ea0411 小料站新增机器人动作标志位变量,修改配方完成数目为本地保存。 by ZhaoGang 2023-06-06 17:07:30 +0800
  • 35abe807 运行日志界面解决控件渲染卡顿。 by ZhaoGang 2023-06-06 09:37:26 +0800
  • 8fd6a1a2 小料站新增手动下发订单后,需延时10S才可点击AGV送托盘完成功能。 by ZhaoGang 2023-06-02 09:42:08 +0800
  • ace541c0 添加手动清除配方完成数目功能。 by ZhaoGang 2023-06-01 17:59:06 +0800
  • 2b4dba31 1. ProcessControl修改日志记录打印输出。2. xaml文件格式化,无修改。 by ZhaoGang 2023-06-01 17:06:45 +0800
  • 8b7a380c 1. 对于本地模拟订单编辑,删除,下发操作添加二次确认对话框。 2. 添加手动取消订单功能。 by ZhaoGang 2023-06-01 11:24:29 +0800
  • 83f26da5 Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by 如意 彭 2023-05-31 20:34:59 +0800
  • 4aae58c7 原料名称修改 by 如意 彭 2023-05-31 20:34:48 +0800
  • fd75af86 配方修改 by 如意 彭 2023-05-30 21:55:50 +0800
  • a1c3bd29 修改删除条目查找由根据原料位置查找变为根据原料名称查找。 by ZhaoGang 2023-05-30 18:47:09 +0800
  • 80aa8311 流程修改 by 如意 彭 2023-05-29 14:29:15 +0800
  • 2abc5f1a 业务流程优化 by 如意 彭 2023-05-26 19:03:21 +0800
  • 56024e18 新增图片 by 如意 彭 2023-05-24 14:17:27 +0800
  • 22bb9ec0 新建窗口参数修改 by 如意 彭 2023-05-23 18:23:07 +0800
  • e2a02e06 煮面机参数修改 by 如意 彭 2023-05-20 14:34:39 +0800
  • 03e6d090 新增出汤时间设定。 by ZhaoGang 2023-05-19 19:03:33 +0800
  • 282d1efb 修改出餐订单序号查找方式。 by ZhaoGang 2023-05-18 09:59:07 +0800
  • f90ff1ed 1.修改出餐序号显示问题。;2.删除出碗出餐订单号绑定。3.新增出餐互锁信号修改多出餐任务同时发出被覆盖的问题。 by ZhaoGang 2023-05-17 17:55:00 +0800
  • fa433a36 Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by 如意 彭 2023-05-17 15:33:08 +0800
  • a2d4c2c7 1 by 如意 彭 2023-05-17 15:33:02 +0800
  • 5dcb0839 取素菜逻辑多添加一个判断条件。 by ZhaoGang 2023-05-17 13:21:25 +0800
  • e7079de3 修改RobotTaskInterlock变量判断的IdleCount条件为>=0。 by ZhaoGang 2023-05-16 18:31:12 +0800
  • 155c2752 1 by 如意 彭 2023-05-16 17:58:02 +0800
  • c4015173 还原MORKS程序 by 如意 彭 2023-05-16 17:39:36 +0800
  • 8245c788 修改 by 如意 彭 2023-05-16 17:34:20 +0800
  • bad0f807 删除之前注释掉的代码。 by ZhaoGang 2023-05-16 17:24:08 +0800
  • e6625635 修改同一订单内同一物料多个数量情况下的物料信息解析方式。 by ZhaoGang 2023-05-16 16:00:08 +0800
  • e4b44efc 煮面机升级版:修改参数设置界面和煮面时间写入判断逻辑。 by ZhaoGang 2023-05-16 10:15:46 +0800
  • 874aa9c9 煮面机:修改煮面时间写入程序。 by ZhaoGang 2023-05-15 16:18:33 +0800
  • 6b7177e1 煮面机:参数设置界面新加煮面时间设定。 by ZhaoGang 2023-05-15 15:43:45 +0800
  • 30b94643 代码更新 by pengliangyang 2023-05-12 15:14:44 +0800
  • 085b5893 Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by pengliangyang 2023-05-12 14:23:46 +0800
  • 430a7ed2 注释部分代码更新 by pengliangyang 2023-05-12 14:23:33 +0800
  • d3805438 修改出餐和取菜逻辑互锁。 by Nah 2023-05-11 18:21:07 +0800
  • 13164ae0 Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by 如意 彭 2023-05-11 16:28:50 +0800