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

524 Commits (07ab283bdb0df8abd91d2931fce98a8cdb883f56)

Author SHA1 Message Date
wangsr d1c66df369 add - 输送界面准备完毕 添加湿混机对接RGV时间统计
wangsr 60898a6830 change - 准备输送界面 代码简化
wangsr 2defa0a367 Merge branch 'dep' into dep_pf 
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ChemicalWeighingPlc/PlcPlanHelper.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/FinishBatchHelper.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/SaveHelper/ReportGelDoserHelper.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/LjFormulaDetailDownEntity.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjClick/FormClientManager.Designer.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjClick/FormClientManager.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjClick/FormClientManager.resx
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjClick/InitFormAction.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjHelp.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/MetageHelp.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DownToDatabase.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DownloadAction.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/PauseAction.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/WeightSettingPlc.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Pl/PlcConnect.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/PptPlan/AutoDownloadAction.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Sys/TimerRunService.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/DeleteAction.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/FrmRecipe.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/ModifyRecipeAction.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/SelectRecipe.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/SetCratParam.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/SetCratParamForm.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
#	DataBlockHelper/DataBlockHelper.csproj
#	DataBlockHelper/Entity/ClickEntity.cs
#	DataBlockHelper/PlcConnect.cs
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
#	Main/MCEdit/Data/MCProject/nodeForm/Form1.xml
wangsr 564616b7bf change - 自动控制代码重构
wangsr 051c41da3d add - 干混机糊化机整合 干混机功能添加
wangsr 4ef5cc7372 自动控制添加日志
wangsr 25ac863d22 change - 自动维修模式逻辑问题 已修复
nodyang 07edd546a8 bug
nodyang 93ba70bafd 修复点击按钮
wangsr 168b7bdcd2 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 079c5c1d64 add - 自动控制更改界面布局 添加维修模式
nodyang c84878f388 2105 准备信号
wangsr ac7d7251c5 add - 自动准备上线
wangsr 020548a811 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr f96ab5dfec add - 自动状态改变显示
nodyang a594bc6510 插入的plc的 前提是 清理所有的step
nodyang 2e94fb7cb2 修复-1
wangsr 5ad4008138 add - 自动增加开关指示
wangsr 3cc7023fb5 change - 水称加入初始化读取
wangsr dee332a98f debug - 自动控制问题修改
wangsr 7fc6077b8c Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs
wangsr 24c668cb42 change - 自动控制单选变色
nodyang bf62b0ec69 获取控件和修改数数量
wangsr b3638888ea finish - 自动控制代码初步完成
wangsr 8c8dbc7b23 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 62d5726a48 change - 优化代码
nodyang 7debe29fb0 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
nodyang d4fa9f6fdb DownM8Recip 湿混机 6 7 8 地址不对
wangsr 268504564a Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs
wangsr 40199b6cde change - 规范代码
nodyang fa35c70ad8 souce
nodyang 27ab6500c7 暂存plc 有问题 修复plc 读数有问题
wangsr 034d3b1a92 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 6b66086ba6 merge
nodyang 2f2a247f13 short 类型问题
nodyang 730d508524 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
nodyang 9b486b5c75 修复plc 读取错误
wangsr 48461980dc Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 9d346c0b69 add - 完善自动代码
nodyang 1e30a7d07a GetCodeById
nodyang f5b934fdb4 GetCodeById 修复不等于0 的
wangsr 951df4fd99 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 2a3945d872 add - 手动控制基本完成 - 可以下达数据
nodyang 17198e753f Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
nodyang 366640bdca DeviceMaterrial
wangsr 586725012e Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr c42f69ba1f merge
nodyang b2476a6af4 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
nodyang 6a06438e5b 请选择
wangsr f48552a8da Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr e8f0b31354 merge
nodyang 476fbd3c57 GetDryerMaterrial
wangsr 3064f8aabf Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs
wangsr a9fe7cdc1b change - 添加combobox
nodyang 492122310d MyMCCombobox 添加
nodyang 25a8cad456 merge
wangsr 732fd48f6e 合并
wangsr 9b31b74429 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 2a39faf545 add - 自动控制准备编辑写入plc部分 准备合并
nodyang bb594c19b0 StockMaterrialDbHelp 改成静态
nodyang 29ecb2f5ea Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
nodyang e31425205e merge
wangsr 72862134be Merge branch 'dep' into wangsr
wangsr 153d412a3e add - 自动控制代码前后端连接完成 等待插入Plc
nodyang 67eb1825d0 StockMaterrialDbHelp
wangsr c1c84b2979 Merge branch 'wangsr' of http://175.27.215.92:3000/yangw/lj_plc into wangsr
wangsr 27fad81be8 add - 自动控制 - 新版
nodyang 0125e123f5 fix
nodyang d7cd1d90bc 整理代码 add 读取配置和 下工艺
nodyang 561213fe66 读取配置
wangsr 5b648d2ff8 change - 配置存到数据库 前端页面报警数据位置纠正
wangsr 21d48d9562 change - 规整代码 合并前准备
wangsr 9c858fb669 change - 手动控制校验写入是否成功3
nodyang 2fd7a22c1d 修改系统颜色
nodyang fdc12243dc 添加闽安功能
wangsr a4c1deeef1 change - 维护DB91 90 1 手动控制添加冷热水交替检测
nodyang 656c118b10 显示下料的接口
wangsr 87009dfd0b add - 黑粉统计添加设定值显示
wangsr da9eb0b193 Merge branch 'wangsr' into dep
wangsr 8a033216a2 change - 设备展示界面修改
nodyang 1846848362 去掉一个引用
wangsr 26d450e609 change - 文字错误更改 螺旋正反转显示实现 dbhelper错误更改
wangsr 5ca78fc6ef change - 更改日志记录方式 重构手动控制日志记录
wangsr 513884b90f change - 添加DB2119数据块 手动控制更新新数据块 添加螺旋称量值
nodyang c434a64a2a 点击变颜色
wangsr 72d675cb2f change - 设备细节画面报警重构 - 部分完成
nodyang 799c0ea68c 1 在湿混机下面加个Rva 小车 信息。 监控有没有报警
nodyang d4223bf026 对接闽安系统 点击按钮提示正在上料
wangsr 1f52509a44 change - 画面展示报表改为PLC读取
nodyang b8fd1abf49 整改Ip
wangsr 5c12ca24f1 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 8e8d7507b2 change - 修改黑粉统计班次时间
wangsr b8e602f016 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/PlcAddressUtil.cs
wangsr fc6fd3ebd0 改地址
wangsr f94f1bf911 change - 设备细节画面添加湿混机运转报警指示
nodyang d531a2699d 添加一个标识 来测试plc 得通讯能力
nodyang f30896869a PlcAddressUtil 修改Plc得地址
nodyang 112fbef84d 即使网络不同 也不会影响上位机的使用
nodyang 61c4818106 1 去掉湿混机 8个点击按钮 
2  添加日志搜索功能
3  通过按钮点击 增加日志
wangsr a2ab66c4cc change - MCRun最新部署 设备细节画面整合报表和图像代码
wangsr ebbe6ffcc0 debug - 实时刷新手动控制读取数据
wangsr b1158a6a17 debug - 实例化代码缺少 - 修复
wangsr 5b089e9709 change - PLC读取机制更改为一次读取整个数据块，性能优化成功 add - 黑粉统计报表添加最近班次统计功能
nodyang 23b27f9eb8 提供思路的版本
nodyang 90662b1bcd 优化代码
nodyang d1b58cc778 Merge branch 'dep' into dep_nodyang
nodyang 9c975c936b 正式的dep
nodyang f815fe9bca 时间改为8
wangsr 3c96697d35 change - 统计报表时间不精确问题解决
wangsr d54cd8c9a4 add - 黑粉统计添加明细和查询 change - 设备细节画面性能优化、错误校对
nodyang 0c76f9fdaa 测试的plc
nodyang 1f6bf2fda2 Merge branch 'dep1011' into dep_nodyang
nodyang b2af627760 接口
nodyang 50858979e4 Merge
nodyang d8d71bf3f0 merge
nodyang a0ee2a8868 Merge branch 'dep' into dep1011 
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
nodyang 4618441c44 删除么有用的报表
nodyang dfcfd01e71 添加日报表
nodyang baea38c619 LjReport
nodyang 114b0ae6bd 暂时推送
nodyang 89f1f6ec93 临时存放数据
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 修复一个版本
nodyang d65b6c7475 临时提交
nodyang 9f3c4e30ca Merge branch 'wangsr' into dep
wangsr 8676e8eda5 3000
wangsr a507327a96 临时提交
wangsr 4fb0b10928 半夜需求
wangsr 804e322945 add - hsl通讯展示界面 性能待优化
wangsr dc63fbdaf4 change - 加载时读取配置，修改配置
wangsr 5b71bd3012 add - 添加对接地址
wangsr 948af42a47 add - 手动控制添加保存功能
wangsr 15c2a22cf3 change - 重构手动控制 完善日志 添加焦点控制
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 868917498f change - 修改物料信息操作错误
wangsr 6f79836a47 change - 合并问题修改
wangsr 75b3867d42 change - 项目简化
wangsr 0cf3236699 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.Designer.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.cs
wangsr e8899e6ec7 change - 拉取前提交
wangsr fad95ec358 change - 简化代码初步
wangsr a9a63d5d9e change - 更改布局
wangsr c32d14d2f9 update - 小修改
wangsr 1f219d415c 修复代码
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 e1342383fb 0915 替换plc
wangsr d9980be420 合并
wangsr 67ab37d415 Add - LJPlanning-TestAction等待实装
wangsr 65848c2175 add - 添加计划状态下拉框 数据库变更
wangsr 6e98ca3d4c Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 37fcb77890 change - 计划配方新增查询功能
nodyang 8a021e197c 采用胡工 替换西门子
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保存报表界面美化
nodyang cd50514e00 修复按钮
wangsr f926545355 change - 修改nodedevice 完善设备监控图 发版前准备
wangsr 63eab8ca08 add - 设备监控界面添加报警
wangsr 37e66a188d add - 报表plchelper数据读取废案
nodyang 94101f3a1d 后台运行
nodyang 55a9a78539 0913 整理代码
nodyang 7e71fd990b 2107 add 新增数据库2107
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 d14fa8de9d demo
nodyang aeab567cc7 修补缺失的点位
nodyang 9fbf00b15f mege
nodyang 1f0c2da3d3 Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
nodyang 7848b05546 merge
wangsr 28de46fb64 change - 界面美化
nodyang 9f13b74e6d 0907 晚上临时提交
wangsr 62bbcfaf91 解决合并冲突 最终正常期望版本
nodyang e6ce524df2 0907
wangsr d8b0eb696d add - 输送监视图完成 点位开始维护 换电脑
nodyang 1761df780f Merge branch 'dep0901' into dep
nodyang 4e0213df1b 榄菊新的管理
nodyang c72bd4553b add 重新编辑配方
wangsr b27477df99 change - 按钮逻辑修改
nodyang d48a870f9f 页面整合处理
nodyang a1c9ba3aac 生产计划
nodyang 57880f5e4e 0830 提交
nodyang 1c0fbf79e8 重量 参数管理
nodyang 1b2f8d16c7 SaveWetMixerReport
nodyang 9af634d4b3 Fix
wangsr bbdba86dd4 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 0eb4288d01 change - 改名
nodyang 18634444a4 fix
wangsr 8a6fecc6cb Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr cfa80ec7f3 change - 三通阀逻辑控制完善
nodyang 8f5e9f0fc9 fix配方
wangsr 5e39f02bd1 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 
# Conflicts:
#	Main/MCRun/Data/MCProject/nodeDevice.xml
wangsr f3f6e1afc3 add - 添加界面
nodyang 6895e8cde4 整理代码
nodyang d03d423814 比例阀
nodyang 24400a59c9 阀门
wangsr dfd2e0c826 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 39d8fdd960 change - text limit
nodyang 440a6da24f 压力管理
wangsr 1fb17ee8f0 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 4a9cc5c480 change - delete sql change
nodyang f195102a8a 整理代码
wangsr 716d43eaf8 change - 设备压力参数管理维护
nodyang 48e1497789 Merge branch 'wangsr' into dep_yangw 
# Conflicts:
#	Mesnac.DoUtils/DoControl.cs
wangsr 6f0a34056e 提交准备合并
wangsr 6ee566826c change - PlcCommunication代码优化
wangsr 4c853034dd add - 数据块状态检测（差两个struct数据类型）
nodyang 73320cb736 merge
wangsr 9b29781643 add - ParameterWithPC部分状态监测
wangsr 92bfefa190 add - DB1165状态监测 部分完成 nodeDevice维护
wangsr 4eb0084239 add - MotorinitStateMonitor 结束
wangsr af10a16d38 add - 8/23下班 添加马达初始化数据块监测类（阶段）
wangsr b82b87a847 change - 电机初始化状态监测
wangsr 8331712550 add - 阀门数据类状态监测 维护nodeDevice
wangsr a42944f15d change - 榄菊设备参数压力管理 partchange
wangsr 6c0ba7c4db change - 大小写问题
wangsr be5c0bc9a1 Revert "change - Timer完善 增加 等待加入多綫程" 
This reverts commit e00504ce9a.
wangsr e06d8c8d68 Merge branch 'dep_yangw' into wangsr
wangsr e00504ce9a change - Timer完善 增加 等待加入多綫程
nodyang 465c348df0 应用类库
wangsr 6bc53e73d9 Merge branch 'dep_yangw' into wangsr2 
# Conflicts:
#	Main/MCEdit/Data/MCProject/nodeDataSource.xml
nodyang dd9fcefccf 修改plc
wangsr b19a0c0b27 漏
wangsr cc10602c3f Merge branch 'dep_yangw' into wangsr 
# Conflicts:
#	Main/MCEdit/Data/MCProject/nodeDataSource.xml
#	Main/MCEdit/Data/MCProject/nodeDevice.xml
wangsr bcdede6928 add - Timer部分引入
wangsr b43b08586a add - 阀门数据块监测 - 电机代码待优化
wangsr fa6c6e84bc add - 电机数据块状态检测 - 待添加Timer
nodyang df5758ff0c Merge branch 'dep' into dep_yangw
wangsr c298569b3f add - Plc数据读取-816下班
wangsr 924bdf72db add - 电机调试2（业务偏差）
wenjy 58cc555f55 change - 超级管理员密码修改
wenjy d5360fe47c change - office引用修改
wangsr da6ba6e358 add - 阀门控制调试
wangsr 33807824bd add - 加入简易报警灯控制和部分日志
wangsr 61e5d44119 change - PLC电机控制代码完善
nodyang 25a475a47f 删除plc
wangsr acef76c492 add - 电机调试窗口、逻辑、plc连接（待测试优化）