Commit Graph

309 Commits (d1b58cc778cf632a0aec87fc670c1fe47c2e2156)
 

Author SHA1 Message Date
nodyang 098f833ec0 merge
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 26358bdfbd add - DB2105nodeDevice添加 问题待解决
wangsr d8b0eb696d add - 输送监视图完成 点位开始维护 换电脑
nodyang 1761df780f Merge branch 'dep0901' into dep
nodyang 4e0213df1b 榄菊新的管理
nodyang c72bd4553b add 重新编辑配方
wangsr 142709f84f change - 小料监控图重画完毕
wangsr b27477df99 change - 按钮逻辑修改
nodyang d48a870f9f 页面整合处理
wangsr 53c2b54934 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr dc45f101bb change - 化工來訪前
nodyang a1c9ba3aac 生产计划
nodyang 4ad8952ab1 Merge remote-tracking branch 'haiwei/dep' into dep
nodyang 57880f5e4e 0830 提交
wangsr 1667bca306 Revert "测试"
This reverts commit deb07e73dc.
wangsr 2412c53d6a Revert "change - 菜单装载"
This reverts commit 5508d3bc2b.
nodyang deb07e73dc 测试
nodyang ed6e1167dc Merge remote-tracking branch 'haiwei/dep' into dep
nodyang 1c0fbf79e8 重量 参数管理
wangsr 5508d3bc2b change - 菜单装载
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配方
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 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 - 设备压力参数管理维护