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

仓库-入库完善逻辑

Browse Source
This commit is contained in:
赵正易
2024-05-07 15:19:31 +08:00
parent 67991de514
commit 134e97dcb6
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -281,15 +281,29 @@ namespace ZR.Service.mes.wms
}
if (isStrict && wmInfo.Remark != "临时")
{
//1.2 判断是否检验合格 入库检验
// 3. 提取流水号
string package_no = resultionPackage.PatchCode.Split("_")[1];
var inspect= Context.Queryable<WmFgentryInspect>()
// 3.1 isStrict = TRUE 时判断是否是满箱标签
WmPackingrecord recourd = Context.Queryable<WmPackingrecord>()
.Where(it => it.WorkOrderNum == resultionPackage.WorkoderID)
// .Where(it => it.PackingCode.EndsWith(packingCode))
// .Where(it => packingCode == int.Parse(it.PackingCode.Substring(7)).ToString())
.Where(it => package_no == int.Parse(SqlFunc.Right(it.PackingCode, 5)).ToString())
.Where(it => it.BFilled == true)
.First();
if (recourd == null)
{
return "该标签不为满箱标签！请入临时仓库！";
}
//3.2 GP12检测
var inspect = Context.Queryable<WmFgentryInspect>()
.Where(it => it.Workorder == resultionPackage.WorkoderID)
.Where(it => it.Packcode.EndsWith(package_no))
.OrderByDescending(it=>it.CreatedTime)
.First();
// XXX 添加校验，如果是编号为4号的打印机打出来的就跳过GP12，满箱与测试标签校验
if (inspect.Machine != "4")
if (recourd.Machine != "4")
{
// 其余不变
if (inspect == null)
@@ -305,19 +319,7 @@ namespace ZR.Service.mes.wms
return "该箱号GP12 未检验，不得入库";
}
}
// 3.isStrict = TRUE时判断是否是满箱标签
string packingCode = resultionPackage.PatchCode.Split('_')[1];
bool isExist = Context.Queryable<WmPackingrecord>()
.Where(it => it.WorkOrderNum == resultionPackage.WorkoderID)
// .Where(it => it.PackingCode.EndsWith(packingCode))
// .Where(it => packingCode == int.Parse(it.PackingCode.Substring(7)).ToString())
.Where(it => packingCode == int.Parse( SqlFunc.Right(it.PackingCode,5)).ToString())
.Where(it => it.BFilled == true)
.Any();
if (!isExist)
{
return "该标签不为满箱标签！请入临时仓库！";
}
// 4.isStrict = TRUE时判断能否追溯
string flow = resultionPackage.PatchCode.Split('_')[1];
int flow_num = 0;