From 4e99b900cbea235069ba1f7e9db01a47e382fa70 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Tue, 7 Nov 2023 09:22:10 +0800 Subject: [PATCH 1/5] 11 --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 228751 -> 228751 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 596f520b65f4b3efed62a38870faa381fa2a658e..87fd87fceb64b12a945bc700dacbeaef91e58d3e 100644 GIT binary patch delta 31202 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 Date: Tue, 7 Nov 2023 10:10:51 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=87=BA=E5=BA=93=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=87=BA=E5=BA=93=E5=BC=80=E5=A7=8B=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=92=8C=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OutStockTaskQueryInfoResponse.cs | 12 ++++++++++++ .../Entitys/OutStockTaskDetails.cs | 16 +++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs index 01815845..b867c805 100644 --- a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs +++ b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs @@ -85,5 +85,17 @@ namespace WMS.Web.Core.Dto.OutStockTask /// 创建时间(erp那边的创建时间) /// public string CreateTime { get; set; } + /// + /// 单位 + /// + public string Unit { get; set; } + /// + /// 出库开始时间 + /// + public DateTime? OutStockBeginTime { get; set; } + /// + /// 出库结束时间 + /// + public DateTime? OutStockEndTime { get; set; } } } diff --git a/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs b/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs index d68aa89f..9098ba6b 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs @@ -61,7 +61,16 @@ namespace WMS.Web.Domain.Entitys /// [Column("Remark")] public string Remark { get; set; } - + /// + /// 出库开始时间 + /// + [Column("OutStockBeginTime")] + public DateTime? OutStockBeginTime { get; set; } + /// + /// 出库结束时间 + /// + [Column("OutStockEndTime")] + public DateTime? OutStockEndTime { get; set; } /// /// 出库 反写 任务单 @@ -74,6 +83,11 @@ namespace WMS.Web.Domain.Entitys if ((this.AccruedQty - this.RealityQty) < qty) return Result.ReFailure(ResultCodes.OutStockQtyError); + if (this.RealityQty <= 0) + this.OutStockBeginTime = DateTime.Now; + + this.OutStockEndTime = DateTime.Now; + this.RealityQty = this.RealityQty + qty; return Result.ReSuccess(); From 0a9d34ba9cd1c45022f11eb8361169d28ac89baf Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Tue, 7 Nov 2023 10:12:26 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs | 4 ++-- src/WMS.Web.Repositories/OutStockTaskRepositories.cs | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs index b867c805..ddf32a57 100644 --- a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs +++ b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs @@ -92,10 +92,10 @@ namespace WMS.Web.Core.Dto.OutStockTask /// /// 出库开始时间 /// - public DateTime? OutStockBeginTime { get; set; } + public string OutStockBeginTime { get; set; } /// /// 出库结束时间 /// - public DateTime? OutStockEndTime { get; set; } + public string OutStockEndTime { get; set; } } } diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs index 1651f5e2..81062606 100644 --- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs @@ -247,14 +247,17 @@ namespace WMS.Web.Repositories Status = s.order.Status.GetRemark(), Type = s.order.Type.GetRemark(), CreateTime = s.order.OperateTime.DateToStringSeconds(), + OutStockBeginTime= s.detail.OutStockBeginTime.DateToStringSeconds(), + OutStockEndTime = s.detail.OutStockEndTime.DateToStringSeconds(), Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId), SourceBillNo = s.order.SourceBillNo, SaleBillNo = s.detail.SaleBillNo, DeliveryOrg = "", - ReceiptCustomer = _singleDataService.GetSingleData(SingleAction.Customers, _loginRepositories.CompanyId, s.order.ReceiptCustomerId), + ReceiptCustomer = "", MaterialName = "", MaterialNumber = "", - Specifications = "" + Specifications = "", + Unit="", #endregion }).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); From 063013792005c00c703ea0540846505a1ad9b6ba Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Tue, 7 Nov 2023 10:57:46 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=9B=98=E7=9B=88=E7=9B=98=E4=BA=8F?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Domain/Entitys/TakeStock.cs | 18 +++++ .../IService/ITakeStockService.cs | 2 +- .../Infrastructure/ITakeStockRepositories.cs | 11 +++ src/WMS.Web.Domain/Mappers/TakeStockMapper.cs | 2 + .../Services/TakeStockService.cs | 48 +++++++---- .../TakeStockRepositories.cs | 80 +++++++++++++++++++ 6 files changed, 144 insertions(+), 17 deletions(-) diff --git a/src/WMS.Web.Domain/Entitys/TakeStock.cs b/src/WMS.Web.Domain/Entitys/TakeStock.cs index eae815ab..e0808357 100644 --- a/src/WMS.Web.Domain/Entitys/TakeStock.cs +++ b/src/WMS.Web.Domain/Entitys/TakeStock.cs @@ -96,6 +96,24 @@ namespace WMS.Web.Domain.Entitys this.Date = DateTime.Now; } /// + /// 同步金蝶结果 + /// + /// + /// + public void Sync(bool isSuccess,string remark) + { + if (isSuccess) + { + this.SuccessSync = true; + this.Remark = ""; + } + else + { + this.SuccessSync = false; + this.Remark = remark; + } + } + /// /// 生成单据号 /// public void GenerateNo() diff --git a/src/WMS.Web.Domain/IService/ITakeStockService.cs b/src/WMS.Web.Domain/IService/ITakeStockService.cs index 762d2a8b..07ac3db1 100644 --- a/src/WMS.Web.Domain/IService/ITakeStockService.cs +++ b/src/WMS.Web.Domain/IService/ITakeStockService.cs @@ -23,6 +23,6 @@ namespace WMS.Web.Domain.IService //盘盈 Task Profit(TakeStock entity); //盘亏 - Task Loss(TakeStock entity); + Task Loss_Profit(TakeStock entity); } } diff --git a/src/WMS.Web.Domain/Infrastructure/ITakeStockRepositories.cs b/src/WMS.Web.Domain/Infrastructure/ITakeStockRepositories.cs index c6d25f56..8b3f3a71 100644 --- a/src/WMS.Web.Domain/Infrastructure/ITakeStockRepositories.cs +++ b/src/WMS.Web.Domain/Infrastructure/ITakeStockRepositories.cs @@ -11,7 +11,18 @@ namespace WMS.Web.Domain.Infrastructure { // 新增 Task Add(TakeStock entity, bool isTransaction = true); + /// + /// 批量添加 + /// + /// + /// + /// + Task AddRange(List entitys, bool isTransaction = true); + //编辑 + Task Edit(TakeStock entity, bool isTransaction = true); // 获取列表 Task<(List list, int total)> GetListAsync(TakeStockQueryRequest dto); + /// 查询实体集合 + Task> GetEntityList(List ids); } } diff --git a/src/WMS.Web.Domain/Mappers/TakeStockMapper.cs b/src/WMS.Web.Domain/Mappers/TakeStockMapper.cs index 7019b7b0..f8b928e6 100644 --- a/src/WMS.Web.Domain/Mappers/TakeStockMapper.cs +++ b/src/WMS.Web.Domain/Mappers/TakeStockMapper.cs @@ -14,6 +14,8 @@ namespace WMS.Web.Domain.Mappers { CreateMap() .ForMember(x => x.ResultType, ops => ops.MapFrom(x => (x.AfterQty - x.BeforeQty) >0? TakeStockType.Profit: TakeStockType.Loss)); + CreateMap() + .ForMember(x => x.ResultType, ops => ops.MapFrom(x => (x.AfterQty - x.BeforeQty) > 0 ? TakeStockType.Profit : TakeStockType.Loss)); } } } diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs index 5f95edd9..361b5b2f 100644 --- a/src/WMS.Web.Domain/Services/TakeStockService.cs +++ b/src/WMS.Web.Domain/Services/TakeStockService.cs @@ -53,9 +53,9 @@ namespace WMS.Web.Domain.Services /// public async Task Save(List dto, LoginInDto loginInfo) { - TakeStock entity = new TakeStock(); - //entity.Details = _mapper.Map>(dto); - entity.Create(loginInfo.UserInfo.StaffId); + List list = _mapper.Map>(dto); + foreach (var entity in list) + entity.Create(loginInfo.UserInfo.StaffId); //需要填写序列号 //需要修改库存 @@ -63,14 +63,18 @@ namespace WMS.Web.Domain.Services IDbContextTransaction _transaction = _transactionRepositories.GetTransaction(); bool isRollback = false; bool isSuccess = true; - entity = await _takeStockRepositories.Add(entity, false); - if (entity == null) isRollback = true; + isSuccess = await _takeStockRepositories.AddRange(list, false); + if (!isSuccess) isRollback = true; //提交事务 isSuccess = _transactionRepositories.CommitTransaction(isRollback, _transaction); if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError); + //同步金蝶 + foreach (var entity in list) + await Loss_Profit(entity); + return Result.ReSuccess(); } @@ -79,12 +83,17 @@ namespace WMS.Web.Domain.Services /// /// /// - public Task Sync(OperateRequest dto) + public async Task Sync(OperateRequest dto) { - return Task.FromResult(Result.ReSuccess()); + var list = await _takeStockRepositories.GetEntityList(dto.Ids); + list = list.Where(w => w.SuccessSync == false).ToList(); + foreach (var entity in list) + await Loss_Profit(entity); + + return Result.ReSuccess(); } /// - /// 盘盈 + /// 作废 /// /// /// @@ -113,7 +122,7 @@ namespace WMS.Web.Domain.Services AfterQty = entity.AfterQty, FinalQty = entity.FinalQty, Fnote = "" - }) ; + }); ErpTakeStockSaveDto dto = new ErpTakeStockSaveDto() { BillNo = entity.BillNo, @@ -124,14 +133,17 @@ namespace WMS.Web.Domain.Services }; #endregion - return await _erpService.Sync(dto, FormIdParam.STK_StockCountGain.ToString()); + var resSync = await _erpService.Sync(dto, FormIdParam.STK_StockCountGain.ToString()); + entity.Sync(resSync.IsSuccess, resSync.Message); + await _takeStockRepositories.Edit(entity, true); + return res; } /// - /// 盘亏 + /// 盘盈盘亏同步金蝶 /// /// /// - public async Task Loss(TakeStock entity) + public async Task Loss_Profit(TakeStock entity) { //获取金蝶仓库仓位编码 var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockId); @@ -156,18 +168,22 @@ namespace WMS.Web.Domain.Services AfterQty = entity.AfterQty, FinalQty = entity.FinalQty, Fnote = "" - }) ; + }); ErpTakeStockSaveDto dto = new ErpTakeStockSaveDto() { BillNo = entity.BillNo, StockOrgId = stock.OrgId.ToString(), - Type = "PK01_SYS", + Type = entity.ResultType == TakeStockType.Loss ? "PK01_SYS" : "PY01_SYS", Date = entity.Date, Details = detils }; #endregion - - return await _erpService.Sync(dto, FormIdParam.STK_StockCountLoss.ToString()); + //判断盘盈盘亏 + string formId = entity.ResultType == TakeStockType.Loss ? FormIdParam.STK_StockCountLoss.ToString() : FormIdParam.STK_StockCountGain.ToString(); + var resSync = await _erpService.Sync(dto, formId); + entity.Sync(resSync.IsSuccess, resSync.Message); + await _takeStockRepositories.Edit(entity, true); + return res; } } } diff --git a/src/WMS.Web.Repositories/TakeStockRepositories.cs b/src/WMS.Web.Repositories/TakeStockRepositories.cs index e33d82af..913d4c9c 100644 --- a/src/WMS.Web.Repositories/TakeStockRepositories.cs +++ b/src/WMS.Web.Repositories/TakeStockRepositories.cs @@ -70,6 +70,86 @@ namespace WMS.Web.Repositories } } + /// + /// 批量添加 + /// + /// + /// + /// + 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.TakeStock.AddRangeAsync(entitys); + await _context.SaveChangesAsync(); + foreach (var item in entitys) + { + if (string.IsNullOrEmpty(item.BillNo)) + //自动生成单据编号 + item.GenerateNo(); + } + await _context.SaveChangesAsync(); + } + if (_transaction != null) + _transaction.Commit(); + return true; + } + catch + { + if (_transaction != null) + _transaction.Rollback(); + return false; + } + } + + /// + /// 编辑 + /// + /// + /// + /// + public async Task Edit(TakeStock entity, bool isTransaction = true) + { + IDbContextTransaction _transaction = null; + if (isTransaction) + _transaction = _context.Database.BeginTransaction(); + + try + { + var res = await _context.TakeStock + .FirstOrDefaultAsync(f => f.Id == entity.Id); + if (res == null) return null; + + _mapper.Map(entity, res); + await _context.SaveChangesAsync(); + + if (_transaction != null) + _transaction.Commit(); + + return res; + } + catch (Exception) + { + if (_transaction != null) + _transaction.Rollback(); + return null; + } + } + + public async Task> GetEntityList(List ids) + { + var res = await _context.TakeStock + .Where(f => ids.Contains(f.Id)) + .ToListAsync(); + + return res.Clone(); + } + /// /// 盘点单列表 /// From 5f7ecb2fff0c62a9f34fc4204c5fb23c8bd27e63 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Tue, 7 Nov 2023 10:59:07 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=AE=B1=E6=80=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Repositories/BoxRepositories.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/WMS.Web.Repositories/BoxRepositories.cs b/src/WMS.Web.Repositories/BoxRepositories.cs index f37e4f65..690f3261 100644 --- a/src/WMS.Web.Repositories/BoxRepositories.cs +++ b/src/WMS.Web.Repositories/BoxRepositories.cs @@ -54,8 +54,13 @@ namespace WMS.Web.Repositories { var list = await _context.Box.Include(x => x.Details).Where(f => BoxBillNos.Contains(f.BoxBillNo)).ToListAsync(); var resList = _mapper.Map>(list); + //获取物料信息 显示物料三件套 var mIds = list.SelectMany(s => s.Details).Select(s => s.MaterialId).ToList(); + foreach (var r in resList) + { + r.TotalQty = r.Details.Sum(s => s.Qty); + } return resList; }