Commit Graph

211 Commits (ec7b179a8aa685c248f92b8e6e1bfa6ff039ca47)

Author SHA1 Message Date
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 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 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 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 02c1e461dd add - 榄菊计划管理 新增查询条件 1 year ago
wangsr 8455a4b825 change - 加载界面 1 year ago
wangsr 34efa803e1 修改推送问题 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
wangsr acebd40093 Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907 1 year ago
wangsr 12927af05a change - 展示界面报表添加 1 year ago
nodyang 751b3f53ab Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907 1 year ago
nodyang 55a9a78539 0913 整理代码 1 year ago
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
1 year ago
wangsr 4c5f60e7fb change - 展示界面添加高低料位等 1 year ago
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
1 year ago
nodyang 7e71fd990b 2107 add 新增数据库2107 1 year ago
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
1 year ago
wangsr e74338a03d change - 界面设置 1 year ago
nodyang a5e0b1e767 0912 测试计划的版本呢 1 year ago
wangsr f0eec65097 change - 点位测试 1 year ago
wangsr 42c9b0b73d add - 展示界面添加新点位 1 year ago
nodyang 9f13b74e6d 0907 晚上临时提交 1 year ago
wangsr 62bbcfaf91 解决合并冲突 最终正常期望版本 1 year ago
wangsr d8b0eb696d add - 输送监视图完成 点位开始维护 换电脑 1 year ago
nodyang 1761df780f Merge branch 'dep0901' into dep 1 year ago
nodyang 4e0213df1b 榄菊新的管理 1 year ago
wangsr 142709f84f change - 小料监控图重画完毕 1 year ago
wangsr b27477df99 change - 按钮逻辑修改 1 year ago
nodyang d48a870f9f 页面整合处理 1 year ago
wangsr 53c2b54934 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr dc45f101bb change - 化工來訪前 1 year ago
nodyang a1c9ba3aac 生产计划 1 year ago
nodyang 57880f5e4e 0830 提交 1 year ago
nodyang 1c0fbf79e8 重量 参数管理 1 year ago
wangsr cfa80ec7f3 change - 三通阀逻辑控制完善 1 year ago
wangsr 5e39f02bd1 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
#	Main/MCRun/Data/MCProject/nodeDevice.xml
1 year ago
wangsr f3f6e1afc3 add - 添加界面 1 year ago
nodyang 6895e8cde4 整理代码 1 year ago
wangsr 39d8fdd960 change - text limit 1 year ago
wangsr 1fb17ee8f0 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 4a9cc5c480 change - delete sql change 1 year ago
nodyang f195102a8a 整理代码 1 year ago