diff --git a/ZR.Service/mes/wms/WmPolishQualityStatisticsService.cs b/ZR.Service/mes/wms/WmPolishQualityStatisticsService.cs index b6a79396..01587dfe 100644 --- a/ZR.Service/mes/wms/WmPolishQualityStatisticsService.cs +++ b/ZR.Service/mes/wms/WmPolishQualityStatisticsService.cs @@ -136,32 +136,7 @@ namespace ZR.Service.mes.wms WmPolishInventoryService inventoryService = new(); WmOneTimeInventoryService oneTimeService = new(); // 合格品检查是否是门把手,是进入成品库(仅出库),不是进入一次合格品库 - string[] checkStrArray = - { - "T22", - "T26", - "A58", - "A60", - "C01", - "B02", - "V71", - "T1EJ " - }; - var isDoorknobCheck = Expressionable - .Create(); - foreach (string checkStr in checkStrArray) - { - isDoorknobCheck.Or(it => it.Description.Contains(checkStr)); - } - ; - isDoorknobCheck.And(it => it.Partnumber == res0.Partnumber) - .And(it => it.Type == 1) - .And(it => it.Status == 1) - .And(it => it.Description.Contains("门把手")); - bool isDoorknob = Context - .Queryable() - .Where(isDoorknobCheck.ToExpression()) - .Any(); + bool isDoorknob = CheckIsDoorknob(model.Partnumber); if (!isDoorknob && model.QualifiedNumber > 0) { WmOneTimeInventory wmOneTimeInventoryWarehousing = @@ -294,5 +269,26 @@ namespace ZR.Service.mes.wms throw new Exception(e.Message); } } + + /// + /// 检查零件号是否是门把手 + /// + /// + public bool CheckIsDoorknob(string partnumber) + { + string[] checkStrArray = { "T22", "T26", "A58", "A60", "C01", "B02", "V71", "T1EJ" }; + var isDoorknobCheck = Expressionable.Create(); + foreach (string checkStr in checkStrArray) + { + isDoorknobCheck.Or(it => it.Description.Contains(checkStr)); + } + ; + isDoorknobCheck + .And(it => it.Partnumber == partnumber) + .And(it => it.Type == 1) + .And(it => it.Status == 1) + .And(it => it.Description.Contains("门把手")); + return Context.Queryable().Where(isDoorknobCheck.ToExpression()).Any(); + } } }