diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 91fc6696..edcdbedc 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/SubscribeNotificationController.cs b/src/WMS.Web.Api/Controllers/SubscribeNotificationController.cs index 82be066f..be2167fb 100644 --- a/src/WMS.Web.Api/Controllers/SubscribeNotificationController.cs +++ b/src/WMS.Web.Api/Controllers/SubscribeNotificationController.cs @@ -88,7 +88,7 @@ namespace WMS.Web.Api.Controllers return Result.ReFailure(ResultCodes.Token_Invalid_Error); var entity = await _repositories.Get(dto.Id); - if (entity == null) + if (entity == null || entity.IsDelete == true) return Result.ReFailure(ResultCodes.SubscribeNotificationNoData); //修改 //修改了名字或者编码后 验重 diff --git a/src/WMS.Web.Domain/Entitys/SubscribeNotification.cs b/src/WMS.Web.Domain/Entitys/SubscribeNotification.cs index 96306539..180fbe5b 100644 --- a/src/WMS.Web.Domain/Entitys/SubscribeNotification.cs +++ b/src/WMS.Web.Domain/Entitys/SubscribeNotification.cs @@ -33,12 +33,12 @@ namespace WMS.Web.Domain.Entitys /// 电话 /// [Column("Telephones")] - public List Telephones { get; set; } + public List Telephones { get; set; } = new List(); /// /// 邮件 /// [Column("Emails")] - public List Emails { get; set; } + public List Emails { get; set; } = new List(); /// /// 是否删除 /// diff --git a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs index 6f409f92..92982eed 100644 --- a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs +++ b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs @@ -285,22 +285,23 @@ namespace WMS.Web.Repositories var materials = materials_result.Data.ToList(); var entity = await _context.SerialNumbers_Ops - .GroupJoin(_context.BoxInventory.Include(x => x.Details), serial => serial.BoxId, boxInventory => boxInventory.BoxId, (serial, boxInventory) => new { serial, boxInventory }) - .SelectMany(x => x.boxInventory.DefaultIfEmpty(), (p, boxInventory) => new { p.serial, boxInventory }) - .GroupJoin(_context.Box, s => s.serial.BoxId, box => box.Id, (s, box) => new { s.serial, s.boxInventory, box }) - .SelectMany(x => x.box.DefaultIfEmpty(), (p, box) => new { p.serial, p.boxInventory, box }) - .FirstOrDefaultAsync(w => serialNumber.Equals(w.serial.SerialNumber)); - if (entity == null || entity.serial == null) return null; + //.GroupJoin(_context.BoxInventory.Include(x => x.Details), serial => serial.BoxId, boxInventory => boxInventory.BoxId, (serial, boxInventory) => new { serial, boxInventory }) + //.SelectMany(x => x.boxInventory.DefaultIfEmpty(), (p, boxInventory) => new { p.serial, boxInventory }) + //.GroupJoin(_context.Box, s => s.serial.BoxId, box => box.Id, (s, box) => new { s.serial, s.boxInventory, box }) + //.SelectMany(x => x.box.DefaultIfEmpty(), (p, box) => new { p.serial, p.boxInventory, box }) + .FirstOrDefaultAsync(w => serialNumber.Equals(w.SerialNumber)); + if (entity == null) return null; response.IsOldOps = true; - response.BoxId = entity.serial.BoxId; - response.BoxBillNo = entity?.box?.BoxBillNo ?? ""; - response.SubStockCode = entity?.boxInventory?.SubStockCode ?? ""; - response.SerialNumber = entity.serial.SerialNumber; - response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber); - response.MaterialNumber = entity.serial.MaterialNumber; - response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber); - if (entity.boxInventory != null) - response.IsBoxInventory = entity.boxInventory.Details.SelectMany(s => s.SerialNumbers).Where(w => serialNumber.Equals(w)).Count() >= 1 ? true : false; + response.IsBoxInventory = true;//如果是老ops序列号 默认有库存 + response.BoxId = 0; + response.BoxBillNo = ""; + response.SubStockCode = ""; + response.SerialNumber = entity.SerialNumber; + response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.MaterialNumber); + response.MaterialNumber = entity.MaterialNumber; + response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.MaterialNumber); + //if (entity.boxInventory != null) + // response.IsBoxInventory = entity.boxInventory.Details.SelectMany(s => s.SerialNumbers).Where(w => serialNumber.Equals(w)).Count() >= 1 ? true : false; return response;