Commit Graph

90 Commits (948bdaf7c461190fab1a94fc03f5b8371cd4782e)
 

Author SHA1 Message Date
wangsr 948bdaf7c4 add - 湿混机报表 - 功能缺陷 1 year ago
wangsr 85e2019459 change - 干混机类名修改 2 years ago
wangsr 0b0b801b2d change- run运行问题处理 2 years ago
wangsr 310c518435 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 2 years ago
wangsr 2eead45dcd change - 還原 2 years ago
wangsr 35a9e622af Revert "change - 干混机报表导出事件"
This reverts commit 68ef3b8f49.
2 years ago
wangsr 2dbc258001 change - 提交 2 years ago
wangsr d2a83d1392 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
2 years ago
wangsr 2705805e9e 解决冲突 2 years ago
wangsr 68ef3b8f49 change - 干混机报表导出事件 2 years ago
wangsr 845d3aa2c0 add - 干混机报表事件:初始化、查询、双击加载明细、导出 2 years ago
wangsr e369e85122 add - 干混机报表事件:初始化、查询、明细加载、导出 2 years ago
wenjy 918e13579f change - 报警逻辑代码优化 2 years ago
wenjy 1704350b44 change - 报警读取逻辑代码优化 2 years ago
wenjy fcd32f6ee7 change - 报表数据保存代码优化 2 years ago
wenjy 4a9bef5fac Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 2 years ago
wenjy 3c9dd0e37f change - 代码整理 2 years ago
wangsr 5fae34a7e4 Merge remote-tracking branch 'origin/dep' into dep 2 years ago
wangsr f59f92144c change - 数据源修改 2 years ago
wenjy ae8f502a86 add - 干混机报表数据保存 2 years ago
wangsr 127f02c930 222 2 years ago
wangsr fbf5894f9f 测试 2 years ago
wenjy fcdf6ce7d6 change - 干混机报表数据读取 2 years ago
wangsr 00ebb2f69d 报警灯完善 2 years ago
wenjy c29239fef0 change - 初始化引擎时加载Hsl、报警灯模块 2 years ago
wangsr 1faaf589c4 change - 接入报警灯 2 years ago
wenjy 969946be45 add - 增加报警灯控制 2 years ago
wenjy 22b6de500b Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 2 years ago
wenjy 440d9564c2 change - 保存报警信息 2 years ago
nodyang 6ccb7b82f9 Merge remote-tracking branch 'haiwei/dep' into dep 2 years ago
nodyang 3521fa2333 SiemensPLCS.S200Smart=> s1200 2 years ago
wenjy 245656cc68 change - 报警数据读取 2 years ago
wenjy 3b544355fc change - HSL 读取Plc测试 2 years ago
wenjy 30661be234 change - 集成HSL PLC读取模块 2 years ago
wenjy 10f3db53bf change - 报警维护 2 years ago
wenjy fad533557a change - plc点位标注 2 years ago
wenjy a1d32cd167 change - 设备控件修改 2 years ago
wenjy 8e286eeb01 add - 设备细节界面 2 years ago
nodyang 896c081d3b 修复产线不neng 2 years ago
nodyang 65292edda5 0801 新的分支 2 years ago
nodyang 1c86b66fd1 haiwei 2 years ago
nodyang 8afe01f752 demo 2 years ago
nodyang 1d6383267f 0725 提交的数据 2 years ago
nodyang e068ae7bb0 TestAction 2 years ago
nodyang 7cd2db0e45 周日提价 2 years ago
nodyang a61f54582e 周五特别版本 2 years ago
nodyang 1ec39f960d 0719 提交 2 years ago
nodyang 4495a59df6 设备管理 2 years ago
nodyang b20ef12c7e asd 2 years ago
nodyang 485e125ed5 ti 2 years ago