Commit Graph

137 Commits (628c767f951bd7758147fa8a313a17c373cea97c)

Author SHA1 Message Date
wangsr 564616b7bf change - 自动控制代码重构 1 year ago
wangsr 051c41da3d add - 干混机糊化机整合 干混机功能添加 1 year ago
wangsr 4ef5cc7372 自动控制添加日志 1 year ago
wangsr 3cc7023fb5 change - 水称加入初始化读取 1 year ago
wangsr 6b66086ba6 merge 1 year ago
wangsr 9d346c0b69 add - 完善自动代码 1 year ago
wangsr 951df4fd99 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 2a3945d872 add - 手动控制基本完成 - 可以下达数据 1 year ago
nodyang 17198e753f Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
nodyang 366640bdca DeviceMaterrial 1 year ago
wangsr c42f69ba1f merge 1 year ago
nodyang 476fbd3c57 GetDryerMaterrial 1 year ago
wangsr a9fe7cdc1b change - 添加combobox 1 year ago
nodyang e31425205e merge 1 year ago
wangsr 27fad81be8 add - 自动控制 - 新版 1 year ago
nodyang d7cd1d90bc 整理代码 add 读取配置和 下工艺 1 year ago
wangsr 5b648d2ff8 change - 配置存到数据库 前端页面报警数据位置纠正 1 year ago
wangsr 21d48d9562 change - 规整代码 合并前准备 1 year ago
nodyang fdc12243dc 添加闽安功能 1 year ago
wangsr a4c1deeef1 change - 维护DB91 90 1 手动控制添加冷热水交替检测 1 year ago
nodyang 656c118b10 显示下料的接口 1 year ago
wangsr 87009dfd0b add - 黑粉统计添加设定值显示 1 year ago
nodyang 1846848362 去掉一个引用 1 year ago
wangsr 5ca78fc6ef change - 更改日志记录方式 重构手动控制日志记录 1 year ago
nodyang 799c0ea68c 1 在湿混机下面加个Rva 小车 信息。 监控有没有报警 1 year ago
nodyang d4223bf026 对接闽安系统 点击按钮提示正在上料 1 year ago
wangsr 1f52509a44 change - 画面展示报表改为PLC读取 1 year ago
nodyang b8fd1abf49 整改Ip 1 year ago
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