From 04e1074acd3dfbfad90a8876910a1eac3b595bc3 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Wed, 8 Nov 2023 14:38:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8F=8D=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 5 ----- src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 5 ----- src/WMS.Web.Core/Dto/OutStock/OutStockQueryInfoResponse.cs | 4 ---- src/WMS.Web.Domain/Entitys/OutStock.cs | 5 ----- src/WMS.Web.Repositories/OutStockRepositories.cs | 1 - 5 files changed, 20 deletions(-) diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 0b09ce9d..6b780636 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -2605,11 +2605,6 @@ 单据编号 - - - 单据状态 - - 单据类型 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 8c54100a..b233feee 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -711,11 +711,6 @@ 来源单号 - - - 单据状态 - - 单据类型 diff --git a/src/WMS.Web.Core/Dto/OutStock/OutStockQueryInfoResponse.cs b/src/WMS.Web.Core/Dto/OutStock/OutStockQueryInfoResponse.cs index 3ff2065a..31bb7f9f 100644 --- a/src/WMS.Web.Core/Dto/OutStock/OutStockQueryInfoResponse.cs +++ b/src/WMS.Web.Core/Dto/OutStock/OutStockQueryInfoResponse.cs @@ -18,10 +18,6 @@ namespace WMS.Web.Core.Dto.OutStock /// public string BillNo { get; set; } /// - /// 单据状态 - /// - public string Status { get; set; } - /// /// 单据类型 /// public string Type { get; set; } diff --git a/src/WMS.Web.Domain/Entitys/OutStock.cs b/src/WMS.Web.Domain/Entitys/OutStock.cs index a97e9301..20e5cde5 100644 --- a/src/WMS.Web.Domain/Entitys/OutStock.cs +++ b/src/WMS.Web.Domain/Entitys/OutStock.cs @@ -36,11 +36,6 @@ namespace WMS.Web.Domain.Entitys [Column("SourceBillNo")] public string SourceBillNo { get; set; } /// - /// 单据状态 - /// - [Column("Status")] - public OutStockStatus Status { get; set; } = OutStockStatus.Wait; - /// /// 单据类型 /// [Column("Type")] diff --git a/src/WMS.Web.Repositories/OutStockRepositories.cs b/src/WMS.Web.Repositories/OutStockRepositories.cs index eb247fd0..30b15a6f 100644 --- a/src/WMS.Web.Repositories/OutStockRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockRepositories.cs @@ -132,7 +132,6 @@ namespace WMS.Web.Repositories #region dto组装 Id = s.order.Id, BillNo = s.order.BillNo, - Status = s.order.Status.GetRemark(), Type = s.order.Type.GetRemark(), Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId), CreateTime = s.order.CreateTime.DateToStringSeconds(), From 0a3a37f316c5bb23f5171ccebaed7592c79d7052 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Wed, 8 Nov 2023 15:10:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=AE=B1=E4=BF=A1=E6=81=AF=E5=90=8C?= =?UTF-8?q?=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Core/Dto/OpsBoxRequest.cs | 5 ++++ .../Infrastructure/IBoxRepositories.cs | 9 ++++++ src/WMS.Web.Domain/Mappers/BoxMapper.cs | 3 ++ src/WMS.Web.Domain/Services/BoxService.cs | 23 ++++++++++++-- src/WMS.Web.Repositories/BoxRepositories.cs | 30 +++++++++++++++++++ 5 files changed, 67 insertions(+), 3 deletions(-) diff --git a/src/WMS.Web.Core/Dto/OpsBoxRequest.cs b/src/WMS.Web.Core/Dto/OpsBoxRequest.cs index 4497d64b..7207ea30 100644 --- a/src/WMS.Web.Core/Dto/OpsBoxRequest.cs +++ b/src/WMS.Web.Core/Dto/OpsBoxRequest.cs @@ -9,6 +9,11 @@ namespace WMS.Web.Core.Dto /// public class OpsBoxRequest { + public OpsBoxRequest() { } + public OpsBoxRequest(DateTime strartTime,DateTime endTime) { + this.StrartTime = strartTime; + this.EndTime = endTime; + } public DateTime StrartTime { get; set; } public DateTime EndTime { get; set; } public string BoxBillNo { get; set; } diff --git a/src/WMS.Web.Domain/Infrastructure/IBoxRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IBoxRepositories.cs index 935d3894..120193a1 100644 --- a/src/WMS.Web.Domain/Infrastructure/IBoxRepositories.cs +++ b/src/WMS.Web.Domain/Infrastructure/IBoxRepositories.cs @@ -14,9 +14,18 @@ namespace WMS.Web.Domain.Infrastructure { Task Get(int id); Task GetByNo(string billNo); + //根据箱号搜索 用来比对确定是否箱号信息是否存在 + Task> GetByNos(List billNos); //根据箱号查询明细信息 Task> GetBox(List billNos); //批量修改 Task EditEntityList(List entitys, bool isTransaction = true); + /// + /// 批量添加 + /// + /// + /// + /// + Task AddRange(List entitys, bool isTransaction = true); } } diff --git a/src/WMS.Web.Domain/Mappers/BoxMapper.cs b/src/WMS.Web.Domain/Mappers/BoxMapper.cs index f4d6fe42..991368d2 100644 --- a/src/WMS.Web.Domain/Mappers/BoxMapper.cs +++ b/src/WMS.Web.Domain/Mappers/BoxMapper.cs @@ -16,6 +16,9 @@ namespace WMS.Web.Domain.Mappers { CreateMap(); CreateMap(); + + CreateMap(); + CreateMap(); } } } diff --git a/src/WMS.Web.Domain/Services/BoxService.cs b/src/WMS.Web.Domain/Services/BoxService.cs index 8972d03e..938232c2 100644 --- a/src/WMS.Web.Domain/Services/BoxService.cs +++ b/src/WMS.Web.Domain/Services/BoxService.cs @@ -1,9 +1,12 @@ using AutoMapper; using System; using System.Collections.Generic; +using System.Linq; using System.Text; using System.Threading.Tasks; +using WMS.Web.Core.Dto; using WMS.Web.Core.Internal.Results; +using WMS.Web.Domain.Entitys; using WMS.Web.Domain.Infrastructure; using WMS.Web.Domain.IService; using WMS.Web.Domain.IService.Public; @@ -13,7 +16,7 @@ namespace WMS.Web.Domain.Services /// /// 箱服务信息 /// - public class BoxService: IBoxService + public class BoxService : IBoxService { private readonly IMapper _mapper; private readonly ILoginService _loginService; @@ -31,9 +34,23 @@ namespace WMS.Web.Domain.Services _opsService = opsService; } - public Task Sync() + public async Task Sync() { - throw new NotImplementedException(); + OpsBoxRequest request = new OpsBoxRequest(DateTime.Now.AddYears(-1), DateTime.Now); + var list = await _opsService.GetBox(request); + var nos = list.Select(s => s.BoxBillNo).ToList(); + var old_nos=await _boxRepositories.GetByNos(nos); + foreach(var s in old_nos) + { + //数据库里已经存在箱信息 移除 + var box = list.FirstOrDefault(f => f.BoxBillNo.Equals(s)); + list.Remove(box); + } + var boxs = _mapper.Map>(list); + //批量添加 + await _boxRepositories.AddRange(boxs,true); + //需要添加序列号记录表 + return Result.ReSuccess(); } } } diff --git a/src/WMS.Web.Repositories/BoxRepositories.cs b/src/WMS.Web.Repositories/BoxRepositories.cs index 690f3261..110cb16a 100644 --- a/src/WMS.Web.Repositories/BoxRepositories.cs +++ b/src/WMS.Web.Repositories/BoxRepositories.cs @@ -107,5 +107,35 @@ namespace WMS.Web.Repositories return entity.Clone(); } + //根据箱号搜索 用来比对确定是否箱号信息是否存在 + public async Task> GetByNos(List billNos) + { + return await _context.Box + .Where(w => billNos.Contains(w.BoxBillNo)).Select(s=>s.BoxBillNo).ToListAsync(); + } + + public async Task AddRange(List entitys, bool isTransaction = true) + { + IDbContextTransaction _transaction = null; + if (isTransaction) + _transaction = _context.Database.BeginTransaction(); + try + { + if (entitys != null && entitys.Count != 0) + { + await _context.Box.AddRangeAsync(entitys); + await _context.SaveChangesAsync(); + } + if (_transaction != null) + _transaction.Commit(); + return true; + } + catch + { + if (_transaction != null) + _transaction.Rollback(); + return false; + } + } } }