yangw
/
lj_plc
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
517 Commits
5 Branches
1 Tag
74 MiB
Commit Graph

284 Commits (aaa4338292f0f400b39e9836c5b8a57e869e77ed)

Author SHA1 Message Date
wangsr 2a39faf545 add - 自动控制准备编辑写入plc部分 准备合并
wangsr 153d412a3e add - 自动控制代码前后端连接完成 等待插入Plc
wangsr 27fad81be8 add - 自动控制 - 新版
wangsr 745a8fdab2 Merge branch 'dep_nodyang' into wangsr
nodyang 8523ffec52 去掉plc
wangsr cd3d3fcf1b add - 添加自动控制界面，初步排版完成
nodyang fdc12243dc 添加闽安功能
nodyang 656c118b10 显示下料的接口
wangsr 87009dfd0b add - 黑粉统计添加设定值显示
wangsr 8a033216a2 change - 设备展示界面修改
wangsr 7fb60e4423 Merge branch 'wangsr' of http://175.27.215.92:3000/yangw/lj_plc into wangsr
wangsr 3e03c8da8e merge error
wangsr 26d450e609 change - 文字错误更改 螺旋正反转显示实现 dbhelper错误更改
wangsr 5ca78fc6ef change - 更改日志记录方式 重构手动控制日志记录
wangsr 513884b90f change - 添加DB2119数据块 手动控制更新新数据块 添加螺旋称量值
wangsr 72d675cb2f change - 设备细节画面报警重构 - 部分完成
nodyang 799c0ea68c 1 在湿混机下面加个Rva 小车 信息。 监控有没有报警
wangsr 1f52509a44 change - 画面展示报表改为PLC读取
wangsr f94f1bf911 change - 设备细节画面添加湿混机运转报警指示
nodyang d531a2699d 添加一个标识 来测试plc 得通讯能力
nodyang 82f5fdd609 数据库一定连接本地
nodyang 61c4818106 1 去掉湿混机 8个点击按钮 
2  添加日志搜索功能
3  通过按钮点击 增加日志
wangsr a2ab66c4cc change - MCRun最新部署 设备细节画面整合报表和图像代码
wangsr ebbe6ffcc0 debug - 实时刷新手动控制读取数据
wangsr 5b089e9709 change - PLC读取机制更改为一次读取整个数据块，性能优化成功 add - 黑粉统计报表添加最近班次统计功能
nodyang f815fe9bca 时间改为8
wangsr d54cd8c9a4 add - 黑粉统计添加明细和查询 change - 设备细节画面性能优化、错误校对
nodyang a0ee2a8868 Merge branch 'dep' into dep1011 
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
nodyang 4618441c44 删除么有用的报表
nodyang dfcfd01e71 添加日报表
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
nodyang ef86b96e76 修复一个版本
wangsr 804e322945 add - hsl通讯展示界面 性能待优化
wangsr dc63fbdaf4 change - 加载时读取配置，修改配置
wangsr 948af42a47 add - 手动控制添加保存功能
wangsr 15c2a22cf3 change - 重构手动控制 完善日志 添加焦点控制
wangsr af47d12b9b add - 下班前完善 - 添加按钮链接
wangsr 41fde0575d add - 处理下发请求
wangsr bcd9ccae26 add - 手动控制程序 添加日志 完善代码
wangsr ac92eb3529 add - timeradd
wangsr fb1ff146c0 add - 手动控制完成 下班
wangsr 1c27c80404 add - 手动操控 糊化机新需求 待整合PLC
wangsr ef46dce828 add - 手动控制等待引入PLC
wangsr 865c17e169 add - 手动控制添加
wangsr 75b3867d42 change - 项目简化
wangsr 1456c3f30c delete - 删除无用文件
wangsr fad95ec358 change - 简化代码初步
wangsr 46ce634bd5 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/InItDbAction.cs
wangsr 4bfc54b494 测试提交
wangsr 02c1e461dd add - 榄菊计划管理 新增查询条件
wangsr c5c60daf59 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 8455a4b825 change - 加载界面
nodyang a3ba502b80 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
nodyang e1342383fb 0915 替换plc
wangsr 90c7c0381e Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 34efa803e1 修改推送问题
wangsr 67ab37d415 Add - LJPlanning-TestAction等待实装
wangsr 6e98ca3d4c Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 37fcb77890 change - 计划配方新增查询功能
nodyang 33cde15530 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
nodyang 9c5ad7a7c5 准备继承 hsl
nodyang 6eaee007f6 Demo
nodyang af59930b1b ok
nodyang f2fe90ef1a freesql
nodyang c9087e86de 添加数据访问
wangsr a62b3fc913 change - yw保存报表界面美化
wangsr 3cda278e1d change - 界面美化
wangsr f926545355 change - 修改nodedevice 完善设备监控图 发版前准备
wangsr 63eab8ca08 add - 设备监控界面添加报警
wangsr 37e66a188d add - 报表plchelper数据读取废案
nodyang 94101f3a1d 后台运行
wangsr acebd40093 Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
wangsr 12927af05a change - 展示界面报表添加
nodyang 751b3f53ab Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
nodyang 55a9a78539 0913 整理代码
wangsr ab7419f990 Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907 
# Conflicts:
#	Main/MCEdit/Data/MCProject/nodeDevice.xml
wangsr 4c5f60e7fb change - 展示界面添加高低料位等
nodyang e9f1825eaf Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907 
# Conflicts:
#	Main/MCEdit/Data/MCProject/nodeDevice.xml
nodyang 7e71fd990b 2107 add 新增数据库2107
wangsr 96afbeffa4 Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907 
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DownloadAction.cs
wangsr e74338a03d change - 界面设置
nodyang a5e0b1e767 0912 测试计划的版本呢
wangsr 8942b48b85 Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
wangsr 918040618a change - 中横线改下划线
nodyang 397e90d767 Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
nodyang aeab567cc7 修补缺失的点位
wangsr de62462783 Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
wangsr f0eec65097 change - 点位测试
nodyang cc63ca6d63 0911 修改146=>2106
wangsr 320f5331ee change - 小改动
wangsr 42c9b0b73d add - 展示界面添加新点位
wangsr 87dfe65f7e change - db 2102 2103 2017 维护完毕
wangsr 4d53b1d2eb change - nodedevice 新版本维护
nodyang 098f833ec0 merge
nodyang 7848b05546 merge
nodyang 9f13b74e6d 0907 晚上临时提交
wangsr 62bbcfaf91 解决合并冲突 最终正常期望版本
wangsr 26358bdfbd add - DB2105nodeDevice添加 问题待解决
wangsr d8b0eb696d add - 输送监视图完成 点位开始维护 换电脑
nodyang 1761df780f Merge branch 'dep0901' into dep