Commit Graph

151 Commits (acebd40093794b95b7b7b819ca677091f1bbf666)

Author SHA1 Message Date
nodyang 55a9a78539 0913 整理代码
nodyang 7e71fd990b 2107 add 新增数据库2107
nodyang a5e0b1e767 0912 测试计划的版本呢
wangsr 8942b48b85 Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
wangsr 918040618a change - 中横线改下划线
nodyang d14fa8de9d demo
nodyang aeab567cc7 修补缺失的点位
nodyang 9fbf00b15f mege
nodyang 1f0c2da3d3 Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
nodyang 7848b05546 merge
wangsr 28de46fb64 change - 界面美化
nodyang 9f13b74e6d 0907 晚上临时提交
wangsr 62bbcfaf91 解决合并冲突 最终正常期望版本
nodyang e6ce524df2 0907
wangsr d8b0eb696d add - 输送监视图完成 点位开始维护 换电脑
nodyang 1761df780f Merge branch 'dep0901' into dep
nodyang 4e0213df1b 榄菊新的管理
nodyang c72bd4553b add 重新编辑配方
wangsr b27477df99 change - 按钮逻辑修改
nodyang d48a870f9f 页面整合处理
nodyang a1c9ba3aac 生产计划
nodyang 57880f5e4e 0830 提交
nodyang 1c0fbf79e8 重量 参数管理
nodyang 1b2f8d16c7 SaveWetMixerReport
nodyang 9af634d4b3 Fix
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配方
wangsr 5e39f02bd1 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
#	Main/MCRun/Data/MCProject/nodeDevice.xml
wangsr f3f6e1afc3 add - 添加界面
nodyang 6895e8cde4 整理代码
nodyang d03d423814 比例阀
nodyang 24400a59c9 阀门
wangsr dfd2e0c826 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 39d8fdd960 change - text limit
nodyang 440a6da24f 压力管理
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 整理代码
wangsr 716d43eaf8 change - 设备压力参数管理维护
nodyang 48e1497789 Merge branch 'wangsr' into dep_yangw
# Conflicts:
#	Mesnac.DoUtils/DoControl.cs
wangsr 6f0a34056e 提交准备合并
wangsr 6ee566826c change - PlcCommunication代码优化
wangsr 4c853034dd add - 数据块状态检测(差两个struct数据类型)
nodyang 73320cb736 merge
wangsr 9b29781643 add - ParameterWithPC部分状态监测
wangsr 92bfefa190 add - DB1165状态监测 部分完成 nodeDevice维护