nodyang
|
7e71fd990b
|
2107 add 新增数据库2107
|
1 year ago |
|
nodyang
|
7848b05546
|
merge
|
1 year ago |
|
nodyang
|
4e0213df1b
|
榄菊新的管理
|
1 year ago |
|
nodyang
|
d48a870f9f
|
页面整合处理
|
1 year ago |
wangsr
|
f3f6e1afc3
|
add - 添加界面
|
1 year ago |
|
nodyang
|
d03d423814
|
比例阀
|
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 |
|
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
|
4c853034dd
|
add - 数据块状态检测（差两个struct数据类型）
|
1 year ago |
|
nodyang
|
73320cb736
|
merge
|
1 year ago |
|
wangsr
|
92bfefa190
|
add - DB1165状态监测 部分完成 nodeDevice维护
|
1 year ago |
|
wangsr
|
af10a16d38
|
add - 8/23下班 添加马达初始化数据块监测类（阶段）
|
1 year ago |
|
wangsr
|
b82b87a847
|
change - 电机初始化状态监测
|
1 year ago |
|
wangsr
|
8331712550
|
add - 阀门数据类状态监测 维护nodeDevice
|
1 year ago |
|
wangsr
|
6c0ba7c4db
|
change - 大小写问题
|
1 year ago |
|
wangsr
|
be5c0bc9a1
|
Revert "change - Timer完善 增加 等待加入多綫程"
This reverts commit e00504ce9a.
|
1 year ago |
|
wangsr
|
e00504ce9a
|
change - Timer完善 增加 等待加入多綫程
|
1 year ago |
|
wangsr
|
6bc53e73d9
|
Merge branch 'dep_yangw' into wangsr2
# Conflicts:
# Main/MCEdit/Data/MCProject/nodeDataSource.xml
|
1 year ago |
|
nodyang
|
dd9fcefccf
|
修改plc
|
1 year ago |
|
wangsr
|
b19a0c0b27
|
漏
|
1 year ago |
|
wangsr
|
cc10602c3f
|
Merge branch 'dep_yangw' into wangsr
# Conflicts:
# Main/MCEdit/Data/MCProject/nodeDataSource.xml
# Main/MCEdit/Data/MCProject/nodeDevice.xml
|
1 year ago |
|
wangsr
|
b43b08586a
|
add - 阀门数据块监测 - 电机代码待优化
|
1 year ago |
|
wangsr
|
c298569b3f
|
add - Plc数据读取-816下班
|
1 year ago |
|
wangsr
|
924bdf72db
|
add - 电机调试2（业务偏差）
|
1 year ago |
 wenjy
|
d5360fe47c
|
change - office引用修改
|
1 year ago |
|
wangsr
|
da6ba6e358
|
add - 阀门控制调试
|
1 year ago |
|
wangsr
|
acef76c492
|
add - 电机调试窗口、逻辑、plc连接（待测试优化）
|
1 year ago |
|
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
|
1 year ago |
|
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
|
1 year ago |
|
nodyang
|
2c79df191e
|
代码整理
|
1 year ago |
|
wangsr
|
1925bef7a6
|
add - 糊化机报表 初始化 查询 双击加载 导出 湿混机报表些许问题待完善
|
1 year ago |
|
wangsr
|
a3d5f972db
|
解决冲突 合并
|
1 year ago |
|
wangsr
|
948bdaf7c4
|
add - 湿混机报表 - 功能缺陷
|
1 year ago |
|
wangsr
|
2dbc258001
|
change - 提交
|
1 year ago |
|
wangsr
|
2705805e9e
|
解决冲突
|
1 year ago |
|
wangsr
|
febbba11c9
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into wangsr
|
1 year ago |
|
wangsr
|
1faaf589c4
|
change - 接入报警灯
|
1 year ago |
|
wenjy
|
969946be45
|
add - 增加报警灯控制
|
1 year ago |
|
nodyang
|
5bf766ff4a
|
都没
|
1 year ago |
|
nodyang
|
7034f0a654
|
Merge branch 'dep' into dep_plan
# Conflicts:
# Main/MCEdit/Data/MCProject/SCWSProject2.mprj
|
1 year ago |
|
wenjy
|
245656cc68
|
change - 报警数据读取
|
1 year ago |
|
wenjy
|
30661be234
|
change - 集成HSL PLC读取模块
|
1 year ago |
|
nodyang
|
425828021a
|
临时提交
|
1 year ago |
|
nodyang
|
a441d9ca59
|
0801 临时提交
|
1 year ago |
|
nodyang
|
65292edda5
|
0801 新的分支
|
1 year ago |
|
nodyang
|
8afe01f752
|
demo
|
1 year ago |