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

294 Commits (40199b6cde246c3729c36508989a03f8f7574c30)

Author SHA1 Message Date
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连接（待测试优化）
nodyang 9379b9d227 Merge branch 'wangsr' into dep 
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
nodyang eed38ad76e Merge branch 'dep_plan' into dep 
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
nodyang 2c79df191e 代码整理
wangsr 10d988c5d7 change - 干混 湿混 糊化 报表均已完成
wangsr 45e545a79d record - 新尝试备份
wangsr 18eb26b929 - change FinishBatchService类自动存盘处理添加
wangsr 1925bef7a6 add - 糊化机报表 初始化 查询 双击加载 导出 湿混机报表些许问题待完善
wangsr a3d5f972db 解决冲突 合并
wangsr 948bdaf7c4 add - 湿混机报表 - 功能缺陷
wangsr 85e2019459 change - 干混机类名修改
wangsr 0b0b801b2d change- run运行问题处理
nodyang ef5ad1188a fixCode
wangsr 35a9e622af Revert "change - 干混机报表导出事件" 
This reverts commit 68ef3b8f49.
wangsr 2dbc258001 change - 提交
wangsr 2705805e9e 解决冲突
nodyang ae58b33366 Merge branch 'wangsr' into dep_plan
nodyang e091fb94e8 demo
wangsr 39159ad352 窗口美化 完毕
wangsr febbba11c9 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into wangsr
wangsr 1faaf589c4 change - 接入报警灯
wenjy 969946be45 add - 增加报警灯控制
wenjy 440d9564c2 change - 保存报警信息
wangsr 8f7481b3bc Merge branch 'wangsr' into dep_plan 
# Conflicts:
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
wangsr ad016a535e 前端页面修改 -未完成
wangsr 71092f75f6 qqw
nodyang 5bf766ff4a 都没
nodyang 7034f0a654 Merge branch 'dep' into dep_plan 
# Conflicts:
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
nodyang 59fb13fa48 修复物料和大仓的关系
wenjy 245656cc68 change - 报警数据读取
nodyang 6ac73f7201 demo