Commit Graph

425 Commits (80c55ca30db80c8563aeb283ffdbe21a88d2bb58)
 

Author SHA1 Message Date
wangsr 5c12ca24f1 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 8e8d7507b2 change - 修改黑粉统计班次时间 1 year ago
wangsr b8e602f016 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/PlcAddressUtil.cs
1 year ago
wangsr fc6fd3ebd0 改地址 1 year ago
wangsr f94f1bf911 change - 设备细节画面添加湿混机运转报警指示 1 year ago
nodyang d531a2699d 添加一个标识 来测试plc 得通讯能力 1 year ago
nodyang f30896869a PlcAddressUtil 修改Plc得地址 1 year ago
nodyang 112fbef84d 即使网络不同 也不会影响上位机的使用 1 year ago
nodyang 82f5fdd609 数据库一定连接本地 1 year ago
nodyang 61c4818106 1 去掉湿混机 8个点击按钮
2  添加日志搜索功能
3  通过按钮点击 增加日志
1 year ago
wangsr a2ab66c4cc change - MCRun最新部署 设备细节画面整合报表和图像代码 1 year ago
wangsr ebbe6ffcc0 debug - 实时刷新手动控制读取数据 1 year ago
wangsr b1158a6a17 debug - 实例化代码缺少 - 修复 1 year ago
wangsr 5b089e9709 change - PLC读取机制更改为一次读取整个数据块,性能优化成功 add - 黑粉统计报表添加最近班次统计功能 1 year ago
nodyang 23b27f9eb8 提供思路的版本 1 year ago
nodyang 90662b1bcd 优化代码 1 year ago
nodyang d1b58cc778 Merge branch 'dep' into dep_nodyang 1 year ago
nodyang 9c975c936b 正式的dep 1 year ago
nodyang f815fe9bca 时间改为8 1 year ago
wangsr 3c96697d35 change - 统计报表时间不精确问题解决 1 year ago
wangsr d54cd8c9a4 add - 黑粉统计添加明细和查询 change - 设备细节画面性能优化、错误校对 1 year ago
nodyang 0c76f9fdaa 测试的plc 1 year ago
nodyang 1f6bf2fda2 Merge branch 'dep1011' into dep_nodyang 1 year ago
nodyang b2af627760 接口 1 year ago
nodyang 50858979e4 Merge 1 year ago
nodyang d8d71bf3f0 merge 1 year ago
nodyang a0ee2a8868 Merge branch 'dep' into dep1011
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
1 year ago
nodyang 4618441c44 删除么有用的报表 1 year ago
nodyang dfcfd01e71 添加日报表 1 year ago
nodyang baea38c619 LjReport 1 year ago
nodyang 114b0ae6bd 暂时推送 1 year ago
nodyang 89f1f6ec93 临时存放数据 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
nodyang d65b6c7475 临时提交 1 year ago
nodyang 9f3c4e30ca Merge branch 'wangsr' into dep 1 year ago
wangsr 8676e8eda5 3000 1 year ago
wangsr a507327a96 临时提交 1 year ago
wangsr 4fb0b10928 半夜需求 1 year ago
wangsr 804e322945 add - hsl通讯展示界面 性能待优化 1 year ago
wangsr dc63fbdaf4 change - 加载时读取配置,修改配置 1 year ago
wangsr 5b71bd3012 add - 添加对接地址 1 year ago
wangsr 948af42a47 add - 手动控制添加保存功能 1 year ago
wangsr 15c2a22cf3 change - 重构手动控制 完善日志 添加焦点控制 1 year ago
wangsr af47d12b9b add - 下班前完善 - 添加按钮链接 1 year ago
wangsr 41fde0575d add - 处理下发请求 1 year ago
wangsr bcd9ccae26 add - 手动控制程序 添加日志 完善代码 1 year ago
wangsr ac92eb3529 add - timeradd 1 year ago
wangsr fb1ff146c0 add - 手动控制完成 下班 1 year ago
wangsr 1c27c80404 add - 手动操控 糊化机新需求 待整合PLC 1 year ago