From 9137fc41d85ebe242bdc8d8aec03d3834eaa4117 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Thu, 9 Nov 2023 16:59:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E4=BD=8DId?= 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 | 12 ++++++------ .../Dto/TakeStock/SaveTakeStockRequest.cs | 4 ++-- src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs | 8 ++++---- src/WMS.Web.Domain/Entitys/OutStockDetails.cs | 4 ++-- src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs | 4 ++-- src/WMS.Web.Domain/Entitys/TakeStock.cs | 8 ++++---- src/WMS.Web.Domain/Services/TakeStockService.cs | 8 ++++---- .../MoveBoxRecordRepositories.cs | 4 ++-- src/WMS.Web.Repositories/TakeStockRepositories.cs | 4 ++-- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 300f309f..dd273951 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -3085,12 +3085,12 @@ 仓库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 85f5413d..651f46db 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -661,12 +661,12 @@ 箱号ID - + 原仓位编码 - + 目标仓位编码 @@ -819,7 +819,7 @@ 仓库 - + 仓位 @@ -945,7 +945,7 @@ 仓库ID - + 仓位ID @@ -1070,12 +1070,12 @@ 仓库 - + 仓位 - + 子仓库(跟金蝶交互字段) diff --git a/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs b/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs index 53f71c33..1220bd07 100644 --- a/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs +++ b/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs @@ -29,11 +29,11 @@ namespace WMS.Web.Core.Dto.TakeStock /// 仓位ID /// [Required(ErrorMessage = "仓位不能为空")] - public string SubStockCode { get; set; } + public int SubStockId { get; set; } /// /// 子仓库(跟金蝶交互字段) /// - public string Erp_SubStockCode { get; set; } + public int Erp_SubStockId { get; set; } /// /// 盘点前数量（wms系统数量） /// diff --git a/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs b/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs index 2a8eac4d..a5791780 100644 --- a/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs +++ b/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs @@ -28,13 +28,13 @@ namespace WMS.Web.Domain.Entitys /// /// 原仓位编码 /// - [Column("SrcSubStockCode")] - public string SrcSubStockCode { get; set; } + [Column("SrcSubStockId")] + public int SrcSubStockId { get; set; } /// /// 目标仓位编码 /// - [Column("DestSubStockCode")] - public string DestSubStockCode { get; set; } + [Column("DestSubStockId")] + public int DestSubStockId { get; set; } /// /// 数量 /// diff --git a/src/WMS.Web.Domain/Entitys/OutStockDetails.cs b/src/WMS.Web.Domain/Entitys/OutStockDetails.cs index 769756e6..cceb3b52 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockDetails.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockDetails.cs @@ -45,8 +45,8 @@ namespace WMS.Web.Domain.Entitys /// /// 仓位 /// - [Column("SubStockCode")] - public string SubStockCode { get; set; } + [Column("SubStockId")] + public string SubStockId { get; set; } /// /// 出库数量 /// diff --git a/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs b/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs index 9f74bdf5..e7009944 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs @@ -44,8 +44,8 @@ namespace WMS.Web.Domain.Entitys /// /// 仓位ID /// - [Column("SubStockCode")] - public string SubStockCode { get; set; } + [Column("SubStockId")] + public int SubStockId { get; set; } /// /// 应出库数量 /// diff --git a/src/WMS.Web.Domain/Entitys/TakeStock.cs b/src/WMS.Web.Domain/Entitys/TakeStock.cs index 8c8101e2..41fdc352 100644 --- a/src/WMS.Web.Domain/Entitys/TakeStock.cs +++ b/src/WMS.Web.Domain/Entitys/TakeStock.cs @@ -58,13 +58,13 @@ namespace WMS.Web.Domain.Entitys /// /// 仓位 /// - [Column("SubStockCode")] - public string SubStockCode { get; set; } + [Column("SubStockId")] + public int SubStockId { get; set; } /// /// 子仓库(跟金蝶交互字段) /// - [Column("Erp_SubStockCode")] - public string Erp_SubStockCode { get; set; } + [Column("Erp_SubStockId")] + public int Erp_SubStockId { get; set; } /// /// 盘点前数量（wms系统数量） /// diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs index aecb1721..0665b3bc 100644 --- a/src/WMS.Web.Domain/Services/TakeStockService.cs +++ b/src/WMS.Web.Domain/Services/TakeStockService.cs @@ -101,11 +101,11 @@ namespace WMS.Web.Domain.Services { //获取金蝶仓库仓位编码 //var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockCode); - //var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockCode); + var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId); var res = await _erpService.BillQueryForStock(); var stock = res.Data.FirstOrDefault(f => f.Code == entity.StockCode);//需要根据单点code搜索 - var subStock = res.Data.FirstOrDefault(f => f.Code == entity.SubStockCode);//需要根据单点code搜索 + var subStock = res.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索 if (stock == null || subStock == null) return Result.ReFailure(ResultCodes.ErpStockNoData); //组装dto #region 组装dto @@ -147,11 +147,11 @@ namespace WMS.Web.Domain.Services { //获取金蝶仓库仓位编码 //var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockId); - //var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId); + var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId); var res = await _erpService.BillQueryForStock(); var stock = res.Data.FirstOrDefault(f => f.Code == entity.StockCode);//需要根据单点code搜索 - var subStock = res.Data.FirstOrDefault(f => f.Code == entity.SubStockCode);//需要根据单点code搜索 + var subStock = res.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索 if (stock == null || subStock == null) return Result.ReFailure(ResultCodes.ErpStockNoData); //组装dto #region 组装dto diff --git a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs index b59dc0f8..f8b2d37a 100644 --- a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs +++ b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs @@ -107,8 +107,8 @@ namespace WMS.Web.Repositories { #region dto组装 Box = s.box.BoxBillNo, - SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.SrcSubStockCode), - DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.DestSubStockCode), + SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.SrcSubStockId), + DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.DestSubStockId), Qty = s.moveBox.Qty, Type = s.moveBox.Type.GetRemark(), Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.moveBox.CreatorId), diff --git a/src/WMS.Web.Repositories/TakeStockRepositories.cs b/src/WMS.Web.Repositories/TakeStockRepositories.cs index 114b7707..bc29099e 100644 --- a/src/WMS.Web.Repositories/TakeStockRepositories.cs +++ b/src/WMS.Web.Repositories/TakeStockRepositories.cs @@ -197,8 +197,8 @@ namespace WMS.Web.Repositories BillNo = s.BillNo, Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.MaterialId), Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.StockCode), - SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.SubStockCode), - Erp_SubStockCode= _erpBasicDataExtendService.GetStockName(subStocks, s.Erp_SubStockCode), + SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.SubStockId), + Erp_SubStockCode= _erpBasicDataExtendService.GetStockName(subStocks, s.Erp_SubStockId), BeforeQty = s.BeforeQty, AfterQty = s.AfterQty, FinalQty = s.FinalQty,