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

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;