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

24 Commits (e00504ce9af6399d1f09ebf4f27c36947856cfac)

Author SHA1 Message Date
wangsr cc10602c3f Merge branch 'dep_yangw' into wangsr 
# Conflicts:
#	Main/MCEdit/Data/MCProject/nodeDataSource.xml
#	Main/MCEdit/Data/MCProject/nodeDevice.xml
nodyang 25a475a47f 删除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 fbf5894f9f 测试
wenjy fcdf6ce7d6 change - 干混机报表数据读取
nodyang 425828021a 临时提交
nodyang e068ae7bb0 TestAction
nodyang a61f54582e 周五特别版本
nodyang b20ef12c7e asd
nodyang 485e125ed5 ti
nodyang 0c97c41f7c 设备管理
nodyang c971b5330b 临时提交
nodyang 9cb1a81080 0628 对plc 就行测试
nodyang ba97852627 dll testActioc 测试代码
nodyang a69f8847d8 E:\mesnac\化工项目源码\源码
baogq 5c20c450f9 20220907保存最新源码
wenjy d804444f07 change - 计划重传、终止
wenjy 2b60edee67 读取plc计划执行状态
wenjy e8df0f97a7 添加项目文件。