From 9daa9ab775d3c9efddf6d89cfbf8589adf5e6ebe Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Fri, 17 Nov 2023 17:24:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 10 ++++++++++
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 1 +
.../Dto/Inventory/BoxInventoryDetailsResponse.cs | 10 ++++++++++
.../IService/Public/ISingleDataService.cs | 1 +
src/WMS.Web.Domain/Mappers/InventoryMapper.cs | 6 +++---
.../Services/Public/SingleDataService.cs | 2 ++
src/WMS.Web.Repositories/BoxInventoryRepositories.cs | 2 ++
7 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index 729db243..27d01216 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -2155,11 +2155,21 @@
仓库编码
+
+
+ 仓库名称
+
+
仓位ID
+
+
+ 仓位名称
+
+
明细
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 78d7b973..1862daa5 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -2711,6 +2711,7 @@
+ 加上ID防止编码重复
diff --git a/src/WMS.Web.Core/Dto/Inventory/BoxInventoryDetailsResponse.cs b/src/WMS.Web.Core/Dto/Inventory/BoxInventoryDetailsResponse.cs
index e3b0144e..84480814 100644
--- a/src/WMS.Web.Core/Dto/Inventory/BoxInventoryDetailsResponse.cs
+++ b/src/WMS.Web.Core/Dto/Inventory/BoxInventoryDetailsResponse.cs
@@ -19,11 +19,21 @@ namespace WMS.Web.Core.Dto.Inventory
///
public string StockCode { get; set; }
+ ///
+ /// 仓库名称
+ ///
+ public string Stock { get; set; }
+
///
/// 仓位ID
///
public int SubStockId { get; set; }
+ ///
+ /// 仓位名称
+ ///
+ public string SubStock { get; set; }
+
///
/// 明细
///
diff --git a/src/WMS.Web.Domain/IService/Public/ISingleDataService.cs b/src/WMS.Web.Domain/IService/Public/ISingleDataService.cs
index 5cbaeec4..0fbda0ad 100644
--- a/src/WMS.Web.Domain/IService/Public/ISingleDataService.cs
+++ b/src/WMS.Web.Domain/IService/Public/ISingleDataService.cs
@@ -43,6 +43,7 @@ namespace WMS.Web.Domain.IService.Public
///
///
///
+ /// 加上ID防止编码重复
///
string GetSingleData(SingleAction action, int companyId, string code);
///
diff --git a/src/WMS.Web.Domain/Mappers/InventoryMapper.cs b/src/WMS.Web.Domain/Mappers/InventoryMapper.cs
index e685c61e..503ce590 100644
--- a/src/WMS.Web.Domain/Mappers/InventoryMapper.cs
+++ b/src/WMS.Web.Domain/Mappers/InventoryMapper.cs
@@ -47,12 +47,12 @@ namespace WMS.Web.Domain.Mappers
//箱库存详情-映射
- CreateMap()
+ CreateMap()
.ForMember(x=>x.Details,t=>t.Ignore());
- CreateMap();
-
+ CreateMap();
+
}
}
diff --git a/src/WMS.Web.Domain/Services/Public/SingleDataService.cs b/src/WMS.Web.Domain/Services/Public/SingleDataService.cs
index 6740cfd6..4e63918e 100644
--- a/src/WMS.Web.Domain/Services/Public/SingleDataService.cs
+++ b/src/WMS.Web.Domain/Services/Public/SingleDataService.cs
@@ -237,6 +237,8 @@ namespace WMS.Web.Domain.Services.Public
}
var list = SingleDataPost(action, companyId, cache_key);
+
+ var json = JsonSerializer.Serialize(list);
if (list.Count() <= 0) return "";
dic = list.ToDictionary(s => s.Code, s => s.Name);
diff --git a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs
index 5932c7aa..91430f92 100644
--- a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs
+++ b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs
@@ -115,6 +115,8 @@ namespace WMS.Web.Repositories
.Where(x => 1 == 1 && x.box.BoxBillNo==boxBillNo).Select(x=>x.boxinvent).FirstOrDefaultAsync();
var response = _mapper.Map(entity);
+ response.Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, response.StockCode);
+ response.SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, response.SubStockId);
response.Details = _mapper.Map>(entity.Details);
return response;