diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 46b4538d..6394ed71 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -2690,9 +2690,9 @@ 物料编码 - + - 仓库ID + 仓库编码 @@ -2825,9 +2825,9 @@ 物料编码 - + - 仓库ID + 仓库编码 @@ -3155,7 +3155,7 @@ 盘点结果类型:1为盘盈,2位盘亏 - + 仓库ID diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index a975a6ec..a828d6c6 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -661,14 +661,14 @@ 箱号ID - + - 原仓位ID + 原仓位编码 - + - 目标仓位ID + 目标仓位编码 @@ -793,14 +793,14 @@ 物料Id - + - 仓库ID + 仓库 - + - 仓位ID + 仓位 @@ -919,12 +919,12 @@ 物料Id - + 仓库ID - + 仓位ID @@ -1044,17 +1044,17 @@ 物料ID - + - 仓库ID + 仓库 - + - 仓位ID + 仓位 - + 子仓库(跟金蝶交互字段) diff --git a/src/WMS.Web.Core/Dto/OutStock/OutStockQueryRequest.cs b/src/WMS.Web.Core/Dto/OutStock/OutStockQueryRequest.cs index b5a55f4d..f0d905ba 100644 --- a/src/WMS.Web.Core/Dto/OutStock/OutStockQueryRequest.cs +++ b/src/WMS.Web.Core/Dto/OutStock/OutStockQueryRequest.cs @@ -46,8 +46,8 @@ namespace WMS.Web.Core.Dto.OutStock /// public string MaterialNumber { get; set; } /// - /// 仓库ID + /// 仓库编码 /// - public int? StockId { get; set; } + public string StockCode { get; set; } } } diff --git a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryRequest.cs b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryRequest.cs index 2d1063d2..8a60f5e3 100644 --- a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryRequest.cs +++ b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryRequest.cs @@ -46,8 +46,8 @@ namespace WMS.Web.Core.Dto.OutStockTask /// public string MaterialNumber { get; set; } /// - /// 仓库ID + /// 仓库编码 /// - public int? StockId { get; set; } + public string StockCode { get; set; } } } diff --git a/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryRequest.cs b/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryRequest.cs index b15b3919..5626eea9 100644 --- a/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryRequest.cs +++ b/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryRequest.cs @@ -16,7 +16,7 @@ namespace WMS.Web.Core.Dto.TakeStock /// /// 仓库ID /// - public int? StockId { get; set; } + public string StockCode { get; set; } /// /// 单据编号 /// diff --git a/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs b/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs index 8599c3b4..2a8eac4d 100644 --- a/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs +++ b/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs @@ -26,15 +26,15 @@ namespace WMS.Web.Domain.Entitys [Column("BoxId")] public int BoxId { get; set; } /// - /// 原仓位ID + /// 原仓位编码 /// - [Column("SrcSubStockId")] - public int SrcSubStockId { get; set; } + [Column("SrcSubStockCode")] + public string SrcSubStockCode { get; set; } /// - /// 目标仓位ID + /// 目标仓位编码 /// - [Column("DestSubStockId")] - public int DestSubStockId { get; set; } + [Column("DestSubStockCode")] + public string DestSubStockCode { get; set; } /// /// 数量 /// diff --git a/src/WMS.Web.Domain/Entitys/OutStockDetails.cs b/src/WMS.Web.Domain/Entitys/OutStockDetails.cs index 5c973682..769756e6 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockDetails.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockDetails.cs @@ -38,15 +38,15 @@ namespace WMS.Web.Domain.Entitys [Column("MaterialId")] public int MaterialId { get; set; } /// - /// 仓库ID + /// 仓库 /// - [Column("StockId")] - public int StockId { get; set; } + [Column("StockCode")] + public string StockCode { get; set; } /// - /// 仓位ID + /// 仓位 /// - [Column("SubStockId")] - public int? SubStockId { get; set; } + [Column("SubStockCode")] + public string SubStockCode { get; set; } /// /// 出库数量 /// diff --git a/src/WMS.Web.Domain/Entitys/OutStockTask.cs b/src/WMS.Web.Domain/Entitys/OutStockTask.cs index a038a43f..ea49eff6 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockTask.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockTask.cs @@ -155,7 +155,7 @@ namespace WMS.Web.Domain.Entitys var details = list.SelectMany(s => s.Details).ToList(); - if (details.GroupBy(g => g.StockId).Count() > 1) return Result.ReFailure(ResultCodes.MergeStatusError); + if (details.GroupBy(g => g.StockCode).Count() > 1) return Result.ReFailure(ResultCodes.MergeStatusError); //清空数据绑定 foreach (var d in details) diff --git a/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs b/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs index 8e1e95d9..9f74bdf5 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs @@ -39,13 +39,13 @@ namespace WMS.Web.Domain.Entitys /// /// 仓库ID /// - [Column("StockId")] - public int StockId { get; set; } + [Column("StockCode")] + public string StockCode { get; set; } /// /// 仓位ID /// - [Column("SubStockId")] - public int? SubStockId { get; set; } + [Column("SubStockCode")] + public string SubStockCode { get; set; } /// /// 应出库数量 /// diff --git a/src/WMS.Web.Domain/Entitys/TakeStock.cs b/src/WMS.Web.Domain/Entitys/TakeStock.cs index 82a349ae..8c8101e2 100644 --- a/src/WMS.Web.Domain/Entitys/TakeStock.cs +++ b/src/WMS.Web.Domain/Entitys/TakeStock.cs @@ -51,20 +51,20 @@ namespace WMS.Web.Domain.Entitys [Column("MaterialId")] public int MaterialId { get; set; } /// - /// 仓库ID + /// 仓库 /// - [Column("StockId")] - public int StockId { get; set; } + [Column("StockCode")] + public string StockCode { get; set; } /// - /// 仓位ID + /// 仓位 /// - [Column("SubStockId")] - public int SubStockId { get; set; } + [Column("SubStockCode")] + public string SubStockCode { get; set; } /// /// 子仓库(跟金蝶交互字段) /// - [Column("Erp_SubStockId")] - public int Erp_SubStockId { get; set; } = 0; + [Column("Erp_SubStockCode")] + public string Erp_SubStockCode { get; set; } /// /// 盘点前数量(wms系统数量) /// diff --git a/src/WMS.Web.Domain/Services/Public/OpsService.cs b/src/WMS.Web.Domain/Services/Public/OpsService.cs index fdf3e204..24b3a8d0 100644 --- a/src/WMS.Web.Domain/Services/Public/OpsService.cs +++ b/src/WMS.Web.Domain/Services/Public/OpsService.cs @@ -34,6 +34,7 @@ namespace WMS.Web.Domain.Services.Public public async Task> GetBox(OpsBoxRequest request) { + List listss = new List(); OpsBoxResponse respnose = new OpsBoxResponse(); List details = new List(); List ss = new List(); @@ -55,7 +56,34 @@ namespace WMS.Web.Domain.Services.Public SerialNumbers = ss }); respnose.Details = details; - var str = JsonConvert.SerializeObject(respnose); + listss.Add(respnose); + + OpsBoxResponse respnose2 = new OpsBoxResponse(); + List details2 = new List(); + List ss2 = new List(); + ss2.Add(new SerialNumbersResponse() + { + SerialNumber = "sss", + BarCereateUser = "sdf", + BarCreateTime = "20-20-20" + }); + ss2.Add(new SerialNumbersResponse() + { + SerialNumber = "sss2", + BarCereateUser = "sdf2", + BarCreateTime = "20-20-20" + }); + details2.Add(new OpsBoxDetailsResponse() + { + MaterialId = 1, + Qty = 1, + SerialNumbers = ss + }); + respnose2.Details = details2; + + listss.Add(respnose2); + + var str = JsonConvert.SerializeObject(listss); var token = await GetToken(); Dictionary dicHeaders = new Dictionary(); diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs index 361b5b2f..aecb1721 100644 --- a/src/WMS.Web.Domain/Services/TakeStockService.cs +++ b/src/WMS.Web.Domain/Services/TakeStockService.cs @@ -100,12 +100,12 @@ namespace WMS.Web.Domain.Services public async Task Profit(TakeStock entity) { //获取金蝶仓库仓位编码 - var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockId); - var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId); + //var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockCode); + //var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockCode); var res = await _erpService.BillQueryForStock(); - var stock = res.Data.FirstOrDefault(f => f.Code == stockCode);//需要根据单点code搜索 - var subStock = res.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索 + var stock = res.Data.FirstOrDefault(f => f.Code == entity.StockCode);//需要根据单点code搜索 + var subStock = res.Data.FirstOrDefault(f => f.Code == entity.SubStockCode);//需要根据单点code搜索 if (stock == null || subStock == null) return Result.ReFailure(ResultCodes.ErpStockNoData); //组装dto #region 组装dto @@ -146,12 +146,12 @@ namespace WMS.Web.Domain.Services public async Task Loss_Profit(TakeStock entity) { //获取金蝶仓库仓位编码 - var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockId); - var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId); + //var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockId); + //var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId); var res = await _erpService.BillQueryForStock(); - var stock = res.Data.FirstOrDefault(f => f.Code == stockCode);//需要根据单点code搜索 - var subStock = res.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索 + var stock = res.Data.FirstOrDefault(f => f.Code == entity.StockCode);//需要根据单点code搜索 + var subStock = res.Data.FirstOrDefault(f => f.Code == entity.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 f8b2d37a..b59dc0f8 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.SrcSubStockId), - DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.DestSubStockId), + SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.SrcSubStockCode), + DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.DestSubStockCode), 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/OutStockRepositories.cs b/src/WMS.Web.Repositories/OutStockRepositories.cs index 9cb83af9..132463ab 100644 --- a/src/WMS.Web.Repositories/OutStockRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockRepositories.cs @@ -142,8 +142,8 @@ namespace WMS.Web.Repositories query = query.Where(w => w.order.SuccessSync == dto.SuccessSync); if (dto.DeliveryOrgId != null) query = query.Where(w => w.order.DeliveryOrgId == dto.DeliveryOrgId); - if (dto.StockId != null) - query = query.Where(w => w.detail.StockId == dto.StockId); + if (!string.IsNullOrEmpty(dto.StockCode)) + query = query.Where(w => w.detail.StockCode == dto.StockCode); if (dto.CreateBeginDate != null) query = query.Where(w => w.order.CreateTime >= dto.CreateBeginDate); if (dto.CreateEndDate != null) @@ -159,7 +159,7 @@ namespace WMS.Web.Repositories Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId), CreateTime = s.order.CreateTime.DateToStringSeconds(), SuccessSync = s.order.SuccessSync, - Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId), + Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockCode), SourceBillNo = s.order.SourceBillNo, SaleBillNo = s.detail.SaleBillNo, DeliveryOrg = _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId), diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs index a9439152..aa0debe0 100644 --- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs @@ -268,8 +268,8 @@ namespace WMS.Web.Repositories query = query.Where(w => w.order.Status == (OutStockStatus)dto.Status); if (dto.DeliveryOrgId != null) query = query.Where(w => w.order.DeliveryOrgId == dto.DeliveryOrgId); - if (dto.StockId != null) - query = query.Where(w => w.detail.StockId == dto.StockId); + if (!string.IsNullOrEmpty(dto.StockCode)) + query = query.Where(w => w.detail.StockCode == dto.StockCode); if (dto.CreateBeginDate != null) query = query.Where(w => w.order.OperateTime >= dto.CreateBeginDate); if (dto.CreateEndDate != null) @@ -287,7 +287,7 @@ namespace WMS.Web.Repositories 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), + Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockCode), SourceBillNo = s.order.SourceBillNo, SaleBillNo = s.detail.SaleBillNo, DeliveryOrg = _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId), diff --git a/src/WMS.Web.Repositories/TakeStockRepositories.cs b/src/WMS.Web.Repositories/TakeStockRepositories.cs index c184edf3..5e6c6526 100644 --- a/src/WMS.Web.Repositories/TakeStockRepositories.cs +++ b/src/WMS.Web.Repositories/TakeStockRepositories.cs @@ -177,8 +177,8 @@ namespace WMS.Web.Repositories query = query.Where(w => w.ResultType == (TakeStockType)dto.ResultType); if (!string.IsNullOrEmpty(dto.BillNo)) query = query.Where(w => EF.Functions.Like(w.BillNo, "%" + dto.BillNo + "%")); - if (dto.StockId != null) - query = query.Where(w => w.StockId == dto.StockId); + if (!string.IsNullOrEmpty(dto.StockCode)) + query = query.Where(w => w.StockCode == dto.StockCode); if (dto.DateBeginDate != null) query = query.Where(w => w.Date >= dto.DateBeginDate); if (dto.DateEndDate != null) @@ -191,8 +191,8 @@ namespace WMS.Web.Repositories Id = s.Id, BillNo = s.BillNo, Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.MaterialId), - Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.StockId), - SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.SubStockId), + Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.StockCode), + SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.SubStockCode), BeforeQty = s.BeforeQty, AfterQty = s.AfterQty, FinalQty = s.FinalQty,