门把手检测优化

This commit is contained in:
2024-08-12 11:24:24 +08:00
parent 729f148731
commit 79504bf4c3

View File

@@ -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<WmMaterial>();
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<WmMaterial>()
.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);
}
}
/// <summary>
/// 检查零件号是否是门把手
/// </summary>
/// <returns></returns>
public bool CheckIsDoorknob(string partnumber)
{
string[] checkStrArray = { "T22", "T26", "A58", "A60", "C01", "B02", "V71", "T1EJ" };
var isDoorknobCheck = Expressionable.Create<WmMaterial>();
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<WmMaterial>().Where(isDoorknobCheck.ToExpression()).Any();
}
}
}