diff --git a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj index 986c743b..749a6506 100644 --- a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj +++ b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj @@ -37,6 +37,7 @@ + diff --git a/ZR.Service/mes/wms/WmOutOrderService.cs b/ZR.Service/mes/wms/WmOutOrderService.cs index 3f7df174..29d953a0 100644 --- a/ZR.Service/mes/wms/WmOutOrderService.cs +++ b/ZR.Service/mes/wms/WmOutOrderService.cs @@ -451,7 +451,7 @@ namespace ZR.Service.mes.wms string short_patch = item.Split("_")[0]; WmOutOrderPlan plan_item = Context.Queryable() .Where(it => it.FkOutOrderId == shipnumber) - .Where(it => it.Patchcode.Contains(short_patch)).First(); + .Where(it => it.Patchcode==short_patch).OrderBy(it => it.Outorder).First(); if (plan_item != null) { var plan_earliest = Context.Queryable() @@ -465,7 +465,7 @@ namespace ZR.Service.mes.wms { return (100, 100); } - if (plan_earliest.Id == plan_earliest.Id) + if (plan_earliest.Id == plan_item.Id) { // TODO 每次出库要出库计划累加