Commit Graph

Select branches

Hide Pull Requests

dep

dep_deliver

dep_nodyang

master

wangsr

alpha-V1.0

Mono Color

• 7fc6077b8c Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep wangsr 2023-10-26 18:46:37 +0800
• 24c668cb42 change - 自动控制单选变色 wangsr 2023-10-26 18:45:13 +0800
• bf62b0ec69 获取控件和修改数数量 nodyang 2023-10-26 17:56:29 +0800
• b3638888ea finish - 自动控制代码初步完成 wangsr 2023-10-26 17:14:37 +0800
• 8c8dbc7b23 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep wangsr 2023-10-26 17:07:22 +0800
• 62d5726a48 change - 优化代码 wangsr 2023-10-26 17:07:17 +0800
• 7debe29fb0 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep nodyang 2023-10-26 16:55:23 +0800
• d4fa9f6fdb DownM8Recip 湿混机 6 7 8 地址不对 nodyang 2023-10-26 16:55:13 +0800
• 268504564a Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep wangsr 2023-10-26 16:48:46 +0800
• 40199b6cde change - 规范代码 wangsr 2023-10-26 16:48:00 +0800
• fa35c70ad8 souce nodyang 2023-10-26 16:47:07 +0800
• 27ab6500c7 暂存plc 有问题 修复plc 读数有问题 nodyang 2023-10-26 15:42:21 +0800
• 034d3b1a92 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep wangsr 2023-10-26 15:23:59 +0800
• 6b66086ba6 merge wangsr 2023-10-26 15:23:45 +0800
• 2f2a247f13 short 类型问题 nodyang 2023-10-26 15:21:09 +0800
• 730d508524 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep nodyang 2023-10-26 14:59:43 +0800
• 9b486b5c75 修复plc 读取错误 nodyang 2023-10-26 14:58:30 +0800
• 48461980dc Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep wangsr 2023-10-26 10:16:36 +0800
• 9d346c0b69 add - 完善自动代码 wangsr 2023-10-26 10:16:31 +0800
• 1e30a7d07a GetCodeById nodyang 2023-10-26 09:54:19 +0800
• f5b934fdb4 GetCodeById 修复不等于0 的 nodyang 2023-10-26 09:53:39 +0800
• 441698afe2 DB2105WriteHelper 添加干混机 湿混机 下料 拍冷热水的按钮事件 nodyang 2023-10-26 09:50:01 +0800
• 951df4fd99 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep wangsr 2023-10-25 20:01:59 +0800
• 2a3945d872 add - 手动控制基本完成 - 可以下达数据 wangsr 2023-10-25 20:01:52 +0800
• 17198e753f Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep nodyang 2023-10-25 18:00:20 +0800
• 366640bdca DeviceMaterrial nodyang 2023-10-25 18:00:07 +0800
• 586725012e Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep wangsr 2023-10-25 17:43:38 +0800
• c42f69ba1f merge wangsr 2023-10-25 17:43:20 +0800
• b2476a6af4 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep nodyang 2023-10-25 17:42:54 +0800
• 6a06438e5b 请选择 nodyang 2023-10-25 17:42:28 +0800
• f48552a8da Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep wangsr 2023-10-25 17:36:34 +0800
• e8f0b31354 merge wangsr 2023-10-25 17:36:27 +0800
• 476fbd3c57 GetDryerMaterrial nodyang 2023-10-25 17:35:13 +0800
• 3064f8aabf Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep wangsr 2023-10-25 17:27:34 +0800
• a9fe7cdc1b change - 添加combobox wangsr 2023-10-25 17:26:47 +0800
• 492122310d MyMCCombobox 添加 nodyang 2023-10-25 17:25:08 +0800
• 25a8cad456 merge nodyang 2023-10-25 17:20:59 +0800
• 732fd48f6e 合并 wangsr 2023-10-25 17:18:06 +0800
• 9b31b74429 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep wangsr 2023-10-25 16:53:46 +0800
• 2a39faf545 add - 自动控制准备编辑写入plc部分 准备合并 wangsr 2023-10-25 16:53:17 +0800
• bb594c19b0 StockMaterrialDbHelp 改成静态 nodyang 2023-10-25 16:38:52 +0800
• 15497c35fe GetManScrew nodyang 2023-10-25 16:34:46 +0800
• 29ecb2f5ea Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep nodyang 2023-10-25 16:31:55 +0800
• e31425205e merge nodyang 2023-10-25 16:31:45 +0800
• c021fccbf3 DB2105WriteHelper 修复2105启动运行 停止运行 设定 nodyang 2023-10-25 16:31:16 +0800
• 72862134be Merge branch 'dep' into wangsr wangsr 2023-10-25 15:37:26 +0800
• 153d412a3e add - 自动控制代码前后端连接完成 等待插入Plc wangsr 2023-10-25 15:36:52 +0800
• 67eb1825d0 StockMaterrialDbHelp nodyang 2023-10-25 15:33:32 +0800
• c1c84b2979 Merge branch 'wangsr' of http://175.27.215.92:3000/yangw/lj_plc into wangsr wangsr 2023-10-25 14:11:24 +0800
• 27fad81be8 add - 自动控制 - 新版 wangsr 2023-10-25 14:05:32 +0800
• 0125e123f5 fix nodyang 2023-10-25 13:21:53 +0800
• 745a8fdab2 Merge branch 'dep_nodyang' into wangsr wangsr 2023-10-25 08:15:51 +0800
• 8523ffec52 去掉plc dep_nodyang nodyang 2023-10-24 15:52:48 +0800
• d7cd1d90bc 整理代码 add 读取配置和 下工艺 nodyang 2023-10-24 14:33:18 +0800
• cd3d3fcf1b add - 添加自动控制界面，初步排版完成 wangsr 2023-10-24 14:23:22 +0800
• 561213fe66 读取配置 nodyang 2023-10-24 13:17:51 +0800
• 16840c81fc 增加点位 nodyang 2023-10-24 09:14:45 +0800
• 5b648d2ff8 change - 配置存到数据库 前端页面报警数据位置纠正 wangsr 2023-10-23 14:39:53 +0800
• 21d48d9562 change - 规整代码 合并前准备 wangsr 2023-10-23 09:09:45 +0800
• 9c858fb669 change - 手动控制校验写入是否成功3 wangsr 2023-10-22 13:45:58 +0800
• 2fd7a22c1d 修改系统颜色 nodyang 2023-10-22 09:08:26 +0800
• fdc12243dc 添加闽安功能 nodyang 2023-10-20 13:52:21 +0800
• a4c1deeef1 change - 维护DB91 90 1 手动控制添加冷热水交替检测 wangsr 2023-10-20 01:30:27 +0800
• 656c118b10 显示下料的接口 nodyang 2023-10-19 17:41:07 +0800
• a4cd1b8cf5 读取Db3000Help nodyang 2023-10-19 17:03:32 +0800
• 87009dfd0b add - 黑粉统计添加设定值显示 wangsr 2023-10-18 23:23:24 +0800
• da9eb0b193 Merge branch 'wangsr' into dep wangsr 2023-10-18 20:25:56 +0800
• 8a033216a2 change - 设备展示界面修改 wangsr 2023-10-18 20:25:37 +0800
• 1846848362 去掉一个引用 nodyang 2023-10-18 10:22:32 +0800
• 7fb60e4423 Merge branch 'wangsr' of http://175.27.215.92:3000/yangw/lj_plc into wangsr wangsr 2023-10-18 04:46:49 +0800
• 3e03c8da8e merge error wangsr 2023-10-18 04:46:43 +0800
• 26d450e609 change - 文字错误更改 螺旋正反转显示实现 dbhelper错误更改 wangsr 2023-10-18 04:45:14 +0800
• 5ca78fc6ef change - 更改日志记录方式 重构手动控制日志记录 wangsr 2023-10-18 04:20:42 +0800
• 513884b90f change - 添加DB2119数据块 手动控制更新新数据块 添加螺旋称量值 wangsr 2023-10-17 22:36:49 +0800
• c434a64a2a 点击变颜色 nodyang 2023-10-17 12:19:44 +0800
• 72d675cb2f change - 设备细节画面报警重构 - 部分完成 wangsr 2023-10-17 05:52:08 +0800
• 799c0ea68c 1 在湿混机下面加个Rva 小车 信息。 监控有没有报警 nodyang 2023-10-16 14:09:53 +0800
• d4223bf026 对接闽安系统 点击按钮提示正在上料 nodyang 2023-10-16 08:25:53 +0800
• 1f52509a44 change - 画面展示报表改为PLC读取 wangsr 2023-10-16 03:57:17 +0800
• b8fd1abf49 整改Ip nodyang 2023-10-15 15:46:06 +0800
• 5c12ca24f1 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep wangsr 2023-10-14 22:43:27 +0800
• 8e8d7507b2 change - 修改黑粉统计班次时间 wangsr 2023-10-14 22:43:05 +0800
• b8e602f016 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep wangsr 2023-10-14 21:04:25 +0800
• fc6fd3ebd0 改地址 wangsr 2023-10-14 21:03:38 +0800
• f94f1bf911 change - 设备细节画面添加湿混机运转报警指示 wangsr 2023-10-14 21:02:12 +0800
• d531a2699d 添加一个标识 来测试plc 得通讯能力 nodyang 2023-10-14 17:22:11 +0800
• f30896869a PlcAddressUtil 修改Plc得地址 nodyang 2023-10-14 13:44:28 +0800
• 112fbef84d 即使网络不同 也不会影响上位机的使用 nodyang 2023-10-14 13:43:21 +0800
• 82f5fdd609 数据库一定连接本地 nodyang 2023-10-14 13:30:02 +0800
• 61c4818106 1 去掉湿混机 8个点击按钮 2 添加日志搜索功能 3 通过按钮点击 增加日志 nodyang 2023-10-14 13:27:53 +0800
• a2ab66c4cc change - MCRun最新部署 设备细节画面整合报表和图像代码 wangsr 2023-10-14 04:29:01 +0800
• ebbe6ffcc0 debug - 实时刷新手动控制读取数据 wangsr 2023-10-14 03:56:41 +0800
• b1158a6a17 debug - 实例化代码缺少 - 修复 wangsr 2023-10-14 03:32:49 +0800
• 5b089e9709 change - PLC读取机制更改为一次读取整个数据块，性能优化成功 add - 黑粉统计报表添加最近班次统计功能 wangsr 2023-10-14 03:07:30 +0800
• 23b27f9eb8 提供思路的版本 nodyang 2023-10-13 14:45:53 +0800
• 90662b1bcd 优化代码 nodyang 2023-10-13 14:39:11 +0800
• d1b58cc778 Merge branch 'dep' into dep_nodyang nodyang 2023-10-13 09:21:34 +0800
• 9c975c936b 正式的dep nodyang 2023-10-13 09:21:13 +0800
• f815fe9bca 时间改为8 nodyang 2023-10-13 09:17:17 +0800
• 3c96697d35 change - 统计报表时间不精确问题解决 wangsr 2023-10-13 07:17:48 +0800