diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 7cb3dbc2..2c633f26 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.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs index 82720d74..da7e788e 100644 --- a/src/WMS.Web.Api/Controllers/TestController.cs +++ b/src/WMS.Web.Api/Controllers/TestController.cs @@ -73,7 +73,7 @@ namespace WMS.Web.Api.Controllers public async Task TestHJ() { //var list = await _outStockTaskRepositories.GetEntityList(new List { 14321 }); - + //list[0].Details[0].ErpDetails[0].AccruedQty = 2; //list[0].Details[0].ErpDetails.Add(new OutStockTaskErpDetails() //{ @@ -193,24 +193,25 @@ namespace WMS.Web.Api.Controllers /// /// /// + /// /// [HttpGet] [Route("SCBox/{str}/{number}")] - public async Task SCBox([FromRoute] string str, [FromRoute] int number, [FromQuery] List materialNumbers) + public async Task SCBox([FromRoute] string str, [FromRoute] int number, [FromQuery] List materialNumbers, [FromQuery] string orgCode) { if (!_env.IsDevelopment()) return Result.ReSuccess(); if (materialNumbers == null) materialNumbers = new List(); - var list = await GetList(str, number, materialNumbers); + var list = await GetList(str, number, materialNumbers, orgCode); await _boxService.Sync(list); return Result.ReSuccess(); } - private async Task> GetList(string str, int number, List materialNumbers) + private async Task> GetList(string str, int number, List materialNumbers, string orgCode) { var materials_result = await _erpService.BillQueryForMaterial(); var materials = materials_result.Data.ToList(); - List mIds = materials.Where(w => materialNumbers.Contains(w.MaterialNumber)).Select(s => s.MaterialId).ToList(); + List mIds = materials.Where(w => materialNumbers.Contains(w.MaterialNumber) && w.OrgCode == orgCode).Select(s => s.MaterialId).ToList(); int jn = 3; if (mIds.Count() <= 0) mIds = materials.Skip((new Random()).Next(1000, 10000)).Take(4).Select(s => s.MaterialId).ToList(); diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index 0920b097..b4435641 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -646,13 +646,14 @@ - + 自动生成箱信息 +