Commit Graph

252 Commits (67ab37d415e89b8c8f4432aeca0d259b57e4e727)
 

Author SHA1 Message Date
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 - 干混机报表数据保存
nodyang ae58b33366 Merge branch 'wangsr' into dep_plan
nodyang e091fb94e8 demo
wangsr 127f02c930 222
wangsr fbf5894f9f 测试
wenjy fcdf6ce7d6 change - 干混机报表数据读取
wangsr 39159ad352 窗口美化 完毕
wangsr 069ce8225d Merge branch 'dep' into wangsr
wangsr 00ebb2f69d 报警灯完善
wenjy c29239fef0 change - 初始化引擎时加载Hsl、报警灯模块
wangsr febbba11c9 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into wangsr
wangsr 1faaf589c4 change - 接入报警灯
wenjy 969946be45 add - 增加报警灯控制
wenjy 22b6de500b Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wenjy 440d9564c2 change - 保存报警信息
wangsr 8f7481b3bc Merge branch 'wangsr' into dep_plan
# Conflicts:
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
wangsr ad016a535e 前端页面修改 -未完成
wangsr 71092f75f6 qqw
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 6ccb7b82f9 Merge remote-tracking branch 'haiwei/dep' into dep
nodyang 3521fa2333 SiemensPLCS.S200Smart=> s1200
wenjy 245656cc68 change - 报警数据读取
nodyang 6ac73f7201 demo
wenjy 3b544355fc change - HSL 读取Plc测试
wenjy 30661be234 change - 集成HSL PLC读取模块
wenjy 10f3db53bf change - 报警维护
nodyang 425828021a 临时提交
wenjy fad533557a change - plc点位标注
wangsr b9baefc7a4 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into wangsr
wangsr 8bcbdd5105 到可用版本
wenjy a1d32cd167 change - 设备控件修改
wenjy 8e286eeb01 add - 设备细节界面
nodyang e4da793b9c 临时提交代码到服务器
nodyang a441d9ca59 0801 临时提交