物料判断

This commit is contained in:
赵正易 2024-05-14 10:31:24 +08:00
parent dbd70442ed
commit 6b0ca94550

View File

@ -53,7 +53,7 @@ namespace ZR.Service.mes.wms
;
var response = Queryable()
.Where(predicate.ToExpression())
.OrderByDescending(it=>it.CreatedTime)
.OrderByDescending(it => it.CreatedTime)
.ToPage<WmOutOrder, WmOutOrderDto>(parm);
return response;
@ -683,14 +683,14 @@ namespace ZR.Service.mes.wms
// 3.2 判断是否是计划中的物料(大概率不执行)
bool flag1 = false;
List<WmMaterial> materialOutorders = Context.Queryable<WmMaterialOutorder>()
.LeftJoin<WmMaterial>((wmo,wm)=>wmo.FkMaterialId == wm.Id)
.LeftJoin<WmMaterial>((wmo, wm) => wmo.FkMaterialId == wm.Id)
.Where(wmo => wmo.FkOutorderId == shipment_num)
.Select((wmo, wm) => new WmMaterial
{
Partnumber = wm.Partnumber
})
.ToList();
foreach(WmMaterial materialOption in materialOutorders)
foreach (WmMaterial materialOption in materialOutorders)
{
if (materialOption.Partnumber == resultionPackage.PartNumner)
{
@ -819,6 +819,7 @@ namespace ZR.Service.mes.wms
// 2.此出库单下的批次号的已出库记录
var exp2 = Expressionable.Create<WmGoodsOutRecord>()
.And(it => it.PackageCodeClient.Contains(plan.Patchcode))
.And(it => it.Partnumber == plan.MaterialCode)
.And(it => it.FkOutOrderId == shipment_num)
.ToExpression();
List<WmGoodsOutRecord> outPackageList = Context.Queryable<WmGoodsOutRecord>()
@ -837,6 +838,7 @@ namespace ZR.Service.mes.wms
// 此批次是否还有库存
bool hasAny = Context.Queryable<WmGoodsNowProduction>()
.Where(it => it.PackageCodeClient.Contains(plan.Patchcode))
.Where(it => it.Partnumber == plan.MaterialCode)
.Any();
// 检查此批次是否出完
if (outPartnumberNum >= plan.RequireNum || !hasAny)