Commit Graph

109 Commits (f30896869a4c1a24b9a2367bb3ddabb56eb548f3)

Author SHA1 Message Date
wangsr d54cd8c9a4 add - 黑粉统计添加明细和查询 change - 设备细节画面性能优化、错误校对 1 year ago
nodyang 1f6bf2fda2 Merge branch 'dep1011' into dep_nodyang 1 year ago
nodyang b2af627760 接口 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 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
wangsr 804e322945 add - hsl通讯展示界面 性能待优化 1 year ago
wangsr 948af42a47 add - 手动控制添加保存功能 1 year ago
wangsr 41fde0575d add - 处理下发请求 1 year ago
wangsr bcd9ccae26 add - 手动控制程序 添加日志 完善代码 1 year ago
wangsr ef46dce828 add - 手动控制等待引入PLC 1 year ago
wangsr 865c17e169 add - 手动控制添加 1 year ago
wangsr fad95ec358 change - 简化代码初步 1 year ago
wangsr 4bfc54b494 测试提交 1 year ago
wangsr c5c60daf59 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 8455a4b825 change - 加载界面 1 year ago
nodyang e1342383fb 0915 替换plc 1 year ago
wangsr 67ab37d415 Add - LJPlanning-TestAction等待实装 1 year ago
wangsr 65848c2175 add - 添加计划状态下拉框 数据库变更 1 year ago
wangsr 6e98ca3d4c Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 37fcb77890 change - 计划配方新增查询功能 1 year ago
nodyang 8a021e197c 采用胡工 替换西门子 1 year ago
nodyang 33cde15530 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
nodyang 9c5ad7a7c5 准备继承 hsl 1 year ago
nodyang 6eaee007f6 Demo 1 year ago
nodyang f2fe90ef1a freesql 1 year ago
nodyang c9087e86de 添加数据访问 1 year ago
wangsr a62b3fc913 change - yw保存报表界面美化 1 year ago
nodyang cd50514e00 修复按钮 1 year ago
wangsr 63eab8ca08 add - 设备监控界面添加报警 1 year ago
wangsr 37e66a188d add - 报表plchelper数据读取废案 1 year ago
nodyang 55a9a78539 0913 整理代码 1 year ago
nodyang 7e71fd990b 2107 add 新增数据库2107 1 year ago
nodyang 7848b05546 merge 1 year ago
nodyang 4e0213df1b 榄菊新的管理 1 year ago
nodyang d48a870f9f 页面整合处理 1 year ago
wangsr f3f6e1afc3 add - 添加界面 1 year ago
nodyang d03d423814 比例阀 1 year ago
wangsr dfd2e0c826 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 39d8fdd960 change - text limit 1 year ago
nodyang 440a6da24f 压力管理 1 year ago
nodyang f195102a8a 整理代码 1 year ago
wangsr 716d43eaf8 change - 设备压力参数管理维护 1 year ago
nodyang 48e1497789 Merge branch 'wangsr' into dep_yangw
# Conflicts:
#	Mesnac.DoUtils/DoControl.cs
1 year ago
wangsr 4c853034dd add - 数据块状态检测(差两个struct数据类型) 1 year ago