From d35b7b116eea1d0f88b0fe6e54808742907ccab5 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Mon, 18 Mar 2024 11:21:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 4 +- src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 318 ++++++++++++------ src/WMS.Web.Core/Dto/MaterialResponse.cs | 8 +- .../Public/IErpBasicDataExtendService.cs | 7 + .../Services/ChangeMoveBoxService.cs | 6 +- .../Services/OutStockService.cs | 2 +- .../Public/ErpBasicDataExtendService.cs | 2 +- .../Services/SerialNumberService.cs | 6 +- .../OutStockTaskRepositories.cs | 2 +- .../SerialNumbersRepositories.cs | 2 +- 10 files changed, 242 insertions(+), 115 deletions(-) diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 8d17923b..af71ff95 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -4198,9 +4198,9 @@ 箱号 - + - 仓位Id(序列号不存在库存的话仓位是0) + 仓位编码(序列号不存在库存的话仓位是"") diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index b598206c..ab83edea 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -49,9 +49,9 @@ 仓库编码 - + - 仓位ID + 仓位编码 @@ -90,9 +90,9 @@ 所属箱号ID - + - 物料ID + 物料编码 @@ -160,27 +160,27 @@ 明细 - + 出入库回退上架 - + - + 出入库回退下架 - + - + 出库 - + @@ -206,9 +206,9 @@ 单据头ID - + - 物料ID + 物料编码 @@ -241,9 +241,9 @@ 仓库编码 - + - 仓库ID + 仓位编码 @@ -266,9 +266,9 @@ 上级ID - + - 物料ID + 物料编码 @@ -316,9 +316,9 @@ 订单编号 - + - 物料ID + 物料编码 @@ -451,9 +451,9 @@ 单据编号 - + - 物料ID + 物料编码 @@ -476,11 +476,6 @@ 目标箱子ID - - - 原箱仓位 - - 原箱仓位 @@ -491,11 +486,6 @@ 目标箱的仓库或重新上架选择仓位对应的仓库 - - - 目标箱仓位或重新上架选择仓位 - - 目标箱仓位或重新上架选择仓位 @@ -516,13 +506,13 @@ 操作时间 - + 创建 - + @@ -737,9 +727,9 @@ 仓库编码 - + - 仓位ID + 仓位编码 @@ -833,9 +823,9 @@ 供应商ID - + - 物料ID + 物料编码 @@ -873,9 +863,9 @@ 来源单号 - + - 物料ID + 物料编码 @@ -1056,9 +1046,9 @@ 对应金蝶的明细ID - + - 物料ID + 物料编码 @@ -1101,9 +1091,9 @@ 组织编码 - + - 物料ID + 物料编码 @@ -1176,6 +1166,11 @@ 物料ID + + + 物料编码 + + 数量 @@ -1201,6 +1196,11 @@ 物料ID + + + 物料编码 + + 组织编码 @@ -1216,6 +1216,11 @@ 仓位ID + + + 仓位编码 + + 库存量 @@ -1236,6 +1241,11 @@ 物料ID + + + 物料编码 + + 类型：1为入库，2为出库 @@ -1256,6 +1266,11 @@ 仓位ID + + + 仓位编码 + + 箱ID @@ -1386,16 +1401,6 @@ 仓库 - - - 原仓位Id - - - - - 目标仓位Id - - 原仓位编码 @@ -1431,7 +1436,7 @@ 明细信息 - + 创建 @@ -1457,10 +1462,10 @@ 单据头Id - - - 物料Id - + + + 物料编码 + @@ -1610,10 +1615,10 @@ 序列号 - - - 仓位 - + + + 仓位 + @@ -1635,10 +1640,10 @@ 单据头Id - - - 物料Id - + + + 物料编码 + @@ -1780,11 +1785,11 @@ 明细 - + 出库 反写 任务单(返回 这个物料下面的来源单号出了多少数量) - + @@ -1826,10 +1831,10 @@ 单据头Id - - - 物料Id - + + + 物料编码 + @@ -1921,9 +1926,9 @@ 序列号操作类型 - + - 物料ID + 物料编码 @@ -1956,12 +1961,12 @@ 备注 - + 装箱(记录) - - + + @@ -1979,9 +1984,9 @@ 序列号 - + - 物料ID + 物料编码 @@ -2045,7 +2050,7 @@ 解绑 - + 出库 @@ -2151,9 +2156,9 @@ 箱Id - + - 物料ID + 物料编码 @@ -2166,11 +2171,6 @@ 仓库 - - - 仓位 - - 仓位 @@ -2278,6 +2278,22 @@ + + + 获取仓位详情：根据仓位ID和公司ID + + + + + + + + 获取仓位集合：根据仓位编码集合和公司ID + + + + + 获取仓库 @@ -2687,21 +2703,21 @@ - + 列表-根据物料和仓库和仓位 - + - + - + 列表-根据物料和仓库 - + @@ -3169,11 +3185,11 @@ - + 获取即时库存明细汇总 - + @@ -3191,15 +3207,15 @@ - + 生成dto - + - + @@ -3284,6 +3300,21 @@ + + + 获取物料名称 + + + + + + + 获取物料规格型号 + + + + + 获取物料基本单位名称 @@ -3292,6 +3323,14 @@ + + + 获取物料基本单位名称 + + + + + 获取物料的条码 @@ -3300,6 +3339,14 @@ + + + 获取物料的条码 + + + + + 获取物料基本单位id @@ -3316,6 +3363,14 @@ + + + 获取物料基本单位编码 + + + + + 获取组织名称 @@ -3503,6 +3558,13 @@ + + + erp:基础数据-物料信息 + + + + @@ -4600,11 +4662,11 @@ - + 获取即时库存明细汇总 - + @@ -4622,15 +4684,15 @@ - + 生成dto - + - + @@ -4793,6 +4855,22 @@ + + + 获取物料名称 + + + + + + + + 获取物料编码 + + + + + 获取物料基本单位名称 @@ -4801,6 +4879,14 @@ + + + 获取物料基本单位名称 + + + + + 获取物料的条码 @@ -4809,6 +4895,14 @@ + + + 获取物料的条码 + + + + + 获取物料基本单位Id @@ -4825,6 +4919,14 @@ + + + 获取物料基本单位编码 + + + + + 获取组织名称 @@ -4970,6 +5072,13 @@ + + + erp:基础数据-物料信息 + + + + erp:基础数据-物料-分页查询 @@ -4983,6 +5092,13 @@ + + + erp:基础数据-物料-number查询 + + + + erp:单据查询-组织数据 diff --git a/src/WMS.Web.Core/Dto/MaterialResponse.cs b/src/WMS.Web.Core/Dto/MaterialResponse.cs index d4697d76..e60a7640 100644 --- a/src/WMS.Web.Core/Dto/MaterialResponse.cs +++ b/src/WMS.Web.Core/Dto/MaterialResponse.cs @@ -17,10 +17,14 @@ namespace WMS.Web.Core.Dto /// 箱号 /// public string BoxBillNo { get; set; } + ///// + ///// 仓位Id(序列号不存在库存的话仓位是0) + ///// + //public int SubStockId { get; set; } = 0; /// - /// 仓位Id(序列号不存在库存的话仓位是0) + /// 仓位编码(序列号不存在库存的话仓位是"") /// - public int SubStockId { get; set; } = 0; + public string SubStockCode { get; set; } = ""; /// /// 是否存在于箱库存中 /// diff --git a/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs b/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs index 6aac2851..5a5267b5 100644 --- a/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs +++ b/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs @@ -58,6 +58,13 @@ namespace WMS.Web.Domain.IService.Public /// /// string GetMaterialUnitName(List erpMaterials, int materialId); + /// + /// 获取物料基本单位名称 + /// + /// + /// + /// + string GetMaterialUnitName(List erpMaterials, string materialnumber); /// /// 获取物料的条码 diff --git a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs index ed8c79f5..93d836ad 100644 --- a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs +++ b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs @@ -114,7 +114,7 @@ namespace WMS.Web.Domain.Services { foreach (var bd in box.Details) { - var bDe = box.Details.FirstOrDefault(f => f.MaterialId == bd.MaterialId); + var bDe = box.Details.FirstOrDefault(f => f.MaterialNumber == bd.MaterialNumber); if (bDe == null) return Result.ReFailure(ResultCodes.BoxMateriaNoData); var ex = bd.SerialNumbers.Except(bDe.SerialNumbers).ToList(); @@ -158,12 +158,12 @@ namespace WMS.Web.Domain.Services var subIds = dto.Select(s => s.SubStockCode).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); + var subStocks_s = await _basbicsRepositories.GetSubUcStockAsync(boxs.Select(s => s.SubStockCode).ToList(), loginInfo.UserInfo.CompanyId); foreach (var dt in dto) { var subStock = subStocks.FirstOrDefault(f => f.Code == dt.SubStockCode); var boxi = boxs.FirstOrDefault(f => f.BoxId == dt.SrcBoxId); - var subStock_s = subStocks_s.FirstOrDefault(f => f.Id == (boxi?.SubStockId ?? 0)); + var subStock_s = subStocks_s.FirstOrDefault(f => f.Code == (boxi?.SubStockCode ?? "")); foreach (var d in dt.Details) { ChangeBoxRecord entity = new ChangeBoxRecord(); diff --git a/src/WMS.Web.Domain/Services/OutStockService.cs b/src/WMS.Web.Domain/Services/OutStockService.cs index 1d53cbb5..91e689e4 100644 --- a/src/WMS.Web.Domain/Services/OutStockService.cs +++ b/src/WMS.Web.Domain/Services/OutStockService.cs @@ -133,7 +133,7 @@ namespace WMS.Web.Domain.Services var boxInventoryDetails = boxInventoryList.SelectMany(s => s.Details).ToList(); foreach (var b in boxInventoryDetails) { - var num = boxInventoryDetails.Where(w => w.MaterialId == b.MaterialId).Sum(s => s.Qty); + var num = boxInventoryDetails.Where(w => w.MaterialNumber == b.MaterialNumber).Sum(s => s.Qty); var taskDetail = outStockTask.Details.FirstOrDefault(f => f.MaterialNumber == b.MaterialNumber); if (taskDetail == null) return Result.ReFailure(ResultCodes.BoxOutStockTaskMaterialError); //箱子里该物料的总数量大于出库单(应出库数量-已出库数量) 不能出库 diff --git a/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs b/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs index 125df044..3710980d 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs @@ -181,7 +181,7 @@ namespace WMS.Web.Domain.Services.Public } return mat.BaseUnitName; } - + /// /// 获取物料的条码 /// diff --git a/src/WMS.Web.Domain/Services/SerialNumberService.cs b/src/WMS.Web.Domain/Services/SerialNumberService.cs index 568ec638..3190b46e 100644 --- a/src/WMS.Web.Domain/Services/SerialNumberService.cs +++ b/src/WMS.Web.Domain/Services/SerialNumberService.cs @@ -145,7 +145,7 @@ namespace WMS.Web.Domain.Services }; if (moveBoxRecord.Type == MoveBoxType.Up) { - var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, moveBoxRecord.DestSubStockId); + var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, moveBoxRecord.DestSubStockCode); op.Remark += "\r\n" + "仓位:" + srcSubStock; } sList.Add(op); @@ -322,7 +322,7 @@ namespace WMS.Web.Domain.Services var boxId = inStock.Details.FirstOrDefault(s => s.SerialNumbers.Contains(entity.SerialNumber))?.BoxId ?? 0; var box = boxList.FirstOrDefault(f => f.Id == boxId); var instockDetail = inStock.Details.FirstOrDefault(f => f.MaterialNumber == entity.MaterialNumber); - var subStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, inStock.SubStockId); + var subStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, inStock.SubStockCode); //修改序列号和箱绑定关系 entity.InStock(instockDetail.SourceBillNo, inStock.Type); entity.Bind(boxId, box?.CompleteCartonTime ?? DateTime.Now); @@ -410,7 +410,7 @@ namespace WMS.Web.Domain.Services }; if (backRecord.Type == BackRecordType.OutstockOn) { - var subStockId = backRecord?.SubStockId ?? 0; + var subStockId = backRecord?.SubStockCode ?? ""; var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, subStockId); op.Remark += "\r\n" + "仓位:" + srcSubStock; } diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs index 61607b21..34746439 100644 --- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs @@ -327,7 +327,7 @@ namespace WMS.Web.Repositories MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialNumber), MaterialNumber = s.detail.MaterialNumber, Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialNumber), - Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialId), + Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialNumber), Remark = s.detail.Remark #endregion diff --git a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs index 7a0e4cdd..fff50044 100644 --- a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs +++ b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs @@ -207,7 +207,7 @@ namespace WMS.Web.Repositories if (entity == null || entity.serial == null) return null; response.BoxId = entity.serial.BoxId; response.BoxBillNo = entity?.box?.BoxBillNo ?? ""; - response.SubStockId = entity?.boxInventory?.SubStockId ?? 0; + response.SubStockCode = entity?.boxInventory?.SubStockCode ?? ""; response.SerialNumber = entity.serial.SerialNumber; response.MaterialId = 0; response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber);