From 70a1022a438bcbf144dede05cdcd55b7ae9a5c2e Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Tue, 19 Mar 2024 16:29:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 5 +++++
src/WMS.Web.Domain/Services/Public/SingleDataService.cs | 1 +
src/WMS.Web.Domain/Values/Single/SingleAction.cs | 8 +++++++-
src/WMS.Web.Repositories/BackRecordRepositories.cs | 2 +-
src/WMS.Web.Repositories/BoxInventoryRepositories.cs | 4 ++--
src/WMS.Web.Repositories/InventoryDetailsRepositories.cs | 5 ++---
6 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 2e9db90b..66f21286 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -6350,6 +6350,11 @@
仓库：编码与组织编码结合
+
+
+ 仓库：编码与组织编码结合
+
+
单点-控制器枚举
diff --git a/src/WMS.Web.Domain/Services/Public/SingleDataService.cs b/src/WMS.Web.Domain/Services/Public/SingleDataService.cs
index 4e63918e..b66f01f4 100644
--- a/src/WMS.Web.Domain/Services/Public/SingleDataService.cs
+++ b/src/WMS.Web.Domain/Services/Public/SingleDataService.cs
@@ -246,6 +246,7 @@ namespace WMS.Web.Domain.Services.Public
}
if (!dic.ContainsKey(code)) return "";
+ var name = dic[code];
return dic[code];
}
catch (Exception ex)
diff --git a/src/WMS.Web.Domain/Values/Single/SingleAction.cs b/src/WMS.Web.Domain/Values/Single/SingleAction.cs
index a3e7de30..1e5328a2 100644
--- a/src/WMS.Web.Domain/Values/Single/SingleAction.cs
+++ b/src/WMS.Web.Domain/Values/Single/SingleAction.cs
@@ -110,7 +110,13 @@ namespace WMS.Web.Domain.Values.Single
/// 仓库：编码与组织编码结合
///
[EnumRemark("仓库")]
- StocksJoinOrgCode=20
+ StocksJoinOrgCode=20,
+
+ ///
+ /// 仓库：编码与组织编码结合
+ ///
+ [EnumRemark("仓位与仓库与组织")]
+ SubStocksJoinOrgCode
}
}
diff --git a/src/WMS.Web.Repositories/BackRecordRepositories.cs b/src/WMS.Web.Repositories/BackRecordRepositories.cs
index 056b57b3..c98e008d 100644
--- a/src/WMS.Web.Repositories/BackRecordRepositories.cs
+++ b/src/WMS.Web.Repositories/BackRecordRepositories.cs
@@ -120,7 +120,7 @@ namespace WMS.Web.Repositories
Qty = s.detail.Qty,
Org= _erpBasicDataExtendService.GetOrgName(orgs, s.order.OrgCode),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.order.StockCode + s.order.OrgCode),
- SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.order.SubStockCode),
+ SubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.order.SubStockCode + s.order.StockCode + s.order.OrgCode),
SerialNumbers = (string.Join(",", s.detail.SerialNumbers)).TrimEnd(','),
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
diff --git a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs
index 7fb2db3d..1cd53164 100644
--- a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs
+++ b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs
@@ -122,8 +122,8 @@ namespace WMS.Web.Repositories
MaterialNumber = s.detail.MaterialNumber,
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialNumber),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.order.StockCode+s.order.OrgCode),
- SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.order.SubStockCode),
- SerialNumbers=(string.Join(",",s.detail.SerialNumbers)).TrimEnd(','),
+ SubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.order.SubStockCode + s.order.StockCode + s.order.OrgCode),
+ SerialNumbers =(string.Join(",",s.detail.SerialNumbers)).TrimEnd(','),
Org = _erpBasicDataExtendService.GetOrgName(orgs, s.order.OrgCode),
Qty = s.detail.Qty,
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
diff --git a/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs b/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs
index 45a357ef..d6111d97 100644
--- a/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs
+++ b/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs
@@ -103,8 +103,7 @@ namespace WMS.Web.Repositories
query = query.Where(w => w.SubStockCode == dto.SubStockCode);
if (dto.Qty.HasValue)
- query = query.Where(w => w.Qty == dto.Qty);
-
+ query = query.Where(w => w.Qty == dto.Qty);
int total = await query.CountAsync();
@@ -117,7 +116,7 @@ namespace WMS.Web.Repositories
Org= _erpBasicDataExtendService.GetOrgName(orgs, s.OrgCode),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.StockCode + s.OrgCode),
Qty = s.Qty,
- SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.SubStockCode),
+ SubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.SubStockCode + s.StockCode + s.OrgCode),
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.MaterialNumber),
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();