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 |
|
wangsr
|
4c853034dd
|
add - 数据块状态检测（差两个struct数据类型）
|
1 year ago |
|
nodyang
|
73320cb736
|
merge
|
1 year ago |
|
wangsr
|
9b29781643
|
add - ParameterWithPC部分状态监测
|
1 year ago |
|
wangsr
|
92bfefa190
|
add - DB1165状态监测 部分完成 nodeDevice维护
|
1 year ago |
|
wangsr
|
4eb0084239
|
add - MotorinitStateMonitor 结束
|
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
|
a42944f15d
|
change - 榄菊设备参数压力管理 partchange
|
1 year ago |
|
wangsr
|
d71c4836b2
|
doctrl part change
|
1 year ago |
|
wangsr
|
6c0ba7c4db
|
change - 大小写问题
|
1 year ago |
|
wangsr
|
fb572e5a0a
|
Revert "delete - 删除无用压缩包"
This reverts commit 49a3f76a21.
|
1 year ago |
|
wangsr
|
49a3f76a21
|
delete - 删除无用压缩包
|
1 year ago |
|
wangsr
|
f014130acd
|
change - DOControl代码完善
|
1 year ago |
|
wangsr
|
44b54a1796
|
小修改
|
1 year ago |
|
wangsr
|
be5c0bc9a1
|
Revert "change - Timer完善 增加 等待加入多綫程"
This reverts commit e00504ce9a.
|
1 year ago |
|
wangsr
|
e06d8c8d68
|
Merge branch 'dep_yangw' into wangsr
|
1 year ago |
|
wangsr
|
e00504ce9a
|
change - Timer完善 增加 等待加入多綫程
|
1 year ago |
|
nodyang
|
465c348df0
|
应用类库
|
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
|
2b5fccc5e8
|
解决合并冲突——wangsr+dep_yangw
|
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
|
bcdede6928
|
add - Timer部分引入
|
1 year ago |
|
wangsr
|
b43b08586a
|
add - 阀门数据块监测 - 电机代码待优化
|
1 year ago |
|
wangsr
|
fa6c6e84bc
|
add - 电机数据块状态检测 - 待添加Timer
|
1 year ago |
|
nodyang
|
df5758ff0c
|
Merge branch 'dep' into dep_yangw
|
1 year ago |
|
nodyang
|
cc80555fdf
|
最新版本的plc nodeDevice.xml
|
1 year ago |
|
wangsr
|
c298569b3f
|
add - Plc数据读取-816下班
|
1 year ago |
|
wangsr
|
924bdf72db
|
add - 电机调试2（业务偏差）
|
1 year ago |
 wenjy
|
58cc555f55
|
change - 超级管理员密码修改
|
1 year ago |
|
nodyang
|
bdd2371ba4
|
修订Plc
|
1 year ago |
|
wenjy
|
d5360fe47c
|
change - office引用修改
|
1 year ago |
|
wangsr
|
da6ba6e358
|
add - 阀门控制调试
|
1 year ago |
|
wangsr
|
33807824bd
|
add - 加入简易报警灯控制和部分日志
|
1 year ago |
|
wangsr
|
61e5d44119
|
change - PLC电机控制代码完善
|
1 year ago |
|
nodyang
|
25a475a47f
|
删除plc
|
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
|
10d988c5d7
|
change - 干混 湿混 糊化 报表均已完成
|
1 year ago |
|
wangsr
|
45e545a79d
|
record - 新尝试备份
|
1 year ago |
|
wangsr
|
18eb26b929
|
- change FinishBatchService类自动存盘处理添加
|
1 year ago |
|
wangsr
|
1925bef7a6
|
add - 糊化机报表 初始化 查询 双击加载 导出 湿混机报表些许问题待完善
|
1 year ago |