Commit Graph

669 Commits (ac0cca39ee4ba115b49f54430ff68939d121f158)
 

Author SHA1 Message Date
我叫锄头 83235d4d27 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 12 months ago
我叫锄头 64bcf76309 ReportReadDb 读取报表的问题 12 months ago
wangsr fdffd714ae Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 12 months ago
wangsr 4672709df3 change - 消除报警下发请求改到自动控制界面 12 months ago
我叫锄头 09e043b212 修改IP为本地IP 12 months ago
我叫锄头 a79e67a57a Ip127.0.0.1 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 b469953750 add - DB2111 部分读取 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 dfe11b1a2a Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
#	DataBlockHelper/PlcConnect.cs
12 months ago
wangsr 1a2531d391 change - 下传混炼完毕数据 12 months ago
我叫锄头 7bf1e1256e 172.18.4.100 12 months ago
我叫锄头 bf7bbbab31 读取报表 12 months ago
wangsr 7c05455c2c add - 自动控制水称停止恢复按钮 12 months ago
我叫锄头 2f1fd1f77c 172.18.4.100 修复Ip 地址 12 months ago
wangsr 3c87078459 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 12 months ago
wangsr 5e8c5dac17 add - 添加水称启停 12 months ago
我叫锄头 ec346e4e91 GetWaterStatus 修改成静态类 12 months ago
我叫锄头 de01c734b9 true 状态是停止 12 months ago
我叫锄头 a9e14f2f7e GetWaterStatus 获取水的状态 停止和下发水的状态 12 months ago
我叫锄头 c75f4138d5 修改ip 12 months ago
wangsr 84706d5abf Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 12 months ago
wangsr c747e83c90 change - 重复提示问题解决 12 months ago
我叫锄头 e7954ad276 172.18.4.100 12 months ago
wangsr f94acb881a Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 12 months ago
wangsr 22a99a978c change - 2105更改读取长度 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