Commit Graph
-
dc275e6dMerge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by 2023-08-21 16:37:32 +0800 -
4f38dcf71. 本地下发的配方，不对MES系统返回结束数据。 by 2023-08-21 14:41:17 +0800 -
d934dfdf1. 本地下发的配方，不对MES系统返回结束数据。 by 2023-08-21 14:41:17 +0800 -
4d21d7f31. 修改订单取消功能流程。 by 2023-08-20 16:46:07 +0800 -
2a8625dcMerge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by 2023-08-19 17:23:48 +0800 -
964f81851. 修改配方完成日志打印及显示界面。 2.调试日志打印时添加时间显示。 by 2023-08-19 17:02:21 +0800 -
03b164da1. 修改配方完成日志打印及显示界面。 by 2023-08-19 17:02:21 +0800 -
3c8453bf1. 修改配方记录界面显示信息。 by 2023-08-18 22:00:15 +0800 -
278f382a海科调试。 by 2023-08-18 16:06:10 +0800 -
d4757a40网络调整修改 by 2023-08-18 15:43:24 +0800 -
fb560fc9监控状态排序 by 2023-08-17 14:30:01 +0800 -
8947af011. 大料站添加全局变量监控。 by 2023-08-16 10:41:52 +0800 -
920c1207Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient by 2023-08-16 10:30:31 +0800 -
e8d384bcMerge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 2023-08-16 10:22:16 +0800 -
085ecfc12 by 2023-08-16 10:22:12 +0800 -
c768eb1a修改冒菜机的订单模拟功能。 by 2023-08-15 17:09:06 +0800 -
25729cc71 by 2023-08-08 13:51:23 +0800 -
c077ce77Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 2023-08-07 14:46:50 +0800 -
08628bef日志添加 by 2023-08-07 14:46:46 +0800 -
b0dc67521. 改为出餐优先 by 2023-08-07 14:45:58 +0800 -
9d1b7810柔性配料系统添加接收MQTT工单 by 2023-08-05 14:17:14 +0800 -
e1053908删除合并冲突印记 by 2023-08-02 10:10:24 +0800 -
0f03b6dd1 by 2023-08-01 10:21:55 +0800 -
e71cb4991 by 2023-08-01 10:21:04 +0800 -
6707cc5e1. 添加MQTTServer基础。2. 修改了一些命名。3. 删除了一些多余的类。 by 2023-08-01 10:01:55 +0800 -
a07b4a8bMerge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 2023-07-28 18:16:59 +0800 -
30d0f670剔除西门子业务逻辑 by 2023-07-28 18:16:49 +0800 -
9e2c2474Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 2023-07-21 14:26:09 +0800 -
5e818a85阿里云联调更新 by 2023-07-21 14:26:01 +0800 -
17c108c6日志打印简化 by 2023-07-21 10:52:33 +0800 -
30a98516(JXJAgvReake) 1 by 2023-07-18 15:39:40 +0800 -
bd840e91增加物模型默认模板事件 by 2023-07-18 10:21:44 +0800 -
90494886Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 2023-07-13 18:29:32 +0800 -
176c56a5物模型属性更新 by 2023-07-13 18:29:25 +0800 -
92f767f01 by 2023-07-13 11:19:43 +0800 -
70ea1d70Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 2023-07-13 10:44:21 +0800 -
ba8fffe31Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 2023-07-13 10:43:08 +0800 -
9167417dMerge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 2023-07-13 10:43:08 +0800 -
88014f7c1. 代码格式化。2.恢复注释。 by 2023-07-13 10:43:00 +0800 -
f2a16ec1增加料仓在线状态属性上报 by 2023-07-12 18:19:53 +0800 -
84fb2cfdMerge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 2023-07-12 18:14:05 +0800 -
8079a30c柔性配料系统接入阿里云Iot by 2023-07-12 18:13:58 +0800 -
b89c5f2d1. 修改数据库初始化。 by 2023-07-08 12:21:15 +0800 -
2ac2bb56Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 2023-07-07 18:32:07 +0800 -
c1cea78e1. 优化手动调试系界面代码。2. 完善报警变量及赋值。 by 2023-07-07 18:31:56 +0800 -
912e73f7冲突更新 by 2023-07-07 09:59:28 +0800 -
a418a36a更新 by 2023-07-07 09:50:58 +0800 -
56c102351. 修改入库程序到Control_MorkCL里。2. 配方编辑界面添加上移下移功能。 by 2023-07-06 18:32:32 +0800 -
1cd8119b修改手动调试炒锅界面代码。 by 2023-07-06 10:04:58 +0800 -
c0af685c1. 完善手动调试界面。2. 修改入库条件判断。 by 2023-07-05 17:57:57 +0800 -
96480def海科调试。 by 2023-07-04 17:59:03 +0800 -
9a14ec46从站设置 by 2023-07-04 11:32:20 +0800 -
64fc2d20Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 2023-07-04 11:29:40 +0800 -
dc34d540恢复注释。 by 2023-07-04 11:29:26 +0800 -
937e5b14下发配方时添加物料查找验证。 by 2023-07-04 09:46:27 +0800 -
b0a1aeceMerge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 2023-07-04 09:44:55 +0800 -
678c9099测试项目添加 by 2023-07-04 09:44:50 +0800 -
3d6149a7添加手动调试界面。 by 2023-07-03 18:31:02 +0800 -
3d3dfcce修改入库界面库位显示。 by 2023-07-03 18:30:47 +0800 -
e99a352a修改配方分配逻辑。 by 2023-07-03 16:13:55 +0800 -
85b638fd1. 添加修改变量。2. 修改配方功能。 by 2023-07-03 11:30:31 +0800 -
db149553海科调试修改。 by 2023-06-30 18:03:43 +0800 -
e5d89c92Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 2023-06-29 18:31:11 +0800 -
a72757c11 by 2023-06-29 18:31:03 +0800 -
b384e0e51. 添加日志输出，测试订单下发。2. 读取变量程序更新。 by 2023-06-29 14:07:52 +0800 -
78cdd8c5柔性配料调试更新 by 2023-06-28 17:11:07 +0800 -
c3d46b40更新 by 2023-06-28 10:34:05 +0800 -
8e7aec3c配料状态更新 by 2023-06-28 10:29:29 +0800 -
3b9e68d0Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 2023-06-28 09:59:33 +0800 -
e89c8477调试更新 by 2023-06-28 09:59:22 +0800 -
7ad95a231 by 2023-06-28 09:55:50 +0800 -
f216983aMerge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 2023-06-27 18:25:44 +0800 -
e0371294修复加载Json文件多添加参数的问题。以及代码格式化。 by 2023-06-27 18:25:36 +0800 -
310f8e65配方功能参数编辑框调整为部分参数使用ComboBox选择。 by 2023-06-27 14:04:44 +0800 -
e8fa4876Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 2023-06-27 10:25:09 +0800 -
5d9c2888配方执行逻辑更新 by 2023-06-27 10:25:01 +0800 -
a94953e81 by 2023-06-26 22:22:14 +0800 -
70e6844d成都旅游学院项目修改所在文件夹名称。 by 2023-06-26 17:49:32 +0800 -
5f343e36Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 2023-06-26 17:48:42 +0800 -
ad732e6d新增全局流程变量监控页面。 by 2023-06-26 17:48:34 +0800 -
b692557aMerge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 2023-06-26 15:36:48 +0800 -
70b008a51 by 2023-06-26 15:36:43 +0800 -
0aafdb64Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 2023-06-26 15:36:13 +0800 -
a2dc345f多桶配料 by 2023-06-26 15:35:55 +0800 -
c8f3eeceMerge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 2023-06-26 11:14:41 +0800 -
347fedfd1 by 2023-06-26 11:14:35 +0800 -
f9ee456b冲突解决 by 2023-06-26 11:11:56 +0800 -
12627e7f调试更新 by 2023-06-26 11:04:22 +0800 -
8e1e6b47配方ID改为自动生成。 by 2023-06-25 18:29:25 +0800 -
504ab28cMerge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 2023-06-25 18:28:38 +0800 -
5bad282b修改配方数据，新增配方下发。 by 2023-06-25 18:28:33 +0800 -
5d34b830包管理更新 by 2023-06-25 18:28:12 +0800 -
c44d1bffMerge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 2023-06-25 18:03:15 +0800 -
40cf72d7模拟配方提添加 by 2023-06-25 18:03:11 +0800 -
3c211434Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 2023-06-25 17:37:13 +0800 -
66c36ec4修改配方Model类命名。 by 2023-06-25 17:37:11 +0800 -
449897d2模拟工艺添加 by 2023-06-25 17:36:07 +0800 -
c9a7ab811 by 2023-06-25 17:00:07 +0800 -
427d4bf51 by 2023-06-25 16:54:41 +0800 -
b1fed931Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration by 2023-06-25 16:47:06 +0800