From ac7ff7ad88468c119324a87838b653bba64ec286 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Thu, 14 Mar 2024 14:06:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=BB=93=E4=BD=8D?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 27 ++++++++++++++++++- src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs | 10 +++++++ src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs | 14 +++++++++- .../Entitys/TakeStockDetails.cs | 5 ++++ .../Services/ChangeMoveBoxService.cs | 7 ++++- .../Services/TakeStockService.cs | 2 ++ 6 files changed, 62 insertions(+), 3 deletions(-) diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index b6169e7f..b598206c 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -481,6 +481,11 @@ 原箱仓位 + + + 原箱仓位 + + 目标箱的仓库或重新上架选择仓位对应的仓库 @@ -491,6 +496,11 @@ 目标箱仓位或重新上架选择仓位 + + + 目标箱仓位或重新上架选择仓位 + + 目标箱组织编码 @@ -1386,6 +1396,16 @@ 目标仓位Id + + + 原仓位编码 + + + + + 目标仓位编码 + + 数量 @@ -1411,7 +1431,7 @@ 明细信息 - + 创建 @@ -2151,6 +2171,11 @@ 仓位 + + + 仓位 + + 子仓库(跟金蝶交互字段) diff --git a/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs b/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs index 6d8d25c8..8772e75a 100644 --- a/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs +++ b/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs @@ -55,6 +55,11 @@ namespace WMS.Web.Domain.Entitys [Column("SrcSubStockId")] public int SrcSubStockId { get; set; } /// + /// 原箱仓位 + /// + [Column("SrcSubStockCode")] + public string SrcSubStockCode { get; set; } + /// /// 目标箱的仓库或重新上架选择仓位对应的仓库 /// [Column("DestStockCode")] @@ -65,6 +70,11 @@ namespace WMS.Web.Domain.Entitys [Column("DestSubStockId")] public int DestSubStockId { get; set; } /// + /// 目标箱仓位或重新上架选择仓位 + /// + [Column("DestSubStockCode")] + public string DestSubStockCode { get; set; } + /// /// 目标箱组织编码 /// [Column("DestBoxOrgCode")] diff --git a/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs b/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs index 92818932..16fe9942 100644 --- a/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs +++ b/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs @@ -51,6 +51,16 @@ namespace WMS.Web.Domain.Entitys [Column("DestSubStockId")] public int DestSubStockId { get; set; } /// + /// 原仓位编码 + /// + [Column("SrcSubStockCode")] + public string SrcSubStockCode { get; set; } + /// + /// 目标仓位编码 + /// + [Column("DestSubStockCode")] + public string DestSubStockCode { get; set; } + /// /// 数量 /// [Column("Qty")] @@ -79,7 +89,7 @@ namespace WMS.Web.Domain.Entitys /// 创建 /// /// - public void Create(MoveBoxType type, int boxId,decimal qty, string orgCode, string stockCode, int subStockId, int creatorId) + public void Create(MoveBoxType type, int boxId,decimal qty, string orgCode, string stockCode, int subStockId, int creatorId,string subStockCode) { this.BoxId = boxId; this.Type = type; @@ -87,6 +97,8 @@ namespace WMS.Web.Domain.Entitys this.StockCode = stockCode; SrcSubStockId = type == MoveBoxType.Up ? 0 : subStockId;//上架 原仓位是0 目标仓位有值 DestSubStockId = type == MoveBoxType.Up ? subStockId : 0; //下架 原仓位有值 目标仓位是0 + SrcSubStockCode = type == MoveBoxType.Up ? "" : subStockCode;//上架 原仓位是0 目标仓位有值 + DestSubStockCode = type == MoveBoxType.Up ? subStockCode : ""; //下架 原仓位有值 目标仓位是0 this.Qty = qty; this.CreatorId = creatorId; this.CreateTime = DateTime.Now; diff --git a/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs b/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs index a96f9df5..e1189316 100644 --- a/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs +++ b/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs @@ -51,6 +51,11 @@ namespace WMS.Web.Domain.Entitys [Column("SubStockId")] public int SubStockId { get; set; } /// + /// 仓位 + /// + [Column("SubStockCode")] + public string SubStockCode { get; set; } + /// /// 子仓库(跟金蝶交互字段) /// [Column("Erp_SubStockCode")] diff --git a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs index b6fd8905..2654efc1 100644 --- a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs +++ b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs @@ -157,20 +157,25 @@ namespace WMS.Web.Domain.Services List list = new List(); var subIds = dto.Select(s => s.SubStockId).ToList(); var subStocks = await _basbicsRepositories.GetSubUcStockAsync(subIds, loginInfo.UserInfo.CompanyId); + + var subStocks_s = await _basbicsRepositories.GetSubUcStockAsync(boxs.Select(s=>s.SubStockId).ToList(), loginInfo.UserInfo.CompanyId); foreach (var dt in dto) { var subStock = subStocks.FirstOrDefault(f => f.Id == dt.SubStockId); var boxi = boxs.FirstOrDefault(f => f.BoxId == dt.SrcBoxId); + var subStock_s = subStocks_s.FirstOrDefault(f => f.Id == (boxi?.SubStockId ?? 0)); foreach (var d in dt.Details) { ChangeBoxRecord entity = new ChangeBoxRecord(); entity.Create(loginInfo.UserInfo.StaffId, d.Qty, d.MaterialId, d.SerialNumbers, dt.SrcBoxId, dt.DestBoxId); entity.SrcSubStockId = boxi?.SubStockId ?? 0;//原乡仓位需要去拉一下库存获取 + entity.SrcSubStockCode = subStock_s?.Code ?? ""; if (subStock != null) { entity.DestSubStockId = dt.SubStockId; entity.DestBoxOrgCode = subStock.ErpOrgCode; entity.DestStockCode = subStock.StockCode; + entity.DestSubStockCode = subStock.Code; } list.Add(entity); } @@ -272,7 +277,7 @@ namespace WMS.Web.Domain.Services { var subStock = await _basbicsRepositories.GetSubUcStockAsync(d.SubStockId, loginInfo.UserInfo.CompanyId); var entity = new MoveBoxRecord(); - entity.Create(IsUp == true ? MoveBoxType.Up : MoveBoxType.Down, d.BoxId, d.Qty, subStock?.ErpOrgCode, subStock?.StockCode, d.SubStockId, loginInfo.UserInfo.StaffId); + entity.Create(IsUp == true ? MoveBoxType.Up : MoveBoxType.Down, d.BoxId, d.Qty, subStock?.ErpOrgCode, subStock?.StockCode, d.SubStockId, loginInfo.UserInfo.StaffId, subStock?.Code); entity.Details = d.Details.Select(s => new MoveBoxRecordDetails() { MaterialId = s.MaterialId, diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs index d751ce62..3f30e676 100644 --- a/src/WMS.Web.Domain/Services/TakeStockService.cs +++ b/src/WMS.Web.Domain/Services/TakeStockService.cs @@ -96,6 +96,7 @@ namespace WMS.Web.Domain.Services var subStock = subStocks.FirstOrDefault(f => f.Id == d.SubStockId); d.OrgCode = subStock?.ErpOrgCode; d.StockCode = subStock?.StockCode; + d.SubStockCode = subStock?.Code; if ((d.StockCode.Equals("HD") || d.StockCode.Equals("GD")) && string.IsNullOrEmpty(d.Erp_SubStockCode)) return Result.ReFailure(ResultCodes.TakeStockErpSubStockError); } @@ -116,6 +117,7 @@ namespace WMS.Web.Domain.Services var subStock = subStocks.FirstOrDefault(f => f.Id == d.SubStockId); d.OrgCode = subStock?.ErpOrgCode; d.StockCode = subStock?.StockCode; + d.SubStockCode = subStock?.Code; if ((d.StockCode.Equals("HD") || d.StockCode.Equals("GD")) && string.IsNullOrEmpty(d.Erp_SubStockCode)) return Result.ReFailure(ResultCodes.TakeStockErpSubStockError); }