Commit Graph

54 Commits (5ca78fc6ef32012a701f0108aab0663e44a07013)

Author SHA1 Message Date
wangsr 5ca78fc6ef change - 更改日志记录方式 重构手动控制日志记录 1 year ago
nodyang a0ee2a8868 Merge branch 'dep' into dep1011
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
1 year ago
nodyang dfcfd01e71 添加日报表 1 year ago
nodyang dfe261ff96 Merge branch 'dep' into dep1011
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
#	Main/MCEdit/MCEdit.csproj
1 year ago
nodyang ef86b96e76 修复一个版本 1 year ago
wangsr 804e322945 add - hsl通讯展示界面 性能待优化 1 year ago
wangsr 865c17e169 add - 手动控制添加 1 year ago
wangsr 1456c3f30c delete - 删除无用文件 1 year ago
nodyang 4e0213df1b 榄菊新的管理 1 year ago
nodyang d48a870f9f 页面整合处理 1 year ago
nodyang 1c0fbf79e8 重量 参数管理 1 year ago
nodyang 18634444a4 fix 1 year ago
wangsr 5e39f02bd1 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
#	Main/MCRun/Data/MCProject/nodeDevice.xml
1 year ago
wangsr f3f6e1afc3 add - 添加界面 1 year ago
nodyang 6895e8cde4 整理代码 1 year ago
nodyang 24400a59c9 阀门 1 year ago
nodyang f195102a8a 整理代码 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
wangsr 1925bef7a6 add - 糊化机报表 初始化 查询 双击加载 导出 湿混机报表些许问题待完善 1 year ago
wangsr a3d5f972db 解决冲突 合并 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 6ac73f7201 demo 1 year ago
nodyang 425828021a 临时提交 1 year ago
wenjy 8e286eeb01 add - 设备细节界面 1 year ago
nodyang e4da793b9c 临时提交代码到服务器 1 year ago
nodyang 65292edda5 0801 新的分支 1 year ago
nodyang 8afe01f752 demo 1 year ago
nodyang 1d6383267f 0725 提交的数据 1 year ago
nodyang 1ec39f960d 0719 提交 1 year ago
nodyang 4495a59df6 设备管理 1 year ago
nodyang 485e125ed5 ti 1 year ago
nodyang 021aae2686 最近调试 1 year ago
nodyang fb8f844d46 设备管理 1 year ago
nodyang f03b412359 qw3 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 8e0bda9d3b 20230614 日常提交代码 1 year ago
nodyang dc08c7a09e 自定义几个控件 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