Commit Graph

73 Commits (465c348df0e933f05dbf315419b4c7f21b8f2c74)

Author SHA1 Message Date
nodyang dd9fcefccf 修改plc
nodyang df5758ff0c Merge branch 'dep' into dep_yangw
nodyang cc80555fdf 最新版本的plc nodeDevice.xml
wenjy 58cc555f55 change - 超级管理员密码修改
nodyang bdd2371ba4 修订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 948bdaf7c4 add - 湿混机报表 - 功能缺陷
wangsr 2dbc258001 change - 提交
wangsr 2705805e9e 解决冲突
wangsr 8f7481b3bc Merge branch 'wangsr' into dep_plan
# Conflicts:
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
wangsr 90d62551a6 Merge branch 'dep_plan' into wangsr
# Conflicts:
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
nodyang 5bf766ff4a 都没
nodyang 7034f0a654 Merge branch 'dep' into dep_plan
# Conflicts:
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
nodyang 59fb13fa48 修复物料和大仓的关系
nodyang 6ac73f7201 demo
wenjy 10f3db53bf change - 报警维护
nodyang 425828021a 临时提交
wenjy fad533557a change - plc点位标注
wangsr 8bcbdd5105 到可用版本
wenjy a1d32cd167 change - 设备控件修改
wenjy 8e286eeb01 add - 设备细节界面
nodyang e4da793b9c 临时提交代码到服务器
nodyang 896c081d3b 修复产线不neng
nodyang 65292edda5 0801 新的分支
nodyang 8afe01f752 demo
nodyang 1d6383267f 0725 提交的数据
nodyang e068ae7bb0 TestAction
nodyang 7cd2db0e45 周日提价
nodyang a61f54582e 周五特别版本
nodyang 1ec39f960d 0719 提交
nodyang 4495a59df6 设备管理
nodyang b20ef12c7e asd
nodyang 485e125ed5 ti
nodyang 0c97c41f7c 设备管理
nodyang 021aae2686 最近调试
nodyang fb8f844d46 设备管理
nodyang df11b817fc 0717 新的一周
nodyang 77aaf28db2 0714
nodyang 0a2e658997 0713模板
nodyang f55495ddf1 今日提交
nodyang 01025812a6 维护点位
nodyang f03b412359 qw3
nodyang 0394fd935d 周日提交
nodyang eaf940b8cd ToSingle 仓库
nodyang b213bf6e6e 20230707 中午提交代码
nodyang 12f23cdb56 修复完成