diff --git a/ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs b/ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs index 7c581e59..3c31db07 100644 --- a/ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs @@ -224,6 +224,19 @@ namespace Tnb.ProductionMgr { string state = await _redisData.TryGetValueByKeyField("YTCS", "State"); if ("OK" != state) return "YTCS没开机"; + string stateHxja = await _redisData.TryGetValueByKeyField("hxjA", "State"); + string stateHxjc = await _redisData.TryGetValueByKeyField("hxjC", "State"); + List hxjList = new List(); + if ("OK" == stateHxja) + { + hxjList.Add("hxjA"); + } + if ("OK" == stateHxjc) + { + hxjList.Add("hxjC"); + } + + if (hxjList.IsEmpty()) return "hxjA,hxjC不正常"; string msg = ""; List equipments = await _db.Queryable() .InnerJoin((x, y) => x.id == y.equip_type_id) @@ -241,6 +254,11 @@ namespace Tnb.ProductionMgr Log.Error($"{equipment.name}没配置允许入空箱"); continue; } + if (!hxjList.Contains(eqpDaq.equip_code)) + { + Log.Error($"{eqpDaq.equip_code}状态不正常"); + continue; + } bool? value = await _redisData.TryGetValueByKeyField(eqpDaq.equip_code, eqpDaq.label_name); bool valueFlag = _redisData.Get($"{eqpDaq.equip_code}_{eqpDaq.label_name}_flag");