yangw
/
lj_plc
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
301 Commits
5 Branches
1 Tag
74 MiB
Commit Graph

183 Commits (50858979e4ba2fbb40daf7d88ccfa100ad9d3511)

Author SHA1 Message Date
nodyang aeab567cc7 修补缺失的点位
wangsr de62462783 Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
wangsr f0eec65097 change - 点位测试
nodyang cc63ca6d63 0911 修改146=>2106
wangsr 320f5331ee change - 小改动
wangsr 42c9b0b73d add - 展示界面添加新点位
wangsr 87dfe65f7e change - db 2102 2103 2017 维护完毕
wangsr 4d53b1d2eb change - nodedevice 新版本维护
nodyang 098f833ec0 merge
nodyang 7848b05546 merge
nodyang 9f13b74e6d 0907 晚上临时提交
wangsr 62bbcfaf91 解决合并冲突 最终正常期望版本
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 - 菜单装载
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 整理代码
wangsr 4c853034dd add - 数据块状态检测（差两个struct数据类型）
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 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 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 2dbc258001 change - 提交
wangsr 2705805e9e 解决冲突
wangsr 8f7481b3bc Merge branch 'wangsr' into dep_plan 
# Conflicts:
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
wangsr 90d62551a6 Merge branch 'dep_plan' into wangsr 
# Conflicts:
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
nodyang 5bf766ff4a 都没
nodyang 7034f0a654 Merge branch 'dep' into dep_plan 
# Conflicts:
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
nodyang 59fb13fa48 修复物料和大仓的关系
nodyang 6ac73f7201 demo
wenjy 10f3db53bf change - 报警维护
nodyang 425828021a 临时提交
wenjy fad533557a change - plc点位标注
wangsr 8bcbdd5105 到可用版本
wenjy a1d32cd167 change - 设备控件修改
wenjy 8e286eeb01 add - 设备细节界面
nodyang e4da793b9c 临时提交代码到服务器
nodyang 896c081d3b 修复产线不neng
nodyang 65292edda5 0801 新的分支
nodyang 8afe01f752 demo
nodyang 1d6383267f 0725 提交的数据
nodyang e068ae7bb0 TestAction
nodyang 7cd2db0e45 周日提价
nodyang a61f54582e 周五特别版本
nodyang 1ec39f960d 0719 提交
nodyang 4495a59df6 设备管理
nodyang b20ef12c7e asd
nodyang 485e125ed5 ti
nodyang 0c97c41f7c 设备管理
nodyang 021aae2686 最近调试