diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs index 55c2cfef..0ad38499 100644 --- a/ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs @@ -215,6 +215,7 @@ namespace ZR.Admin.WebApi.Controllers public IActionResult checkProductionOut(string production_packcode = "", string shipment_num = "") { string msg = "可出库"; + return ToResponse(new ApiResult(200, msg, true)); } diff --git a/ZR.Service/mes/wms/WmOutOrderService.cs b/ZR.Service/mes/wms/WmOutOrderService.cs index 35a4af52..7057eda4 100644 --- a/ZR.Service/mes/wms/WmOutOrderService.cs +++ b/ZR.Service/mes/wms/WmOutOrderService.cs @@ -245,7 +245,7 @@ namespace ZR.Service.mes.wms public List Queryoutoder_matrials(string shipment_num) { - List stockList = Context.Queryable() + List stockList = Context.Queryable() .LeftJoin((mo, m) => mo.FkMaterialId == m.Id) .Where(mo => mo.FkOutorderId == shipment_num) .Select((mo, m) => new WmMaterialQuery_print() @@ -257,15 +257,20 @@ namespace ZR.Service.mes.wms //需求零件数 RequireOutNum = mo.OuthouseNum }).ToList(); + + if (stockList != null && stockList.Count > 0) { foreach (var stock in stockList) { //现有箱数 - stock.PackageNum = Context.Queryable().Where(it => it.Partnumber == stock.Partnumber).Count(); + stock.PackageNum = Context.Queryable() + .Where(it => it.Partnumber == stock.Partnumber).Count(); //现有零件数 - int? num = Context.Queryable().Where(it => it.Partnumber == stock.Partnumber).Sum(it => it.GoodsNumLogic); + int? num = Context.Queryable() + .Where(it => it.Partnumber == stock.Partnumber) + .Sum(it => it.GoodsNumLogic); stock.ItemNum = num ?? 0; } }