Commit Graph

228 Commits (4e9dcd6bd267260df780d2734785e455de34844b)

Author SHA1 Message Date
wangsr 6c0ba7c4db change - 大小写问题 1 year ago
wangsr 2b5fccc5e8 解决合并冲突——wangsr+dep_yangw 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
nodyang df5758ff0c Merge branch 'dep' into dep_yangw 1 year ago
nodyang cc80555fdf 最新版本的plc nodeDevice.xml 1 year ago
wenjy 58cc555f55 change - 超级管理员密码修改 1 year ago
nodyang bdd2371ba4 修订Plc 1 year ago
wangsr da6ba6e358 add - 阀门控制调试 1 year ago
wangsr 61e5d44119 change - 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 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 8f7481b3bc Merge branch 'wangsr' into dep_plan
# Conflicts:
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
1 year ago
wangsr 90d62551a6 Merge branch 'dep_plan' into wangsr
# Conflicts:
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
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
nodyang 59fb13fa48 修复物料和大仓的关系 1 year ago
nodyang 6ac73f7201 demo 1 year ago
wenjy 10f3db53bf change - 报警维护 1 year ago
nodyang 425828021a 临时提交 1 year ago
wenjy fad533557a change - plc点位标注 1 year ago
wangsr 8bcbdd5105 到可用版本 1 year ago
wenjy a1d32cd167 change - 设备控件修改 1 year ago
wenjy 8e286eeb01 add - 设备细节界面 1 year ago
nodyang e4da793b9c 临时提交代码到服务器 1 year ago
nodyang 896c081d3b 修复产线不neng 1 year ago
nodyang 65292edda5 0801 新的分支 1 year ago
nodyang 8afe01f752 demo 1 year ago
nodyang 1d6383267f 0725 提交的数据 1 year ago
nodyang e068ae7bb0 TestAction 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 df11b817fc 0717 新的一周 1 year ago
nodyang 77aaf28db2 0714 1 year ago
nodyang 0a2e658997 0713模板 1 year ago
nodyang f55495ddf1 今日提交 1 year ago
nodyang 01025812a6 维护点位 1 year ago
nodyang f03b412359 qw3 1 year ago
nodyang 0394fd935d 周日提交 1 year ago
nodyang eaf940b8cd ToSingle 仓库 1 year ago
nodyang b213bf6e6e 20230707 中午提交代码 1 year ago
nodyang 12f23cdb56 修复完成 1 year ago
nodyang c971b5330b 临时提交 1 year ago
nodyang 5287b9e0b5 nodeDevice 点位维持成功 1 year ago
nodyang 01a1df4aad 第二个备份 1 year ago
nodyang 3fb18aec2c ParametersWithPc备份 1 year ago
nodyang ba97852627 dll testActioc 测试代码 1 year ago
nodyang b3bc61b404 本周最后的提交 1 year ago
nodyang 9457fe92fe 0616提交代码 1 year ago
nodyang 424dad6312 临时提交 1 year ago
nodyang c65d6d3cb9 20120616临时提交 1 year ago
nodyang 8e0bda9d3b 20230614 日常提交代码 1 year ago
nodyang dc08c7a09e 自定义几个控件 1 year ago
nodyang ffc4a8fc8f 小车封装 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 0daec0fed8 change - 注释修改 2 years ago
wenjy 2c0c501dfb change - 角色信息 2 years ago
wenjy d804444f07 change - 计划重传、终止 2 years ago
wenjy 3580a27deb change - 配方另存 2 years ago
wenjy e8df0f97a7 添加项目文件。 2 years ago