Commit Graph

288 Commits (8676e8eda572df9bae9b4d8ae74cbdd7f0d6c021)
 

Author SHA1 Message Date
nodyang 465c348df0 应用类库
wangsr 6bc53e73d9 Merge branch 'dep_yangw' into wangsr2
# Conflicts:
#	Main/MCEdit/Data/MCProject/nodeDataSource.xml
nodyang dd9fcefccf 修改plc
wangsr 2b5fccc5e8 解决合并冲突——wangsr+dep_yangw
wangsr b19a0c0b27
wangsr cc10602c3f Merge branch 'dep_yangw' into wangsr
# Conflicts:
#	Main/MCEdit/Data/MCProject/nodeDataSource.xml
#	Main/MCEdit/Data/MCProject/nodeDevice.xml
wangsr bcdede6928 add - Timer部分引入
wangsr b43b08586a add - 阀门数据块监测 - 电机代码待优化
wangsr fa6c6e84bc add - 电机数据块状态检测 - 待添加Timer
nodyang df5758ff0c Merge branch 'dep' into dep_yangw
nodyang cc80555fdf 最新版本的plc nodeDevice.xml
wangsr c298569b3f add - Plc数据读取-816下班
wangsr 924bdf72db add - 电机调试2(业务偏差)
wenjy 58cc555f55 change - 超级管理员密码修改
nodyang bdd2371ba4 修订Plc
wenjy d5360fe47c change - office引用修改
wangsr da6ba6e358 add - 阀门控制调试
wangsr 33807824bd add - 加入简易报警灯控制和部分日志
wangsr 61e5d44119 change - PLC电机控制代码完善
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 10d988c5d7 change - 干混 湿混 糊化 报表均已完成
wangsr 45e545a79d record - 新尝试备份
wangsr 18eb26b929 - change FinishBatchService类自动存盘处理添加
wangsr 1925bef7a6 add - 糊化机报表 初始化 查询 双击加载 导出 湿混机报表些许问题待完善
wangsr a3d5f972db 解决冲突 合并
wangsr 948bdaf7c4 add - 湿混机报表 - 功能缺陷
wangsr 85e2019459 change - 干混机类名修改
wangsr 0b0b801b2d change- run运行问题处理
wangsr 310c518435 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 2eead45dcd change - 還原
nodyang ef5ad1188a fixCode
wangsr 35a9e622af Revert "change - 干混机报表导出事件"
This reverts commit 68ef3b8f49.
wangsr 2dbc258001 change - 提交
wangsr d2a83d1392 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
wangsr 2705805e9e 解决冲突
wangsr 68ef3b8f49 change - 干混机报表导出事件
wangsr 845d3aa2c0 add - 干混机报表事件:初始化、查询、双击加载明细、导出
wangsr e369e85122 add - 干混机报表事件:初始化、查询、明细加载、导出
wenjy 918e13579f change - 报警逻辑代码优化
wenjy 1704350b44 change - 报警读取逻辑代码优化
wenjy fcd32f6ee7 change - 报表数据保存代码优化
wenjy 4a9bef5fac Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wenjy 3c9dd0e37f change - 代码整理
wangsr 5fae34a7e4 Merge remote-tracking branch 'origin/dep' into dep
wangsr f59f92144c change - 数据源修改
wenjy ae8f502a86 add - 干混机报表数据保存