diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs index f358b3db..12112e89 100644 --- a/src/WMS.Web.Api/Controllers/SysConfigController.cs +++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs @@ -227,7 +227,7 @@ namespace WMS.Web.Api.Controllers return Result>.ReSuccess(list); var subs = await _erpService.BillQueryForSubStock(); - var res = subs.Data.Where(w => w.OrgCode.Equals(orgCode)&&w.StockCode.Equals(number)); + var res = subs.Data.Where(w => w.OrgCode.Equals(orgCode) && w.StockCode.Equals(number)); if (!string.IsNullOrEmpty(name)) res = res.Where(w => w.Name.Contains(name)); list = res.Select(s => new UcStockResponse() @@ -338,10 +338,11 @@ namespace WMS.Web.Api.Controllers /// 根据箱号获取箱信息(综合) /// /// 必填 + /// 没有箱时是否提示 false 返回数据 true或者不传 弹出提示 /// [HttpGet] [Route("GetBoxSynthesis")] - public async Task> GetBoxSynthesis([FromQuery] string boxBillNo) + public async Task> GetBoxSynthesis([FromQuery] string boxBillNo, [FromQuery] bool? isReminder = true) { var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); if (loginInfo == null || loginInfo.UserInfo == null) @@ -367,6 +368,7 @@ namespace WMS.Web.Api.Controllers } var res = await _boxRepositories.GetBox(new List() { boxBillNo }); + if (res.Count() <= 0 && isReminder == false) return Result.ReSuccess(new BoxResponse()); if (res.Count() <= 0) return Result.ReFailure(ResultCodes.BoxNoData); return Result.ReSuccess(res.First()); } diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index 40389350..e2e539ad 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -517,11 +517,12 @@ 必填 - + 根据箱号获取箱信息(综合) 必填 + 没有箱时是否提示 false 返回数据 true或者不传 弹出提示 diff --git a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs index 0a3aeb46..33b647cc 100644 --- a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs +++ b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs @@ -68,21 +68,14 @@ namespace WMS.Web.Domain.Services if (IsPDA) { var d = dto.First(); - var dBox = await _boxRepositories.GetByNo(d.DestBoxBillNo); - if (dBox == null) + if (d.DestBoxId == 0) { + var dBox = await _boxRepositories.GetByNo(d.DestBoxBillNo); var res = await CreateBox(d); if (!res.IsSuccess) return res; dBox = await _boxRepositories.GetByNo(d.DestBoxBillNo); dto.First().DestBoxId = dBox.Id; } - else - { - var destInventoryBoxs = await _boxInventoryRepositories.Get(dBox.Id); - dto.First().DestBoxId = dBox.Id; - if (destInventoryBoxs != null) - dto.First().SubStockId = destInventoryBoxs.SubStockId; - } } //1.有原箱时 需要判断 物料对应的序列号是否存在 var srcIds = dto.Select(s => s.SrcBoxId).Distinct().ToList();