Commit Graph

415 Commits (ac187e588e27d8c13ea023b5a6b60fe29d7ba6d7)

Author SHA1 Message Date
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