Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修正

Browse Source
This commit is contained in:
qianhao.xu
2024-04-19 15:01:54 +08:00
parent c8a9f3b648
commit 889bbccc21
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ZR.Service/mes/wms/WMentryWarehousing_productService.cs
View File

@@ -262,19 +262,7 @@ namespace ZR.Service.mes.wms
{
return "标签解析异常！";
}
//1.2 判断是否检验合格
WmFgentryInspect inspect = Context.Queryable<WmGoodsNowProduction>()
.LeftJoin<WmFgentryInspect>((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<WmGoodsNowProduction>().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<WmGoodsNowProduction>()
.LeftJoin<WmFgentryInspect>((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<WmPackingrecord>()