Commit Graph

118 Commits (9af634d4b34c99ed329ac812dab22c2062957500)

Author SHA1 Message Date
wangsr bbdba86dd4 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 0eb4288d01 change - 改名
nodyang 18634444a4 fix
wangsr 8a6fecc6cb Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr cfa80ec7f3 change - 三通阀逻辑控制完善
nodyang 8f5e9f0fc9 fix配方
nodyang 927685d010 plc最终版提交经过测试
wangsr 5e39f02bd1 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
#	Main/MCRun/Data/MCProject/nodeDevice.xml
nodyang e8224d1f53 emrge
wangsr f3f6e1afc3 add - 添加界面
nodyang 2e02aa0483 nodeDevice.xml
nodyang 6895e8cde4 整理代码
nodyang d03d423814 比例阀
nodyang 24400a59c9 阀门
wangsr 39d8fdd960 change - text limit
wangsr 1fb17ee8f0 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 4a9cc5c480 change - delete sql change
nodyang f195102a8a 整理代码
nodyang 48e1497789 Merge branch 'wangsr' into dep_yangw
# Conflicts:
#	Mesnac.DoUtils/DoControl.cs
wangsr 4c853034dd add - 数据块状态检测(差两个struct数据类型)
nodyang 73320cb736 merge
wangsr 9b29781643 add - ParameterWithPC部分状态监测
wangsr 92bfefa190 add - DB1165状态监测 部分完成 nodeDevice维护
wangsr 4eb0084239 add - MotorinitStateMonitor 结束
wangsr 8331712550 add - 阀门数据类状态监测 维护nodeDevice
wangsr a42944f15d change - 榄菊设备参数压力管理 partchange
wangsr 6c0ba7c4db change - 大小写问题
wangsr 44b54a1796 小修改
wangsr e06d8c8d68 Merge branch 'dep_yangw' into wangsr
nodyang 465c348df0 应用类库
wangsr 6bc53e73d9 Merge branch 'dep_yangw' into wangsr2
# Conflicts:
#	Main/MCEdit/Data/MCProject/nodeDataSource.xml
nodyang dd9fcefccf 修改plc
wangsr 2b5fccc5e8 解决合并冲突——wangsr+dep_yangw
wangsr cc10602c3f Merge branch 'dep_yangw' into wangsr
# Conflicts:
#	Main/MCEdit/Data/MCProject/nodeDataSource.xml
#	Main/MCEdit/Data/MCProject/nodeDevice.xml
wangsr bcdede6928 add - Timer部分引入
nodyang df5758ff0c Merge branch 'dep' into dep_yangw
nodyang cc80555fdf 最新版本的plc nodeDevice.xml
wenjy 58cc555f55 change - 超级管理员密码修改
nodyang bdd2371ba4 修订Plc
wangsr da6ba6e358 add - 阀门控制调试
wangsr 33807824bd add - 加入简易报警灯控制和部分日志
wangsr 61e5d44119 change - PLC电机控制代码完善
wangsr acef76c492 add - 电机调试窗口、逻辑、plc连接(待测试优化)
nodyang 9379b9d227 Merge branch 'wangsr' into dep
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
nodyang eed38ad76e Merge branch 'dep_plan' into dep
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
nodyang 2c79df191e 代码整理
wangsr 1925bef7a6 add - 糊化机报表 初始化 查询 双击加载 导出 湿混机报表些许问题待完善
wangsr a3d5f972db 解决冲突 合并
wangsr 948bdaf7c4 add - 湿混机报表 - 功能缺陷
wangsr 0b0b801b2d change- run运行问题处理