Commit Graph

152 Commits (b469953750febe21c2d25e65289b689285051aee)

Author SHA1 Message Date
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
nodyang 1d6383267f 0725 提交的数据 1 year ago
nodyang 7cd2db0e45 周日提价 1 year ago
nodyang a61f54582e 周五特别版本 1 year ago
nodyang 1ec39f960d 0719 提交 1 year ago
nodyang 4495a59df6 设备管理 1 year ago
nodyang b20ef12c7e asd 1 year ago
nodyang 485e125ed5 ti 1 year ago
nodyang 0c97c41f7c 设备管理 1 year ago
nodyang 021aae2686 最近调试 1 year ago
nodyang fb8f844d46 设备管理 1 year ago
nodyang eaf940b8cd ToSingle 仓库 1 year ago
nodyang b213bf6e6e 20230707 中午提交代码 1 year ago
nodyang 12f23cdb56 修复完成 1 year ago
nodyang a69f8847d8 E:\mesnac\化工项目源码\源码 1 year ago
baogq 5c20c450f9 20220907保存最新源码 2 years ago
baogq 3c99b28127 监控界面V1.0 2 years ago
baogq 6d879836fa 提交最新源码 2 years ago
baogq f473200669 提交最新源码 2 years ago
wenjy 2c0c501dfb change - 角色信息 2 years ago
wenjy 44e64eaf52 change - 计划下传完成判断 2 years ago
wenjy 3580a27deb change - 配方另存 2 years ago
wenjy e8df0f97a7 添加项目文件。 2 years ago