Commit Graph

572 Commits (23efb57e548d98839821a6158b959050d5202d6c)

Author SHA1 Message Date
wangsr c747e83c90 change - 重复提示问题解决 12 months ago
我叫锄头 c531342752 迁移数据块 12 months ago
wangsr 21e4d96221 add - DB2105维护 强制排水替换 12 months ago
wangsr 6eb07eb65d change - 强制排水问题更改 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
我叫锄头 d6fba409f8 RunStatus 12 months ago
我叫锄头 0d00e4ccff 修改数据区,把手动称量变成自动称量区域 12 months ago
我叫锄头 42a8b09541 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 12 months ago
我叫锄头 4a6be9a74c ReadFeededDry 12 months ago
wangsr fc608412e9 change - 手动日志抽离 12 months ago
wangsr a8df236d9c Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 12 months ago
wangsr bc0f71814b change - 去掉老代码注释 12 months ago
我叫锄头 9e69b8b71f Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
12 months ago
我叫锄头 14d60578cd 机台不显示 12 months ago
wangsr a8f9e02d7f Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 12 months ago
wangsr bb9e0220ad add - 输送界面 前端和plc数据连接 添加报警 12 months ago
我叫锄头 b0556171c9 水称调整 12 months ago
我叫锄头 6748c7fe4c 干混机称量准备好 12 months ago
wangsr aaa4338292 add - 上一提交遗漏 12 months ago
wangsr 3f15104ee0 add - 输送前后端连接 准备对点位 12 months ago
我叫锄头 d2a47627bc Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 12 months ago
我叫锄头 038843b98a WetGelatDownload 手动下料 12 months ago
wangsr 03523bd0ac change - use goto 12 months ago
wangsr 6d2d3d0529 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 12 months ago
wangsr cb428310be change - 优化代码 12 months ago
我叫锄头 fa6c67e67f 7 8号的湿混机器显示称量位数不对 12 months ago
我叫锄头 5b7fd0cc53 DM2DSF01L_Set 12 months ago
我叫锄头 2cbd5417d9 Revert "yang 4特殊处理下 采用2109 采用一次赋值"
This reverts commit b530e3b261.
12 months ago
我叫锄头 b530e3b261 yang 4特殊处理下 采用2109 采用一次赋值 12 months ago
wangsr d2d8ac85ab change - 四个产线类型改八个 12 months ago
wangsr e59f052e1f add - 添加产线种类显示 12 months ago
wangsr cd3cee5246 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 12 months ago
wangsr 7d172eef65 change - 设备细节更改 12 months ago
我叫锄头 71e4afb05d GetLGInfo 12 months ago
我叫锄头 a24ed4c363 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 12 months ago
我叫锄头 a6567eda2a 有烟无烟的接口 12 months ago
wangsr 6a80c9d015 change - 自动控制速度参数验证 12 months ago
wangsr 73389d51b4 change - 代码错误修改 12 months ago
wangsr c5187c76c0 add - 自动干混添加速度 12 months ago
wangsr 765dedaf93 add - 手动控制添加请求接料按钮 12 months ago
wangsr 399af4525e change - 更改滚动条代码 12 months ago
我叫锄头 eef0f2f153 mege 12 months ago
wangsr 5ab7ddf522 add - 报警滚动条 12 months ago
我叫锄头 26dc8dd35c 修改testaction 12 months ago
我叫锄头 6a639b5912 HslMoveText 12 months ago
我叫锄头 bcb198e65a 水称下传 水秤添加 differ 和 stand 12 months ago
我叫锄头 333de46638 加冷水 12 months ago
wangsr 77f07468a3 add - 自动控制水称添加偏差值 设备细节报表界面添加车次 时间格式更改 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
我叫锄头 80b7eb2ef0 湿混机 干混机 糊化机实体类 12 months ago
wangsr c0bb2f6f1a change - 小bug 12 months ago
wangsr 465f35da13 add - 添加 报表细节 12 months ago
我叫锄头 378c57118d Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 12 months ago
我叫锄头 e7ad3b2e9d yang 4特殊处理下 采用2107 12 months ago
wangsr 82630f1bcd change - true false 改为 文字显示 12 months ago
wangsr 9778e9d2c6 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 12 months ago
wangsr 33f325e450 change - 设备细节画面添加报表 12 months ago
我叫锄头 586d3879a8 DB3000 修复 7 和8 12 months ago
wangsr 3ef1d680a4 change - 强制排水优化 12 months ago
wangsr 4e9dcd6bd2 change - 强制排水错误修改 12 months ago
wangsr 92ee1aec3f change - 自动控制添加干混机控制步骤 删除plc校对功能(不完善)信息展示界面删除报警时间 12 months ago
我叫锄头 1356676b13 解决大于400 不统计数据的问题 12 months ago
wangsr 633a70b20d delete - 删除错误提示 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
我叫锄头 f4f432fbe4 excle 12 months ago
我叫锄头 98b1e57476 去掉excle 12 months ago
我叫锄头 1096f7527e 排水限制 12 months ago
我叫锄头 e5497ecfc9 【自动】修复排水的问题 12 months ago
我叫锄头 082249068a LED灯 1 year ago
wangsr e83ec7e87d change - 添加验证 优化代码 1 year ago
wangsr 98bd3c57c4 delete - 小简化 1 year ago
wangsr 502ca66d25 准备简化项目 1 year ago
wangsr 9057fb6d9b change - 自动控制plc校验 1 year ago
wangsr 9d14708a28 add - 添加称量中是否排水验证 1 year ago
wangsr 0fdf1f661f Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 0eadc42fff add - 湿混糊化plc下发验证 1 year ago
我叫锄头 2af54fb64f 对接接口 1 year ago
wangsr 2e2603aae2 change - 界面时间不同改变颜色 1 year ago
wangsr 18c2186017 add - 自动添加复制粘贴配置 1 year ago
wangsr 7ae0b0f22c add - 自动控制添加下料检测 展示界面添加混炼完成指示无故熄灭报警 1 year ago
我叫锄头 18e0614a3d LSCREWBIG 1 year ago
wangsr 2d2adbedf7 add - 湿混等待统计添加报表导出功能 监控界面小改 1 year ago
wangsr 7d43083004 change - 湿混时间统计日期统计问题 1 year ago
wangsr ce5cc9974b change - 湿混机统计时间显示错误 1 year ago
wangsr 2e8dde6a35 add - 增加防止下错料验证 1 year ago
wangsr 1cbb7eb74d change - 报表时分秒显示 1 year ago
wangsr d1c66df369 add - 输送界面准备完毕 添加湿混机对接RGV时间统计 1 year ago
wangsr 60898a6830 change - 准备输送界面 代码简化 1 year ago
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
1 year ago
wangsr 564616b7bf change - 自动控制代码重构 1 year ago
wangsr 051c41da3d add - 干混机糊化机整合 干混机功能添加 1 year ago
wangsr 4ef5cc7372 自动控制添加日志 1 year ago
wangsr 25ac863d22 change - 自动维修模式逻辑问题 已修复 1 year ago
nodyang 07edd546a8 bug 1 year ago
nodyang 93ba70bafd 修复点击按钮 1 year ago
wangsr 168b7bdcd2 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 079c5c1d64 add - 自动控制更改界面布局 添加维修模式 1 year ago
nodyang c84878f388 2105 准备信号 1 year ago
wangsr ac7d7251c5 add - 自动准备上线 1 year ago
wangsr 020548a811 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr f96ab5dfec add - 自动状态改变显示 1 year ago
nodyang a594bc6510 插入的plc的 前提是 清理所有的step 1 year ago
nodyang 2e94fb7cb2 修复-1 1 year ago
wangsr 5ad4008138 add - 自动增加开关指示 1 year ago
wangsr 3cc7023fb5 change - 水称加入初始化读取 1 year ago
wangsr dee332a98f debug - 自动控制问题修改 1 year ago
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
1 year ago
wangsr 24c668cb42 change - 自动控制单选变色 1 year ago
nodyang bf62b0ec69 获取控件和修改数数量 1 year ago
wangsr b3638888ea finish - 自动控制代码初步完成 1 year ago
wangsr 8c8dbc7b23 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 62d5726a48 change - 优化代码 1 year ago
nodyang 7debe29fb0 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
nodyang d4fa9f6fdb DownM8Recip 湿混机 6 7 8 地址不对 1 year ago
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
1 year ago
wangsr 40199b6cde change - 规范代码 1 year ago
nodyang fa35c70ad8 souce 1 year ago
nodyang 27ab6500c7 暂存plc 有问题 修复plc 读数有问题 1 year ago
wangsr 034d3b1a92 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 6b66086ba6 merge 1 year ago
nodyang 2f2a247f13 short 类型问题 1 year ago
nodyang 730d508524 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
nodyang 9b486b5c75 修复plc 读取错误 1 year ago
wangsr 48461980dc Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 9d346c0b69 add - 完善自动代码 1 year ago
nodyang 1e30a7d07a GetCodeById 1 year ago
nodyang f5b934fdb4 GetCodeById 修复不等于0 的 1 year ago
wangsr 951df4fd99 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 2a3945d872 add - 手动控制基本完成 - 可以下达数据 1 year ago
nodyang 17198e753f Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
nodyang 366640bdca DeviceMaterrial 1 year ago
wangsr 586725012e Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr c42f69ba1f merge 1 year ago
nodyang b2476a6af4 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
nodyang 6a06438e5b 请选择 1 year ago
wangsr f48552a8da Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr e8f0b31354 merge 1 year ago
nodyang 476fbd3c57 GetDryerMaterrial 1 year ago
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
1 year ago
wangsr a9fe7cdc1b change - 添加combobox 1 year ago
nodyang 492122310d MyMCCombobox 添加 1 year ago
nodyang 25a8cad456 merge 1 year ago
wangsr 732fd48f6e 合并 1 year ago
wangsr 9b31b74429 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 2a39faf545 add - 自动控制准备编辑写入plc部分 准备合并 1 year ago
nodyang bb594c19b0 StockMaterrialDbHelp 改成静态 1 year ago
nodyang 29ecb2f5ea Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
nodyang e31425205e merge 1 year ago
wangsr 72862134be Merge branch 'dep' into wangsr 1 year ago
wangsr 153d412a3e add - 自动控制代码前后端连接完成 等待插入Plc 1 year ago
nodyang 67eb1825d0 StockMaterrialDbHelp 1 year ago
wangsr c1c84b2979 Merge branch 'wangsr' of http://175.27.215.92:3000/yangw/lj_plc into wangsr 1 year ago
wangsr 27fad81be8 add - 自动控制 - 新版 1 year ago
nodyang 0125e123f5 fix 1 year ago
nodyang d7cd1d90bc 整理代码 add 读取配置和 下工艺 1 year ago
nodyang 561213fe66 读取配置 1 year ago
wangsr 5b648d2ff8 change - 配置存到数据库 前端页面报警数据位置纠正 1 year ago
wangsr 21d48d9562 change - 规整代码 合并前准备 1 year ago
wangsr 9c858fb669 change - 手动控制校验写入是否成功3 1 year ago
nodyang 2fd7a22c1d 修改系统颜色 1 year ago
nodyang fdc12243dc 添加闽安功能 1 year ago
wangsr a4c1deeef1 change - 维护DB91 90 1 手动控制添加冷热水交替检测 1 year ago
nodyang 656c118b10 显示下料的接口 1 year ago
wangsr 87009dfd0b add - 黑粉统计添加设定值显示 1 year ago
wangsr da9eb0b193 Merge branch 'wangsr' into dep 1 year ago
wangsr 8a033216a2 change - 设备展示界面修改 1 year ago
nodyang 1846848362 去掉一个引用 1 year ago
wangsr 26d450e609 change - 文字错误更改 螺旋正反转显示实现 dbhelper错误更改 1 year ago
wangsr 5ca78fc6ef change - 更改日志记录方式 重构手动控制日志记录 1 year ago
wangsr 513884b90f change - 添加DB2119数据块 手动控制更新新数据块 添加螺旋称量值 1 year ago
nodyang c434a64a2a 点击变颜色 1 year ago
wangsr 72d675cb2f change - 设备细节画面报警重构 - 部分完成 1 year ago
nodyang 799c0ea68c 1 在湿混机下面加个Rva 小车 信息。 监控有没有报警 1 year ago
nodyang d4223bf026 对接闽安系统 点击按钮提示正在上料 1 year ago
wangsr 1f52509a44 change - 画面展示报表改为PLC读取 1 year ago
nodyang b8fd1abf49 整改Ip 1 year ago
wangsr 5c12ca24f1 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 8e8d7507b2 change - 修改黑粉统计班次时间 1 year ago
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
1 year ago
wangsr fc6fd3ebd0 改地址 1 year ago
wangsr f94f1bf911 change - 设备细节画面添加湿混机运转报警指示 1 year ago
nodyang d531a2699d 添加一个标识 来测试plc 得通讯能力 1 year ago
nodyang f30896869a PlcAddressUtil 修改Plc得地址 1 year ago
nodyang 112fbef84d 即使网络不同 也不会影响上位机的使用 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 b1158a6a17 debug - 实例化代码缺少 - 修复 1 year ago