Commit Graph

448 Commits (a6d2120915bd92fcbaa2a0bc8c8755ceb577f12f)

Author SHA1 Message Date
我叫锄头 a6d2120915 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 11 months ago
我叫锄头 5334b1106c 此按钮暂停使用! 11 months ago
wangsr ad2b494b10 add - 添加切割日志功能 按年分割 11 months ago
wangsr 5dba184ec8 add - 湿混机等待时间统计添加数值溢出错误捕捉 11 months ago
wangsr 435d1ea98a debug - 日志插入错误修改 11 months ago
我叫锄头 3067747fee UserJudge 11 months ago
wangsr ae9d9ea35f add - 添加用户类型判断类 11 months ago
我叫锄头 ec7b179a8a 30秒 缩短到10秒 11 months ago
我叫锄头 83235d4d27 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 11 months ago
我叫锄头 64bcf76309 ReportReadDb 读取报表的问题 11 months ago
wangsr 4672709df3 change - 消除报警下发请求改到自动控制界面 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 0b6e85a04c add - 添加报警指示灯 日志文字后拼接机台号 12 months ago
wangsr 3ba815785e add - 日志显示添加设备编号 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
我叫锄头 bf7bbbab31 读取报表 12 months ago
wangsr 7c05455c2c add - 自动控制水称停止恢复按钮 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
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