diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index 32f2200f..ab32c894 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -137,7 +137,7 @@
- 所属箱号ID
+ 所属箱号编码
@@ -175,11 +175,21 @@
数量
+
+
+ 组织
+
+
仓位
+
+
+ 仓库
+
+
序列号集
@@ -2736,6 +2746,11 @@
物料规格型号
+
+
+ 组织
+
+
仓库
@@ -2866,6 +2881,11 @@
类型：1为入库，2为出库
+
+
+ 组织
+
+
仓库
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 9b58d10f..58162965 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -2580,6 +2580,14 @@
+
+
+ 获取组织名称
+
+
+
+
+
获取供应商名称
@@ -3875,6 +3883,14 @@
+
+
+ 获取组织名称
+
+
+
+
+
获取供应商名称
diff --git a/src/WMS.Web.Core/Dto/BackRecord/BackRecordQueryResponse.cs b/src/WMS.Web.Core/Dto/BackRecord/BackRecordQueryResponse.cs
index c43b0ed3..606f7976 100644
--- a/src/WMS.Web.Core/Dto/BackRecord/BackRecordQueryResponse.cs
+++ b/src/WMS.Web.Core/Dto/BackRecord/BackRecordQueryResponse.cs
@@ -25,7 +25,7 @@ namespace WMS.Web.Core.Dto
public string BillNo { get; set; }
///
- /// 所属箱号ID
+ /// 所属箱号编码
///
public string BoxBillNo { get; set; }
///
@@ -57,11 +57,22 @@ namespace WMS.Web.Core.Dto
/// 数量
///
public decimal Qty { get; set; }
+
+ ///
+ /// 组织
+ ///
+ public string Org { get; set; }
+
///
/// 仓位
///
public string SubStock { get; set; }
+ ///
+ /// 仓库
+ ///
+ public string Stock { get; set; }
+
///
/// 序列号集
///
diff --git a/src/WMS.Web.Core/Dto/Inventory/InventoryDetailsQueryResponse.cs b/src/WMS.Web.Core/Dto/Inventory/InventoryDetailsQueryResponse.cs
index a1f415da..acf95aa9 100644
--- a/src/WMS.Web.Core/Dto/Inventory/InventoryDetailsQueryResponse.cs
+++ b/src/WMS.Web.Core/Dto/Inventory/InventoryDetailsQueryResponse.cs
@@ -27,6 +27,11 @@ namespace WMS.Web.Core.Dto.Inventory
///
public string Specifications { get; set; }
+ ///
+ /// 组织
+ ///
+ public string Org { get; set; }
+
///
/// 仓库
///
diff --git a/src/WMS.Web.Core/Dto/Inventory/InventoryInOutDetailsQueryResponse.cs b/src/WMS.Web.Core/Dto/Inventory/InventoryInOutDetailsQueryResponse.cs
index 12b449d1..8ad4f09b 100644
--- a/src/WMS.Web.Core/Dto/Inventory/InventoryInOutDetailsQueryResponse.cs
+++ b/src/WMS.Web.Core/Dto/Inventory/InventoryInOutDetailsQueryResponse.cs
@@ -32,6 +32,11 @@ namespace WMS.Web.Core.Dto.Inventory
///
public string Type { get; set; }
+ ///
+ /// 组织
+ ///
+ public string Org { get; set; }
+
///
/// 仓库
///
diff --git a/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs b/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs
index ae09e909..f8809f31 100644
--- a/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs
+++ b/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs
@@ -52,6 +52,14 @@ namespace WMS.Web.Domain.IService.Public
///
string GetOrgName(List erpOrgs, int orgId);
+ ///
+ /// 获取组织名称
+ ///
+ ///
+ ///
+ ///
+ string GetOrgName(List erpOrgs, string orgCode);
+
///
/// 获取供应商名称
///
diff --git a/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs b/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs
index a836efc4..6fe9354a 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs
@@ -90,6 +90,18 @@ namespace WMS.Web.Domain.Services.Public
return org == null ? "" : org.Name;
}
+ ///
+ /// 获取组织名称
+ ///
+ ///
+ ///
+ ///
+ public string GetOrgName(List erpOrgs, string orgCode)
+ {
+ var org = erpOrgs.Where(x => x.Number == orgCode).FirstOrDefault();
+ return org == null ? "" : org.Name;
+ }
+
///
/// 获取供应商名称
///
diff --git a/src/WMS.Web.Repositories/BackRecordRepositories.cs b/src/WMS.Web.Repositories/BackRecordRepositories.cs
index 603437ab..39c1f86d 100644
--- a/src/WMS.Web.Repositories/BackRecordRepositories.cs
+++ b/src/WMS.Web.Repositories/BackRecordRepositories.cs
@@ -62,6 +62,12 @@ namespace WMS.Web.Repositories
return (new List(), 0);
var materials = materials_result.Data.ToList();
+ //组织集合
+ var orgs_result = await _erpService.BillQueryForOrg();
+ if (!orgs_result.IsSuccess)
+ return (new List(), 0);
+ var orgs = orgs_result.Data.ToList();
+
var query = _context.BackRecordDetails
.GroupJoin(_context.BackRecord, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
.SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
@@ -91,6 +97,8 @@ namespace WMS.Web.Repositories
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
Qty = s.detail.Qty,
+ Org= _erpBasicDataExtendService.GetOrgName(orgs, s.detail.OrgCode),
+ Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.detail.StockCode + s.detail.OrgCode),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.detail.SubStockId),
SerialNumbers = JsonConvert.SerializeObject(s.detail.SerialNumbers),
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
diff --git a/src/WMS.Web.Repositories/InStockRepositories.cs b/src/WMS.Web.Repositories/InStockRepositories.cs
index c13dd38c..8dd07d20 100644
--- a/src/WMS.Web.Repositories/InStockRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockRepositories.cs
@@ -77,7 +77,7 @@ namespace WMS.Web.Repositories
//物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.MaterialNumber))
- materials = materials.Where(w => EF.Functions.Like(w.MaterialNumber, "%" + dto.MaterialNumber + "%")).ToList();
+ materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
var query=_context.InStockDetails
.GroupJoin(_context.Instock, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
index a09bebf5..9c4c5b5e 100644
--- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
@@ -79,7 +79,7 @@ namespace WMS.Web.Repositories
//物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.MaterialNumber))
- materials = materials.Where(w => EF.Functions.Like(w.MaterialNumber, "%" + dto.MaterialNumber + "%")).ToList();
+ materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
var query = _context.InStockTaskDetails
.GroupJoin(_context.InStockTask, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
diff --git a/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs b/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs
index b3deb7e0..45d767f3 100644
--- a/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs
+++ b/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs
@@ -61,7 +61,13 @@ namespace WMS.Web.Repositories
//物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.MaterialNumber))
- materials = materials.Where(w => EF.Functions.Like(w.MaterialNumber, "%" + dto.MaterialNumber + "%")).ToList();
+ materials = materials.Where(w =>w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
+
+ //组织集合
+ var orgs_result = await _erpService.BillQueryForOrg();
+ if (!orgs_result.IsSuccess)
+ return (new List(), 0);
+ var orgs = orgs_result.Data.ToList();
//
var query = _context.InventoryDetails
@@ -89,6 +95,7 @@ namespace WMS.Web.Repositories
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialId),
+ Org= _erpBasicDataExtendService.GetOrgName(orgs, s.OrgCode),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.StockCode + s.OrgCode),
Qty = s.Qty,
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.SubStockId),
diff --git a/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs b/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs
index 7b6bd4c1..09fafe3b 100644
--- a/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs
+++ b/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs
@@ -60,9 +60,15 @@ namespace WMS.Web.Repositories
return (new List(), 0);
var materials = materials_result.Data.ToList();
+ //组织集合
+ var orgs_result = await _erpService.BillQueryForOrg();
+ if (!orgs_result.IsSuccess)
+ return (new List(), 0);
+ var orgs = orgs_result.Data.ToList();
+
//物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.MaterialNumber))
- materials = materials.Where(w => EF.Functions.Like(w.MaterialNumber, "%" + dto.MaterialNumber + "%")).ToList();
+ materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
var query = _context.InventoryInOutDetails
.Where(adv => 1 == 1);
@@ -96,6 +102,7 @@ namespace WMS.Web.Repositories
Type =s.Type.GetRemark(),
OrderType=s.OrderType.GetRemark(),
OrderBillNo=s.OrderBillNo,
+ Org = _erpBasicDataExtendService.GetOrgName(orgs, s.OrgCode),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.StockCode+s.OrgCode),
Qty = s.Qty,
SurplusQty=s.SurplusQty,