Commit Graph

413 Commits (67fc638cea11f4eec96c14020a6288b28b1484ff)

Author SHA1 Message Date
wangsr fee7750e88 add - 添加输送参数设置 11 months ago
wangsr adc18886cb Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 11 months ago
wangsr bea09dd871 change - 三通控件添加不同方向 11 months ago
我叫锄头 0e8dd47475 维修模式的调整 11 months ago
我叫锄头 ada904db2a 现场重量设置 11 months ago
wangsr 90c84700e1 change - 公差读取 维修开关背景颜色 输送界面小改 11 months ago
wangsr b3ffd6a73c add - 自动控制 湿混机重量设置 前端画面 11 months ago
wangsr 9dcdd3b655 change - 强制排水重大问题修改,按钮和初始化分开 11 months ago
wangsr ad2b494b10 add - 添加切割日志功能 按年分割 11 months ago
wangsr 5dba184ec8 add - 湿混机等待时间统计添加数值溢出错误捕捉 11 months ago
wangsr a1c25d64b2 change - 更改MCRun目录 11 months ago
wangsr 4672709df3 change - 消除报警下发请求改到自动控制界面 12 months ago
wangsr 122c196b5f Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 12 months ago
wangsr 99433a3855 add - 设备细节画面添加日罐压力显示,设备参数添加全部下传上传,下传送料请求和清报警按钮移动 12 months ago
我叫锄头 f03460bbdc 水称和粉料的称量日志 12 months ago
wangsr 0b6e85a04c add - 添加报警指示灯 日志文字后拼接机台号 12 months ago
wangsr 3ba815785e add - 日志显示添加设备编号 12 months ago
wangsr 2d74ba651b change - 设备细节画面 编号修改 添加水称文字 12 months ago
wangsr 8002a5ad72 change - 黑粉统计TableIndex 12 months ago
wangsr 70e2b1403e Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 12 months ago
wangsr c4c160296f change - 设备细节添加罐号 排齐 下拉糊化罐 12 months ago
我叫锄头 2090b4da55 去掉run 链接plc 出错提示 给mes 添加用户 12 months ago
wangsr 1a2531d391 change - 下传混炼完毕数据 12 months ago
wangsr 7c05455c2c add - 自动控制水称停止恢复按钮 12 months ago
wangsr 5e8c5dac17 add - 添加水称启停 12 months ago
wangsr ac187e588e Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportReadDb.cs
#	DataBlockHelper/DBHelpers/DB2105Helper.cs
12 months ago
wangsr c7656457e9 add - 日志控制抽离 添加单独日志查询界面 12 months ago
我叫锄头 0d00e4ccff 修改数据区,把手动称量变成自动称量区域 12 months ago
wangsr bb9e0220ad add - 输送界面 前端和plc数据连接 添加报警 12 months ago
wangsr 3f15104ee0 add - 输送前后端连接 准备对点位 12 months ago
wangsr d2d8ac85ab change - 四个产线类型改八个 12 months ago
wangsr 7d172eef65 change - 设备细节更改 12 months ago
wangsr f0faef883e change - 设备细节界面结构微调 12 months ago
wangsr c5187c76c0 add - 自动干混添加速度 12 months ago
wangsr 2181610904 change - 设备细节画面更新 拉伸填满 12 months ago
wangsr 765dedaf93 add - 手动控制添加请求接料按钮 12 months ago
wangsr 399af4525e change - 更改滚动条代码 12 months ago
wangsr 5ab7ddf522 add - 报警滚动条 12 months ago
我叫锄头 6a639b5912 HslMoveText 12 months ago
我叫锄头 333de46638 加冷水 12 months ago
wangsr 76f6a7f23e change - 报警gridview换位置 12 months ago
wangsr 77f07468a3 add - 自动控制水称添加偏差值 设备细节报表界面添加车次 时间格式更改 12 months ago
wangsr 47dbb62186 change - 界面更改 12 months ago
我叫锄头 85446cfce6 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 12 months ago
我叫锄头 249eb1e1bc 读取报表 和消除报警 12 months ago
wangsr 9c1b313c1f add - 设备细节画面完整报表 12 months ago
wangsr 5353c33893 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 12 months ago
wangsr 4fce1247ef change - plcreadchange 12 months ago
我叫锄头 692ee290bc ReportReadDb 整理报表的读取 12 months ago
wangsr 465f35da13 add - 添加 报表细节 12 months ago
wangsr 33f325e450 change - 设备细节画面添加报表 12 months ago
wangsr 4e9dcd6bd2 change - 强制排水错误修改 12 months ago
wangsr 92ee1aec3f change - 自动控制添加干混机控制步骤 删除plc校对功能(不完善)信息展示界面删除报警时间 12 months ago
wangsr d0af57087e add - 强制手动加水 12 months ago
wangsr d66d412077 add - 强制水称控制 12 months ago
wangsr db3fc8b4f4 change - 数字显示替换 添加搅拌总锅数统计 12 months ago
wangsr f4eb4b7dd4 change - 添加hsl数字led显示 待测试 12 months ago
wangsr 0b9c8b3233 add - 控件可行性分析 12 months ago
我叫锄头 c795500b11 Demo 12 months ago
wangsr 4ea06e3a12 Merge branch 'wangsr' into dep
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/InitAction.cs
12 months ago
我叫锄头 e5497ecfc9 【自动】修复排水的问题 12 months ago
wangsr 98bd3c57c4 delete - 小简化 1 year ago
wangsr 9057fb6d9b change - 自动控制plc校验 1 year ago
wangsr 18c2186017 add - 自动添加复制粘贴配置 1 year ago
wangsr 2d2adbedf7 add - 湿混等待统计添加报表导出功能 监控界面小改 1 year ago
wangsr d1c66df369 add - 输送界面准备完毕 添加湿混机对接RGV时间统计 1 year ago
wangsr 60898a6830 change - 准备输送界面 代码简化 1 year ago
wangsr 564616b7bf change - 自动控制代码重构 1 year ago
wangsr 051c41da3d add - 干混机糊化机整合 干混机功能添加 1 year ago
wangsr 4ef5cc7372 自动控制添加日志 1 year ago
wangsr 079c5c1d64 add - 自动控制更改界面布局 添加维修模式 1 year ago
wangsr f96ab5dfec add - 自动状态改变显示 1 year ago
wangsr 5ad4008138 add - 自动增加开关指示 1 year ago
wangsr 3cc7023fb5 change - 水称加入初始化读取 1 year ago
wangsr dee332a98f debug - 自动控制问题修改 1 year ago
wangsr 6b66086ba6 merge 1 year ago
wangsr 9d346c0b69 add - 完善自动代码 1 year ago
wangsr 2a3945d872 add - 手动控制基本完成 - 可以下达数据 1 year ago
wangsr c42f69ba1f merge 1 year ago
wangsr 2a39faf545 add - 自动控制准备编辑写入plc部分 准备合并 1 year ago
wangsr 153d412a3e add - 自动控制代码前后端连接完成 等待插入Plc 1 year ago
wangsr 27fad81be8 add - 自动控制 - 新版 1 year ago
wangsr 745a8fdab2 Merge branch 'dep_nodyang' into wangsr 1 year ago
nodyang 8523ffec52 去掉plc 1 year ago
wangsr cd3d3fcf1b add - 添加自动控制界面,初步排版完成 1 year ago
nodyang fdc12243dc 添加闽安功能 1 year ago
nodyang 656c118b10 显示下料的接口 1 year ago
wangsr 87009dfd0b add - 黑粉统计添加设定值显示 1 year ago
wangsr 8a033216a2 change - 设备展示界面修改 1 year ago
wangsr 7fb60e4423 Merge branch 'wangsr' of http://175.27.215.92:3000/yangw/lj_plc into wangsr 1 year ago
wangsr 3e03c8da8e merge error 1 year ago
wangsr 26d450e609 change - 文字错误更改 螺旋正反转显示实现 dbhelper错误更改 1 year ago
wangsr 5ca78fc6ef change - 更改日志记录方式 重构手动控制日志记录 1 year ago
wangsr 513884b90f change - 添加DB2119数据块 手动控制更新新数据块 添加螺旋称量值 1 year ago
wangsr 72d675cb2f change - 设备细节画面报警重构 - 部分完成 1 year ago
nodyang 799c0ea68c 1 在湿混机下面加个Rva 小车 信息。 监控有没有报警 1 year ago
wangsr 1f52509a44 change - 画面展示报表改为PLC读取 1 year ago
wangsr f94f1bf911 change - 设备细节画面添加湿混机运转报警指示 1 year ago
nodyang d531a2699d 添加一个标识 来测试plc 得通讯能力 1 year ago
nodyang 82f5fdd609 数据库一定连接本地 1 year ago
nodyang 61c4818106 1 去掉湿混机 8个点击按钮
2  添加日志搜索功能
3  通过按钮点击 增加日志
1 year ago
wangsr a2ab66c4cc change - MCRun最新部署 设备细节画面整合报表和图像代码 1 year ago
wangsr ebbe6ffcc0 debug - 实时刷新手动控制读取数据 1 year ago
wangsr 5b089e9709 change - PLC读取机制更改为一次读取整个数据块,性能优化成功 add - 黑粉统计报表添加最近班次统计功能 1 year ago
nodyang f815fe9bca 时间改为8 1 year ago
wangsr d54cd8c9a4 add - 黑粉统计添加明细和查询 change - 设备细节画面性能优化、错误校对 1 year ago
nodyang a0ee2a8868 Merge branch 'dep' into dep1011
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
1 year ago
nodyang 4618441c44 删除么有用的报表 1 year ago
nodyang dfcfd01e71 添加日报表 1 year ago
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
1 year ago
nodyang ef86b96e76 修复一个版本 1 year ago
wangsr 804e322945 add - hsl通讯展示界面 性能待优化 1 year ago
wangsr dc63fbdaf4 change - 加载时读取配置,修改配置 1 year ago
wangsr 948af42a47 add - 手动控制添加保存功能 1 year ago
wangsr 15c2a22cf3 change - 重构手动控制 完善日志 添加焦点控制 1 year ago
wangsr af47d12b9b add - 下班前完善 - 添加按钮链接 1 year ago
wangsr 41fde0575d add - 处理下发请求 1 year ago
wangsr bcd9ccae26 add - 手动控制程序 添加日志 完善代码 1 year ago
wangsr ac92eb3529 add - timeradd 1 year ago
wangsr fb1ff146c0 add - 手动控制完成 下班 1 year ago
wangsr 1c27c80404 add - 手动操控 糊化机新需求 待整合PLC 1 year ago
wangsr ef46dce828 add - 手动控制等待引入PLC 1 year ago
wangsr 865c17e169 add - 手动控制添加 1 year ago
wangsr 75b3867d42 change - 项目简化 1 year ago
wangsr 1456c3f30c delete - 删除无用文件 1 year ago
wangsr fad95ec358 change - 简化代码初步 1 year ago
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
1 year ago
wangsr 4bfc54b494 测试提交 1 year ago
wangsr 02c1e461dd add - 榄菊计划管理 新增查询条件 1 year ago
wangsr c5c60daf59 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 8455a4b825 change - 加载界面 1 year ago
nodyang a3ba502b80 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
nodyang e1342383fb 0915 替换plc 1 year ago
wangsr 90c7c0381e Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 34efa803e1 修改推送问题 1 year ago
wangsr 67ab37d415 Add - LJPlanning-TestAction等待实装 1 year ago
wangsr 6e98ca3d4c Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 37fcb77890 change - 计划配方新增查询功能 1 year ago
nodyang 33cde15530 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
nodyang 9c5ad7a7c5 准备继承 hsl 1 year ago
nodyang 6eaee007f6 Demo 1 year ago
nodyang af59930b1b ok 1 year ago
nodyang f2fe90ef1a freesql 1 year ago
nodyang c9087e86de 添加数据访问 1 year ago
wangsr a62b3fc913 change - yw保存报表界面美化 1 year ago
wangsr 3cda278e1d change - 界面美化 1 year ago
wangsr f926545355 change - 修改nodedevice 完善设备监控图 发版前准备 1 year ago
wangsr 63eab8ca08 add - 设备监控界面添加报警 1 year ago
wangsr 37e66a188d add - 报表plchelper数据读取废案 1 year ago
nodyang 94101f3a1d 后台运行 1 year ago