Commit Graph

154 Commits (a62b3fc913820af4b376382b96ec8f6f61b9cd95)

Author SHA1 Message Date
wangsr a62b3fc913 change - yw保存报表界面美化 1 year ago
nodyang cd50514e00 修复按钮 1 year ago
wangsr f926545355 change - 修改nodedevice 完善设备监控图 发版前准备 1 year ago
wangsr 63eab8ca08 add - 设备监控界面添加报警 1 year ago
wangsr 37e66a188d add - 报表plchelper数据读取废案 1 year ago
nodyang 94101f3a1d 后台运行 1 year ago
nodyang 55a9a78539 0913 整理代码 1 year ago
nodyang 7e71fd990b 2107 add 新增数据库2107 1 year ago
nodyang a5e0b1e767 0912 测试计划的版本呢 1 year ago
wangsr 8942b48b85 Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907 1 year ago
wangsr 918040618a change - 中横线改下划线 1 year ago
nodyang d14fa8de9d demo 1 year ago
nodyang aeab567cc7 修补缺失的点位 1 year ago
nodyang 9fbf00b15f mege 1 year ago
nodyang 1f0c2da3d3 Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907 1 year ago
nodyang 7848b05546 merge 1 year ago
wangsr 28de46fb64 change - 界面美化 1 year ago
nodyang 9f13b74e6d 0907 晚上临时提交 1 year ago
wangsr 62bbcfaf91 解决合并冲突 最终正常期望版本 1 year ago
nodyang e6ce524df2 0907 1 year ago
wangsr d8b0eb696d add - 输送监视图完成 点位开始维护 换电脑 1 year ago
nodyang 1761df780f Merge branch 'dep0901' into dep 1 year ago
nodyang 4e0213df1b 榄菊新的管理 1 year ago
nodyang c72bd4553b add 重新编辑配方 1 year ago
wangsr b27477df99 change - 按钮逻辑修改 1 year ago
nodyang d48a870f9f 页面整合处理 1 year ago
nodyang a1c9ba3aac 生产计划 1 year ago
nodyang 57880f5e4e 0830 提交 1 year ago
nodyang 1c0fbf79e8 重量 参数管理 1 year ago
nodyang 1b2f8d16c7 SaveWetMixerReport 1 year ago
nodyang 9af634d4b3 Fix 1 year ago
nodyang 18634444a4 fix 1 year ago
wangsr 8a6fecc6cb Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr cfa80ec7f3 change - 三通阀逻辑控制完善 1 year ago
nodyang 8f5e9f0fc9 fix配方 1 year ago
wangsr 5e39f02bd1 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
#	Main/MCRun/Data/MCProject/nodeDevice.xml
1 year ago
wangsr f3f6e1afc3 add - 添加界面 1 year ago
nodyang 6895e8cde4 整理代码 1 year ago
nodyang d03d423814 比例阀 1 year ago
nodyang 24400a59c9 阀门 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
wangsr 1fb17ee8f0 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 4a9cc5c480 change - delete sql change 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 6f0a34056e 提交准备合并 1 year ago
wangsr 6ee566826c change - PlcCommunication代码优化 1 year ago