diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 0dc69c8a..0e37abd9 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Domain/Services/OutStockTaskService.cs b/src/WMS.Web.Domain/Services/OutStockTaskService.cs index 81c56987..93f996aa 100644 --- a/src/WMS.Web.Domain/Services/OutStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/OutStockTaskService.cs @@ -956,6 +956,9 @@ namespace WMS.Web.Domain.Services List TransferOut_Nos = new List(); List AssembledApp_Nos = new List(); List MisDeliveryOut_Nos = new List(); + + List PickingOut_Nos = new List();//生产入库 + foreach (var entity in list) { if (entity.Type == OutStockType.Sal) @@ -968,8 +971,19 @@ namespace WMS.Web.Domain.Services AssembledApp_Nos.AddRange(entity.Details.SelectMany(s => s.ErpDetails).Select(s => s.SourceBillNo)); else if (entity.Type == OutStockType.Miscellaneous) MisDeliveryOut_Nos.AddRange(entity.Details.SelectMany(s => s.ErpDetails).Select(s => s.SourceBillNo)); + else if (entity.Type == OutStockType.PickingOut) + PickingOut_Nos.AddRange(entity.Details.SelectMany(s => s.ErpDetails).Select(s => s.SourceBillNo)); } + if (PickingOut_Nos.Count() > 0) + { + var erp_result = await _erpService.BillQueryForPickingOutStock(PickingOut_Nos, null); + if (!erp_result.IsSuccess) + return Result>.ReFailure(erp_result.Message, erp_result.Status); + erp_list.AddRange(erp_result.Data); + } + + if (SalOutStock_Nos.Count() > 0) { var erp_result = await _erpService.BillQueryForSalOutStock(SalOutStock_Nos, null);