18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

接口优化

Browse Source
This commit is contained in:
tongfei
2023-12-20 11:59:18 +08:00
parent 26f9e47f4f
commit d1c9cae1cd
13 changed files with 257 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

188
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -210,49 +210,14 @@
单据编号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.BoxBillNo">
<summary>
所属箱号编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.Type">
<summary>
类型：1为入库回退下架，2为出库回退上架
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.Creator">
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.BoxBillNo">
<summary>
操作人
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.CreateTime">
<summary>
操作时间
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.Specifications">
<summary>
物料规格型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.Qty">
<summary>
数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.Org">
<summary>
组织
所属箱号编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.SubStock">
@@ -260,9 +225,19 @@
仓位
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.Stock">
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.MaterialName">
<summary>
仓库
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.Specifications">
<summary>
物料规格型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.SerialNumbers">
@@ -270,6 +245,31 @@
序列号集
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.Qty">
<summary>
数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.CreateTime">
<summary>
操作时间
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.Creator">
<summary>
操作人
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.Org">
<summary>
组织
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.Stock">
<summary>
仓库
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.BoxDetailResponse">
<summary>
根据箱号获取物料信息
@@ -2001,16 +2001,16 @@
单据编号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.SourceBillNo">
<summary>
来源单号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Status">
<summary>
入库状态
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.SourceBillNo">
<summary>
来源单号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Type">
<summary>
入库类型
@@ -2026,9 +2026,9 @@
组织ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.MaterialName">
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Specifications">
<summary>
物料名称
物料规格型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.MaterialNumber">
@@ -2036,9 +2036,9 @@
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Specifications">
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.MaterialName">
<summary>
物料规格型号
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.FactoryPrice">
@@ -2371,16 +2371,16 @@
单据编号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockQueryResponse.Type">
<summary>
入库类型
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockQueryResponse.SourceBillNo">
<summary>
来源单号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockQueryResponse.Type">
<summary>
入库类型
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockQueryResponse.Supplier">
<summary>
供应商
@@ -2391,9 +2391,9 @@
组织
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockQueryResponse.MaterialName">
<member name="P:WMS.Web.Core.Dto.InStockQueryResponse.Specifications">
<summary>
物料名称
物料规格型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockQueryResponse.MaterialNumber">
@@ -2401,9 +2401,9 @@
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockQueryResponse.Specifications">
<member name="P:WMS.Web.Core.Dto.InStockQueryResponse.MaterialName">
<summary>
物料规格型号
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockQueryResponse.Stock">
@@ -2907,29 +2907,24 @@
仓位
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryResponse.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryResponse.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryResponse.Specifications">
<summary>
物料规格型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryResponse.SerialNumbers">
<summary>
序列号集
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryResponse.Org">
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryResponse.Specifications">
<summary>
组织
物料规格型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryResponse.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryResponse.Qty">
@@ -2937,6 +2932,11 @@
物料库存数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryResponse.Org">
<summary>
组织
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Inventory.BoxInventoryTakeGenerateDto">
<summary>
@@ -3097,11 +3097,6 @@
ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryResponse.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryResponse.MaterialNumber">
<summary>
物料编码
@@ -3112,9 +3107,9 @@
物料规格型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryResponse.Org">
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryResponse.MaterialName">
<summary>
组织
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryResponse.Stock">
@@ -3122,6 +3117,11 @@
仓库
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryResponse.Org">
<summary>
组织
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryResponse.SubStock">
<summary>
仓位
@@ -3227,11 +3227,6 @@
ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.MaterialNumber">
<summary>
物料编码
@@ -3242,19 +3237,14 @@
物料规格型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.Type">
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.MaterialName">
<summary>
类型：1为入库，2为出库
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.Org">
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.OrderBillNo">
<summary>
组织
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.Stock">
<summary>
仓库
单据编号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.OrderType">
@@ -3262,9 +3252,19 @@
单据类型
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.OrderBillNo">
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.Org">
<summary>
单据编号
组织
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.CreateTime">
<summary>
创建日期
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.Type">
<summary>
类型：1为入库，2为出库
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.Qty">
@@ -3277,9 +3277,9 @@
结存
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.CreateTime">
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.Stock">
<summary>
创建日期
仓库
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Login.AccessTokenDto.Token">

90
src/WMS.Web.Core/Dto/BackRecord/BackRecordQueryResponse.cs
View File

@@ -27,55 +27,16 @@ namespace WMS.Web.Core.Dto
/// </summary>
[Column("单据号")]
public string BillNo { get; set; }
/// <summary>
/// 所属箱号编码
/// </summary>
[Column("箱号")]
public string BoxBillNo { get; set; }
/// <summary>
/// 类型：1为入库回退下架，2为出库回退上架
/// </summary>
[Column("单据类型")]
public string Type { get; set; }
/// <summary>
/// 操作人
/// 所属箱号编码
/// </summary>
[Column("操作人")]
public string Creator { get; set; }
/// <summary>
/// 操作时间
/// </summary>
[Column("操作时间")]
public DateTime CreateTime { get; set; }
/// <summary>
/// 物料名称
/// </summary>
[Column("物料名称")]
public string MaterialName { get; set; }
/// <summary>
/// 物料编码
/// </summary>
[Column("物料编码")]
public string MaterialNumber { get; set; }
/// <summary>
/// 物料规格型号
/// </summary>
[Column("规格型号")]
public string Specifications { get; set; }
/// <summary>
/// 数量
/// </summary>
[Column("操作数量")]
public decimal Qty { get; set; }
/// <summary>
/// 组织
/// </summary>
[Ignore]
public string Org { get; set; }
[Column("箱号")]
public string BoxBillNo { get; set; }
/// <summary>
/// 仓位
/// </summary>
@@ -83,15 +44,52 @@ namespace WMS.Web.Core.Dto
public string SubStock { get; set; }
/// <summary>
/// 仓库
/// 物料名称
/// </summary>
[Ignore]
public string Stock { get; set; }
[Column("物料名称")]
public string MaterialName { get; set; }
/// <summary>
/// 物料规格型号
/// </summary>
[Column("规格型号")]
public string Specifications { get; set; }
/// <summary>
/// 物料编码
/// </summary>
[Column("物料编码")]
public string MaterialNumber { get; set; }
/// <summary>
/// 序列号集
/// </summary>
[Column("序列号")]
public string SerialNumbers { get; set; }
/// <summary>
/// 数量
/// </summary>
[Column("操作数量")]
public decimal Qty { get; set; }
/// <summary>
/// 操作时间
/// </summary>
[Column("操作时间")]
public DateTime CreateTime { get; set; }
/// <summary>
/// 操作人
/// </summary>
[Column("操作人")]
public string Creator { get; set; }
/// <summary>
/// 组织
/// </summary>
[Ignore]
public string Org { get; set; }
/// <summary>
/// 仓库
/// </summary>
[Ignore]
public string Stock { get; set; }
}
}

24
src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs
View File

@@ -27,6 +27,11 @@ namespace WMS.Web.Core.Dto
/// </summary>
[Column("入库单号")]
public string BillNo { get; set; }
/// <summary>
/// 来源单号
/// </summary>
[Column("来源单号")]
public string SourceBillNo { get; set; }
/// <summary>
/// 入库类型
@@ -34,11 +39,7 @@ namespace WMS.Web.Core.Dto
[Column("入库类型")]
public string Type { get; set; }
/// <summary>
/// 来源单号
/// </summary>
[Column("来源单号")]
public string SourceBillNo { get; set; }
/// <summary>
/// 供应商
/// </summary>
@@ -50,20 +51,21 @@ namespace WMS.Web.Core.Dto
[Column("组织")]
public string Org { get; set; }
/// <summary>
/// 物料名称
/// 物料规格型号
/// </summary>
[Column("物料名称")]
public string MaterialName { get; set; }
[Column("规格型号")]
public string Specifications { get; set; }
/// <summary>
/// 物料编码
/// </summary>
[Column("物料编码")]
public string MaterialNumber { get; set; }
/// <summary>
/// 物料规格型号
/// 物料名称
/// </summary>
[Column("规格型号")]
public string Specifications { get; set; }
[Column("物料名称")]
public string MaterialName { get; set; }
/// <summary>
/// 仓库
/// </summary>

25
src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryResponse.cs
View File

@@ -27,18 +27,17 @@ namespace WMS.Web.Core.Dto
/// </summary>
[Column("入库任务单号")]
public string BillNo { get; set; }
/// <summary>
/// 入库状态
/// </summary>
[Column("入库状态")]
public string Status { get; set; }
/// <summary>
/// 来源单号
/// </summary>
[Column("来源单号")]
public string SourceBillNo { get; set; }
/// <summary>
/// 入库状态
/// </summary>
[Column("入库状态")]
public string Status { get; set; }
/// <summary>
/// 入库类型
/// </summary>
@@ -57,20 +56,22 @@ namespace WMS.Web.Core.Dto
public string Org { get; set; }
/// <summary>
/// 物料名称
/// 物料规格型号
/// </summary>
[Column("物料名称")]
public string MaterialName { get; set; }
[Column("规格型号")]
public string Specifications { get; set; }
/// <summary>
/// 物料编码
/// </summary>
[Column("物料编码")]
public string MaterialNumber { get; set; }
/// <summary>
/// 物料规格型号
/// 物料名称
/// </summary>
[Column("规格型号")]
public string Specifications { get; set; }
[Column("物料名称")]
public string MaterialName { get; set; }
/// <summary>
/// 出厂价

28
src/WMS.Web.Core/Dto/Inventory/BoxInventoryQueryResponse.cs
View File

@@ -38,35 +38,35 @@ namespace WMS.Web.Core.Dto.Inventory
[Column("仓位")]
public string SubStock { get; set; }
/// <summary>
/// 物料名称
/// </summary>
[Column("物料名称")]
public string MaterialName { get; set; }
/// <summary>
/// 物料编码
/// </summary>
[Column("物料编码")]
public string MaterialNumber { get; set; }
/// <summary>
/// 序列号集
/// </summary>
[Column("序列号")]
public string SerialNumbers { get; set; }
/// <summary>
/// 物料规格型号
/// </summary>
[Column("规格型号")]
public string Specifications { get; set; }
/// <summary>
/// 序列号集
/// 物料名称
/// </summary>
[Column("序列号")]
public string SerialNumbers { get; set; }
/// <summary>
/// 组织
/// </summary>
[Column("组织")]
public string Org { get; set; }
[Column("物料名称")]
public string MaterialName { get; set; }
/// <summary>
/// 物料库存数量
/// </summary>
[Column("数量")]
public decimal Qty { get; set; }
/// <summary>
/// 组织
/// </summary>
[Column("组织")]
public string Org { get; set; }
}
}

19
src/WMS.Web.Core/Dto/Inventory/InventoryDetailsQueryResponse.cs
View File

@@ -16,16 +16,12 @@ namespace WMS.Web.Core.Dto.Inventory
[Ignore]
public int Id { get; set; }
/// <summary>
/// 物料名称
/// </summary>
[Column("物料名称")]
public string MaterialName { get; set; }
/// <summary>
/// 物料编码
/// </summary>
[Column("物料编码")]
public string MaterialNumber { get; set; }
/// <summary>
/// 物料规格型号
/// </summary>
@@ -33,16 +29,23 @@ namespace WMS.Web.Core.Dto.Inventory
public string Specifications { get; set; }
/// <summary>
/// 组织
/// 物料名称
/// </summary>
[Column("组织")]
public string Org { get; set; }
[Column("物料名称")]
public string MaterialName { get; set; }
/// <summary>
/// 仓库
/// </summary>
[Column("仓库")]
public string Stock { get; set; }
/// <summary>
/// 组织
/// </summary>
[Column("组织")]
public string Org { get; set; }
/// <summary>
/// 仓位
/// </summary>

54
src/WMS.Web.Core/Dto/Inventory/InventoryInOutDetailsQueryResponse.cs
View File

@@ -16,39 +16,28 @@ namespace WMS.Web.Core.Dto.Inventory
[Ignore]
public int Id { get; set; }
/// <summary>
/// 物料名称
/// </summary>
[Column("物料名称")]
public string MaterialName { get; set; }
/// <summary>
/// 物料编码
/// </summary>
[Column("物料编码")]
public string MaterialNumber { get; set; }
/// <summary>
/// 物料规格型号
/// </summary>
[Column("规格型号")]
public string Specifications { get; set; }
/// <summary>
/// 物料名称
/// </summary>
[Column("物料名称")]
public string MaterialName { get; set; }
/// <summary>
/// 类型：1为入库，2为出库
/// 单据编号
/// </summary>
[Column("出入库类型")]
public string Type { get; set; }
/// <summary>
/// 组织
/// </summary>
[Column("组织")]
public string Org { get; set; }
/// <summary>
/// 仓库
/// </summary>
[Column("仓库")]
public string Stock { get; set; }
[Column("单号")]
public string OrderBillNo { get; set; }
/// <summary>
/// 单据类型
@@ -57,10 +46,23 @@ namespace WMS.Web.Core.Dto.Inventory
public string OrderType { get; set; }
/// <summary>
/// 单据编号
/// 组织
/// </summary>
[Column("单号")]
public string OrderBillNo { get; set; }
[Column("组织")]
public string Org { get; set; }
/// <summary>
/// 创建日期
/// </summary>
[Column("日期")]
public string CreateTime { get; set; }
/// <summary>
/// 类型：1为入库，2为出库
/// </summary>
[Column("出入库类型")]
public string Type { get; set; }
/// <summary>
/// 数量
/// </summary>
@@ -73,9 +75,9 @@ namespace WMS.Web.Core.Dto.Inventory
public decimal SurplusQty { get; set; }
/// <summary>
/// 创建日期
/// 仓库
/// </summary>
[Column("日期")]
public string CreateTime { get; set; }
[Column("仓库")]
public string Stock { get; set; }
}
}

28
src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs
View File

@@ -40,7 +40,7 @@ namespace WMS.Web.Domain.Services.Public
/// <returns></returns>
public string GetMaterialName(List<ErpMaterialDto> erpMaterials,int materialId)
{
if (erpMaterials == null && erpMaterials.Count == 0)
if (erpMaterials == null || erpMaterials.Count == 0)
return "";
var mat= erpMaterials.Where(x => x.MaterialId == materialId).FirstOrDefault();
@@ -62,7 +62,7 @@ namespace WMS.Web.Domain.Services.Public
/// <returns></returns>
public string GetMaterialNumber(List<ErpMaterialDto> erpMaterials, int materialId)
{
if (erpMaterials == null && erpMaterials.Count == 0)
if (erpMaterials == null || erpMaterials.Count == 0)
return "";
var mat = erpMaterials.Where(x => x.MaterialId == materialId).FirstOrDefault();
if (mat == null)
@@ -83,7 +83,7 @@ namespace WMS.Web.Domain.Services.Public
/// <returns></returns>
public string GetMaterialSpecifications(List<ErpMaterialDto> erpMaterials, int materialId)
{
if (erpMaterials == null && erpMaterials.Count == 0)
if (erpMaterials == null || erpMaterials.Count == 0)
return "";
var mat = erpMaterials.Where(x => x.MaterialId == materialId).FirstOrDefault();
if (mat == null)
@@ -104,7 +104,7 @@ namespace WMS.Web.Domain.Services.Public
/// <returns></returns>
public string GetMaterialUnitName(List<ErpMaterialDto> erpMaterials, int materialId)
{
if (erpMaterials == null && erpMaterials.Count == 0)
if (erpMaterials == null || erpMaterials.Count == 0)
return "";
var mat = erpMaterials.Where(x => x.MaterialId == materialId).FirstOrDefault();
if (mat == null)
@@ -124,7 +124,7 @@ namespace WMS.Web.Domain.Services.Public
/// <returns></returns>
public int GetMaterialUnitId(List<ErpMaterialDto> erpMaterials, int materialId)
{
if (erpMaterials == null && erpMaterials.Count == 0)
if (erpMaterials == null || erpMaterials.Count == 0)
return 0;
var mat = erpMaterials.Where(x => x.MaterialId == materialId).FirstOrDefault();
if (mat == null)
@@ -144,7 +144,7 @@ namespace WMS.Web.Domain.Services.Public
/// <returns></returns>
public string GetMaterialUnitNumber(List<ErpMaterialDto> erpMaterials, int materialId)
{
if (erpMaterials == null && erpMaterials.Count == 0)
if (erpMaterials == null || erpMaterials.Count == 0)
return "";
var mat = erpMaterials.Where(x => x.MaterialId == materialId).FirstOrDefault();
if (mat == null)
@@ -165,7 +165,7 @@ namespace WMS.Web.Domain.Services.Public
/// <returns></returns>
public string GetOrgName(List<ErpOrgDto> erpOrgs, int orgId)
{
if (erpOrgs == null && erpOrgs.Count == 0)
if (erpOrgs == null || erpOrgs.Count == 0)
return "";
var org = erpOrgs.Where(x => x.Id == orgId).FirstOrDefault();
return org == null ? "" : org.Name;
@@ -179,7 +179,7 @@ namespace WMS.Web.Domain.Services.Public
/// <returns></returns>
public string GetOrgName(List<ErpOrgDto> erpOrgs, string orgCode)
{
if (erpOrgs == null && erpOrgs.Count == 0)
if (erpOrgs == null || erpOrgs.Count == 0)
return "";
var org = erpOrgs.Where(x => x.Number == orgCode).FirstOrDefault();
return org == null ? "" : org.Name;
@@ -193,7 +193,7 @@ namespace WMS.Web.Domain.Services.Public
/// <returns></returns>
public int GetOrgId(List<ErpOrgDto> erpOrgs, string orgCode)
{
if (erpOrgs == null && erpOrgs.Count == 0)
if (erpOrgs == null || erpOrgs.Count == 0)
return 0;
var org = erpOrgs.Where(x => x.Number == orgCode).FirstOrDefault();
return org == null ? 0 : org.Id;
@@ -207,7 +207,7 @@ namespace WMS.Web.Domain.Services.Public
/// <returns></returns>
public string GetSupplierName(List<ErpSupplierDto> erpSuppliers, int supplierId)
{
if (erpSuppliers == null && erpSuppliers.Count == 0)
if (erpSuppliers == null || erpSuppliers.Count == 0)
return "";
var supplier = erpSuppliers.Where(x => x.Id == supplierId).FirstOrDefault();
return supplier == null ? "" : supplier.Name;
@@ -220,7 +220,7 @@ namespace WMS.Web.Domain.Services.Public
/// <returns></returns>
public string GetCustomerName(List<ErpCustomerDto> erpCustomers, int customerId)
{
if (erpCustomers == null && erpCustomers.Count == 0)
if (erpCustomers == null || erpCustomers.Count == 0)
return "";
var supplier = erpCustomers.Where(x => x.Id == customerId).FirstOrDefault();
return supplier == null ? "" : supplier.Name;
@@ -234,7 +234,7 @@ namespace WMS.Web.Domain.Services.Public
/// <returns></returns>
public string GetStockName(List<ErpStockDto> erpStocks, int stockId)
{
if (erpStocks == null && erpStocks.Count == 0)
if (erpStocks == null || erpStocks.Count == 0)
return "";
var stock = erpStocks.Where(x => x.Id == stockId).FirstOrDefault();
return stock == null ? "" : stock.Name;
@@ -248,7 +248,7 @@ namespace WMS.Web.Domain.Services.Public
/// <returns></returns>
public string GetStockName(List<ErpStockDto> erpStocks, string code)
{
if (erpStocks == null && erpStocks.Count == 0)
if (erpStocks == null || erpStocks.Count == 0)
return "";
var stock = erpStocks.Where(x => x.Code == code).FirstOrDefault();
return stock == null ? "" : stock.Name;
@@ -262,7 +262,7 @@ namespace WMS.Web.Domain.Services.Public
/// <returns></returns>
public string GetStockCode(List<ErpStockDto> erpStocks, int stockId)
{
if (erpStocks == null && erpStocks.Count == 0)
if (erpStocks == null || erpStocks.Count == 0)
return "";
var stock = erpStocks.Where(x => x.Id == stockId).FirstOrDefault();
return stock == null ? "" : stock.Code;

12
src/WMS.Web.Repositories/BoxInventoryRepositories.cs
View File

@@ -94,10 +94,15 @@ namespace WMS.Web.Repositories
query = query.Where(w => w.order.SubStockId == dto.SubStockId.Value);
//物料ID在模糊后的物料
if (materials != null && materials.Count != 0 && !string.IsNullOrEmpty(dto.MaterialNumber))
if (!string.IsNullOrEmpty(dto.MaterialNumber))
{
var mids = materials.Select(x => x.MaterialId).ToList();
query = query.Where(w => mids.Contains(w.detail.MaterialId));
if (materials != null && materials.Count != 0)
{
var mids = materials.Select(x => x.MaterialId).ToList();
query = query.Where(w => mids.Contains(w.detail.MaterialId));
}
else
query = query.Where(w => w.detail.MaterialId == 0);
}
@@ -116,6 +121,7 @@ namespace WMS.Web.Repositories
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();
return (list,total);
}

11
src/WMS.Web.Repositories/InStockRepositories.cs
View File

@@ -252,10 +252,15 @@ namespace WMS.Web.Repositories
query = query.Where(w => EF.Functions.Like(w.detail.SourceBillNo, "%" + dto.SourceBillNo + "%"));
//物料ID在模糊后的物料
if (materials != null && materials.Count != 0 && !string.IsNullOrEmpty(dto.MaterialNumber))
if (!string.IsNullOrEmpty(dto.MaterialNumber))
{
var mids = materials.Select(x => x.MaterialId).ToList();
query = query.Where(w => mids.Contains(w.detail.MaterialId));
if (materials != null && materials.Count != 0)
{
var mids = materials.Select(x => x.MaterialId).ToList();
query = query.Where(w => mids.Contains(w.detail.MaterialId));
}
else
query = query.Where(w => w.detail.MaterialId == 0);
}
if (dto.SupplierId.HasValue)

11
src/WMS.Web.Repositories/InStockTaskRepositories.cs
View File

@@ -470,10 +470,15 @@ namespace WMS.Web.Repositories
query = query.Where(w => EF.Functions.Like(w.order.SourceBillNo, "%" + dto.SourceBillNo + "%"));
//物料ID在模糊后的物料
if (materials != null && materials.Count != 0 && !string.IsNullOrEmpty(dto.MaterialNumber))
if (!string.IsNullOrEmpty(dto.MaterialNumber))
{
var mids = materials.Select(x => x.MaterialId).ToList();
query = query.Where(w => mids.Contains(w.detail.MaterialId));
if (materials != null && materials.Count != 0)
{
var mids = materials.Select(x => x.MaterialId).ToList();
query = query.Where(w => mids.Contains(w.detail.MaterialId));
}
else
query = query.Where(w => w.detail.MaterialId == 0);
}
if (ids_Receiver.Count() > 0)

12
src/WMS.Web.Repositories/InventoryDetailsRepositories.cs
View File

@@ -76,10 +76,14 @@ namespace WMS.Web.Repositories
.Where(adv => 1 == 1);
//物料ID在模糊后的物料
if (materials != null && materials.Count != 0 && !string.IsNullOrEmpty(dto.MaterialNumber))
if (!string.IsNullOrEmpty(dto.MaterialNumber))
{
var mids = materials.Select(x => x.MaterialId).ToList();
query = query.Where(w => mids.Contains(w.MaterialId));
if (materials != null && materials.Count != 0)
{
var mids = materials.Select(x => x.MaterialId).ToList();
query = query.Where(w => mids.Contains(w.MaterialId));
}else
query = query.Where(w => w.MaterialId==0);
}
if (!string.IsNullOrEmpty(dto.StockCode))
@@ -107,7 +111,7 @@ namespace WMS.Web.Repositories
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.MaterialId),
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
return (list,total);
return (list,total);
}
/// <summary>

11
src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs
View File

@@ -77,10 +77,15 @@ namespace WMS.Web.Repositories
.Where(adv => 1 == 1);
//物料ID在模糊后的物料
if (materials != null && materials.Count != 0 && !string.IsNullOrEmpty(dto.MaterialNumber))
if (!string.IsNullOrEmpty(dto.MaterialNumber))
{
var mids = materials.Select(x => x.MaterialId).ToList();
query = query.Where(w => mids.Contains(w.MaterialId));
if (materials != null && materials.Count != 0)
{
var mids = materials.Select(x => x.MaterialId).ToList();
query = query.Where(w => mids.Contains(w.MaterialId));
}
else
query = query.Where(w => w.MaterialId == 0);
}
if (!string.IsNullOrEmpty(dto.StockCode))