Commit Graph

101 Commits (dep)

Author SHA1 Message Date
wangsr ac187e588e Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportReadDb.cs
#	DataBlockHelper/DBHelpers/DB2105Helper.cs
12 months ago
wangsr c7656457e9 add - 日志控制抽离 添加单独日志查询界面 12 months ago
我叫锄头 d6fba409f8 RunStatus 12 months ago
我叫锄头 0d00e4ccff 修改数据区,把手动称量变成自动称量区域 12 months ago
我叫锄头 6748c7fe4c 干混机称量准备好 12 months ago
我叫锄头 cd4282af76 WriteM 读取去掉 12 months ago
我叫锄头 bcb198e65a 水称下传 水秤添加 differ 和 stand 12 months ago
wangsr 4fce1247ef change - plcreadchange 12 months ago
我叫锄头 586d3879a8 DB3000 修复 7 和8 12 months ago
wangsr b5a7c0624a change - 维护DB90 DB1 12 months ago
wangsr d0af57087e add - 强制手动加水 12 months ago
我叫锄头 152a0224fb Db2119WriteHelper 12 months ago
wangsr d66d412077 add - 强制水称控制 12 months ago
wangsr 0b9c8b3233 add - 控件可行性分析 12 months ago
wangsr e83ec7e87d change - 添加验证 优化代码 1 year ago
wangsr 7ae0b0f22c add - 自动控制添加下料检测 展示界面添加混炼完成指示无故熄灭报警 1 year ago
wangsr 60898a6830 change - 准备输送界面 代码简化 1 year ago
nodyang c84878f388 2105 准备信号 1 year ago
wangsr 020548a811 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr f96ab5dfec add - 自动状态改变显示 1 year ago
nodyang a594bc6510 插入的plc的 前提是 清理所有的step 1 year ago
nodyang 5a2b9e5c2b 修复水秤的bug 变异量不对 1 year ago
wangsr dee332a98f debug - 自动控制问题修改 1 year ago
wangsr 6b66086ba6 merge 1 year ago
nodyang 441698afe2 DB2105WriteHelper 添加干混机 湿混机 下料 拍冷热水的按钮事件 1 year ago
wangsr 2a3945d872 add - 手动控制基本完成 - 可以下达数据 1 year ago
nodyang 25a8cad456 merge 1 year ago
wangsr 9b31b74429 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 2a39faf545 add - 自动控制准备编辑写入plc部分 准备合并 1 year ago
nodyang 15497c35fe GetManScrew 1 year ago
nodyang c021fccbf3 DB2105WriteHelper 修复2105启动运行 停止运行 设定 1 year ago
wangsr 27fad81be8 add - 自动控制 - 新版 1 year ago
nodyang 16840c81fc 增加点位 1 year ago
nodyang fdc12243dc 添加闽安功能 1 year ago
wangsr a4c1deeef1 change - 维护DB91 90 1 手动控制添加冷热水交替检测 1 year ago
nodyang a4cd1b8cf5 读取Db3000Help 1 year ago
wangsr 26d450e609 change - 文字错误更改 螺旋正反转显示实现 dbhelper错误更改 1 year ago
wangsr 513884b90f change - 添加DB2119数据块 手动控制更新新数据块 添加螺旋称量值 1 year ago
wangsr 72d675cb2f change - 设备细节画面报警重构 - 部分完成 1 year ago
nodyang b8fd1abf49 整改Ip 1 year ago
wangsr f94f1bf911 change - 设备细节画面添加湿混机运转报警指示 1 year ago
wangsr b1158a6a17 debug - 实例化代码缺少 - 修复 1 year ago
wangsr 5b089e9709 change - PLC读取机制更改为一次读取整个数据块,性能优化成功 add - 黑粉统计报表添加最近班次统计功能 1 year ago
nodyang 90662b1bcd 优化代码 1 year ago
nodyang dfe261ff96 Merge branch 'dep' into dep1011
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
#	Main/MCEdit/MCEdit.csproj
1 year ago
nodyang ef86b96e76 修复一个版本 1 year ago
wangsr 804e322945 add - hsl通讯展示界面 性能待优化 1 year ago
wangsr ef46dce828 add - 手动控制等待引入PLC 1 year ago
wangsr 4bfc54b494 测试提交 1 year ago
nodyang e1342383fb 0915 替换plc 1 year ago
nodyang 8a021e197c 采用胡工 替换西门子 1 year ago