From 784c5cf27e59e93d3aa0eab64b97d907810f1182 Mon Sep 17 00:00:00 2001 From: tongfei <244188119@qq.com> Date: Mon, 6 Nov 2023 12:34:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 228751 -> 228751 bytes src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 10 ------ src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 4 +-- .../UpdateInStockTaskBoxRequest.cs | 4 --- .../UpdateInStockTaskDetailsRequest.cs | 4 --- src/WMS.Web.Domain/Entitys/InStockTaskBox.cs | 2 +- src/WMS.Web.Domain/Entitys/InstockTask.cs | 9 ++--- .../Entitys/InstockTaskDetails.cs | 4 +-- src/WMS.Web.Domain/Mappers/InStockMapper.cs | 11 +++--- .../InStockTaskRepositories.cs | 33 ++++++++++++------ 10 files changed, 38 insertions(+), 43 deletions(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index ab89519a316894282aaf74c2517ae84f10f9e009..d9b4bd5c2f8561c835430bd6ac1bad1fa2ad4244 100644 GIT binary patch delta 14089 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%0De%sqZkkzGoo) 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 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 524a5183..ac861432 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -1035,11 +1035,6 @@ ID - - - 单据ID(等同-入库任务单ID) - - 箱信息ID @@ -1060,11 +1055,6 @@ 明细ID - - - 单据ID(等同-入库任务单ID) - - 物料ID diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 7c08eef3..fc582a05 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -410,12 +410,12 @@ 入库时间(上架时间) - + 箱信息集合 - + 明细 diff --git a/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskBoxRequest.cs b/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskBoxRequest.cs index aafb0158..7c65056c 100644 --- a/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskBoxRequest.cs +++ b/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskBoxRequest.cs @@ -13,10 +13,6 @@ namespace WMS.Web.Core.Dto.InStockTask /// ID /// public override int Id { get; set; } = 0; - /// - /// 单据ID(等同-入库任务单ID) - /// - public int TaskId { get; set; } /// /// 箱信息ID diff --git a/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskDetailsRequest.cs b/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskDetailsRequest.cs index 565b6e0b..63e859f9 100644 --- a/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskDetailsRequest.cs +++ b/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskDetailsRequest.cs @@ -14,10 +14,6 @@ namespace WMS.Web.Core.Dto.InStockTask /// public override int Id { get; set; } = 0; /// - /// 单据ID(等同-入库任务单ID) - /// - public int Fid { get; set; } - /// /// 物料ID /// public int MaterialId { get; set; } diff --git a/src/WMS.Web.Domain/Entitys/InStockTaskBox.cs b/src/WMS.Web.Domain/Entitys/InStockTaskBox.cs index 5ba13c23..86cb288c 100644 --- a/src/WMS.Web.Domain/Entitys/InStockTaskBox.cs +++ b/src/WMS.Web.Domain/Entitys/InStockTaskBox.cs @@ -12,7 +12,7 @@ namespace WMS.Web.Domain.Entitys /// [Serializable] [Table("t_erp_instock_task_box")] - public class InStockTaskBox:EntityBase + public class InStockTaskBox : EntityBase { /// /// Id diff --git a/src/WMS.Web.Domain/Entitys/InstockTask.cs b/src/WMS.Web.Domain/Entitys/InstockTask.cs index db864b24..d37fcdb0 100644 --- a/src/WMS.Web.Domain/Entitys/InstockTask.cs +++ b/src/WMS.Web.Domain/Entitys/InstockTask.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; using System.Text; +using WMS.Web.Core; using WMS.Web.Domain.Values; namespace WMS.Web.Domain.Entitys @@ -11,12 +12,12 @@ namespace WMS.Web.Domain.Entitys /// [Serializable] [Table("t_erp_instock_task")] - public class InStockTask + public class InStockTask : EntityBase { /// /// ID /// - public int Id { get; set; } + public override int Id { get; set; } /// /// 单据编号 /// @@ -53,12 +54,12 @@ namespace WMS.Web.Domain.Entitys /// /// 箱信息集合 /// - public List Boxs = new List(); + public List Boxs { get; set; } /// /// 明细 /// - public List Details = new List(); + public List Details { get; set; } /// /// 创建 diff --git a/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs b/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs index de3f1f92..7bcb963d 100644 --- a/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs +++ b/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs @@ -11,12 +11,12 @@ namespace WMS.Web.Domain.Entitys /// [Serializable] [Table("t_erp_instock_task_details")] - public class InStockTaskDetails: EntityBase + public class InStockTaskDetails : EntityBase { /// /// ID /// - public override int Id { get; set; } + public override int Id { get; set; } /// /// 单据头ID /// diff --git a/src/WMS.Web.Domain/Mappers/InStockMapper.cs b/src/WMS.Web.Domain/Mappers/InStockMapper.cs index e06bde58..b0eebe08 100644 --- a/src/WMS.Web.Domain/Mappers/InStockMapper.cs +++ b/src/WMS.Web.Domain/Mappers/InStockMapper.cs @@ -17,13 +17,14 @@ namespace WMS.Web.Domain.Mappers public InStockMapper() { CreateMap() - .ForMember(x => x.Details, opt => opt.Ignore()) - .ReverseMap(); - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); + .ForMember(x => x.Boxs, opt => opt.Ignore()) + .ForMember(x => x.Details, opt => opt.Ignore()); + CreateMap(); + CreateMap(); + + CreateMap().ReverseMap(); - CreateMap() .ForMember(x => x.SourceBillNo, ops => ops.MapFrom(x => x.FBillNo)); diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs index 781114c4..a5e1533d 100644 --- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs @@ -9,6 +9,7 @@ using System.Threading.Tasks; using WMS.Web.Core; using WMS.Web.Core.Dto; using WMS.Web.Core.Dto.InStockTask; +using WMS.Web.Core.Help; using WMS.Web.Core.Internal.Results; using WMS.Web.Domain.Entitys; using WMS.Web.Domain.Infrastructure; @@ -125,9 +126,12 @@ namespace WMS.Web.Repositories /// public async Task Get(int id) { - return await _context.InStockTask + var entity =await _context.InStockTask + .Include(x=>x.Boxs) .Include(s => s.Details) .FirstOrDefaultAsync(f => f.Id == id); + + return entity.Clone(); } /// @@ -137,11 +141,13 @@ namespace WMS.Web.Repositories /// public async Task GetBy(string boxBillNo) { - return await _context.InStockTask + var entity= await _context.InStockTask .Include(s => s.Boxs.Where(b => b.BoxBillNo == boxBillNo)) .Include(s => s.Details) .Where(w => w.Boxs.Where(b => b.BoxBillNo == boxBillNo).Count() > 0).FirstOrDefaultAsync(); + return entity.Clone(); + } /// @@ -152,10 +158,10 @@ namespace WMS.Web.Repositories public async Task IsExist(string boxBillNo) { return await _context.InStockTask + .AsNoTracking() .Include(s => s.Boxs.Where(b => b.BoxBillNo == boxBillNo)) .Include(s => s.Details) - .Where(w =>(w.Status== InstockStatus.Part || w.Status== InstockStatus.Wait) && w.Boxs.Where(b => b.BoxBillNo == boxBillNo).Count() > 0).AnyAsync(); - + .Where(w => (w.Status == InstockStatus.Part || w.Status == InstockStatus.Wait) && w.Boxs.Where(b => b.BoxBillNo == boxBillNo).Count() > 0).AnyAsync(); } /// @@ -165,10 +171,11 @@ namespace WMS.Web.Repositories /// public async Task> GetList(List ids) { - return await _context.InStockTask + var entitys= await _context.InStockTask .Include(s => s.Details) .Where(f => ids.Contains(f.Id)) .ToListAsync(); + return entitys.Clone(); } /// @@ -178,10 +185,12 @@ namespace WMS.Web.Repositories /// public async Task> GetListBy(List sourceBillNos) { - return await _context.InStockTask + var entitys= await _context.InStockTask .Include(s => s.Details) .Where(w => sourceBillNos.Contains(w.SourceBillNo)) .ToListAsync(); + + return entitys.Clone(); } /// @@ -301,8 +310,8 @@ namespace WMS.Web.Repositories try { List list = entitys.Select(s => s.Id).ToList(); - var res = await _context.InStockTask.Include(x => x.Details).Where(f => list.Contains(f.Id)).ToListAsync(); - _mapper.Map(entitys, res); + var res = await _context.InStockTask.Include(x=>x.Boxs).Include(x => x.Details).Where(f => list.Contains(f.Id)).ToListAsync(); + _mapper.ToMapList(entitys, res); await _context.SaveChangesAsync(); if (_transaction != null) _transaction.Commit(); @@ -330,18 +339,20 @@ namespace WMS.Web.Repositories try { var model = await _context.InStockTask - .AsNoTracking() + .Include(s=>s.Boxs) .Include(s => s.Details) .FirstOrDefaultAsync(f => f.Id == entity.Id); if (model == null) return null; _mapper.Map(entity, model); - await _context.SaveChangesAsync(); + _mapper.ToMapList(entity.Boxs, model.Boxs); + _mapper.ToMapList(entity.Details, model.Details); + var result= await _context.SaveChangesAsync(); if (_transaction != null) _transaction.Commit(); return model; } - catch (Exception) + catch (Exception ex) { if (_transaction != null) _transaction.Rollback();