diff --git a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs index 78ff5499..18c73cd1 100644 --- a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs +++ b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs @@ -262,19 +262,7 @@ namespace ZR.Service.mes.wms { return "标签解析异常!"; } - //1.2 判断是否检验合格 - WmFgentryInspect inspect = Context.Queryable() - .LeftJoin((g, f) => g.PackageCode == f.Packcode) - .Where(g => g.PackageCodeClient == resultionPackage.PatchCode) - .Select((g, f) => new WmFgentryInspect() - { - Result = f.Result - - }).First(); - if (inspect == null || inspect.Result == 2) - { - return "该箱号GP12 检验不合格"; - } + // 2.判断是否已入库 bool isExistedWarehouse = Context.Queryable().Where(it => it.PackageCodeClient == resultionPackage.PatchCode).Any(); @@ -290,6 +278,20 @@ namespace ZR.Service.mes.wms } if (isStrict && wmInfo.Remark != "临时") { + //1.2 判断是否检验合格 入库检验 + WmFgentryInspect inspect = Context.Queryable() + .LeftJoin((g, f) => g.PackageCode == f.Packcode) + .Where(g => g.PackageCodeClient == resultionPackage.PatchCode) + .Select((g, f) => new WmFgentryInspect() + { + Result = f.Result + + }).First(); + if (inspect == null || inspect.Result == 2) + { + return "该箱号GP12 检验不合格"; + } + // 3.isStrict = TRUE时判断是否是满箱标签 string packingCode = resultionPackage.PatchCode.Split('_')[1]; bool isExist = Context.Queryable()