|
|
|
@ -4,6 +4,8 @@ using DS.Module.SqlSugar;
|
|
|
|
|
using DS.Module.UserModule;
|
|
|
|
|
using DS.WMS.Core.Code.Dtos;
|
|
|
|
|
using DS.WMS.Core.Code.Entity;
|
|
|
|
|
using DS.WMS.Core.Fee.Dtos;
|
|
|
|
|
using DS.WMS.Core.Fee.Entity;
|
|
|
|
|
using DS.WMS.Core.Info.Dtos;
|
|
|
|
|
using DS.WMS.Core.Info.Entity;
|
|
|
|
|
using DS.WMS.Core.System.Dtos;
|
|
|
|
@ -32,7 +34,93 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
user = _serviceProvider.GetRequiredService<IUser>();
|
|
|
|
|
saasService = _serviceProvider.GetRequiredService<ISaasDbService>();
|
|
|
|
|
}
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 获取币别信息下拉选择
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
public DataResult<List<FeeCurrencySelectRes>> GetFeeCurrencySelectList()
|
|
|
|
|
{
|
|
|
|
|
var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
|
|
|
|
|
var data = tenantDb.Queryable<FeeCurrency>()
|
|
|
|
|
.Where(x=>x.Status == StatusEnum.Enable)
|
|
|
|
|
.Select<FeeCurrencySelectRes>()
|
|
|
|
|
.ToList();
|
|
|
|
|
return DataResult<List<FeeCurrencySelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 获取费用代码下拉选择
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
public DataResult<List<FeeCodeSelectRes>> GetFeeCodeSelectList()
|
|
|
|
|
{
|
|
|
|
|
var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
|
|
|
|
|
var data = tenantDb.Queryable<FeeCode>()
|
|
|
|
|
.Where(x => x.Status == StatusEnum.Enable)
|
|
|
|
|
.Select<FeeCodeSelectRes>()
|
|
|
|
|
.ToList();
|
|
|
|
|
return DataResult<List<FeeCodeSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 根据类型获取往来单位下拉列表
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
public DataResult<List<ClientSelectRes>> GetClientListByCode(string code = "")
|
|
|
|
|
{
|
|
|
|
|
var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
|
|
|
|
|
|
|
|
|
|
code = code.ToLower();
|
|
|
|
|
var data = tenantDb.Queryable<InfoClient>()
|
|
|
|
|
.InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)
|
|
|
|
|
.Where((a, b) => a.Status == StatusEnum.Enable.ToEnumInt())
|
|
|
|
|
.WhereIF(code == "carrier", (a, b) => b.IsCarrier == true)
|
|
|
|
|
.WhereIF(code == "yard", (a, b) => b.IsYard == true)
|
|
|
|
|
.WhereIF(code == "booking", (a, b) => b.IsBooking == true)
|
|
|
|
|
.WhereIF(code == "truck", (a, b) => b.IsTruck == true)
|
|
|
|
|
.WhereIF(code == "controller", (a, b) => b.IsController == true)
|
|
|
|
|
.WhereIF(code == "custom", (a, b) => b.IsCustom == true)
|
|
|
|
|
.WhereIF(code == "agent", (a, b) => b.IsAgent == true)
|
|
|
|
|
.WhereIF(code == "agentcn", (a, b) => b.IsAgentCn == true)
|
|
|
|
|
.WhereIF(code == "express", (a, b) => b.IsExpress == true)
|
|
|
|
|
.WhereIF(code == "airlines", (a, b) => b.IsAirLines == true)
|
|
|
|
|
.WhereIF(code == "shipper", (a, b) => b.IsShipper == true)
|
|
|
|
|
.WhereIF(code == "notifyparty", (a, b) => b.IsNotifyParty == true)
|
|
|
|
|
.WhereIF(code == "warehouse", (a, b) => b.IsWareHouse == true)
|
|
|
|
|
.WhereIF(code == "wharf", (a, b) => b.IsWharf == true)
|
|
|
|
|
.WhereIF(code == "insurer", (a, b) => b.IsInsurer == true)
|
|
|
|
|
.WhereIF(code == "leasing", (a, b) => b.IsLeasing == true)
|
|
|
|
|
.WhereIF(code == "tradingagency", (a, b) => b.IsTradingAgency == true)
|
|
|
|
|
.WhereIF(code == "shipagency", (a, b) => b.IsShipAgency == true)
|
|
|
|
|
.WhereIF(code == "enterprise", (a, b) => b.IsEnterprise == true)
|
|
|
|
|
.Select((a, b) => new ClientSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 获取所有往来单位下拉列表
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
public DataResult<List<ClientSelectRes>> GetAllClientList()
|
|
|
|
|
{
|
|
|
|
|
var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
|
|
|
|
|
var data = tenantDb.Queryable<InfoClient>()
|
|
|
|
|
.InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)
|
|
|
|
|
.Where((a, b) => a.Status == StatusEnum.Enable.ToEnumInt())
|
|
|
|
|
.Select((a, b) => new ClientSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 获取船公司下拉列表
|
|
|
|
|
/// </summary>
|
|
|
|
@ -44,12 +132,12 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
.InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)
|
|
|
|
|
.Where((a, b) => a.Status == StatusEnum.Enable.ToEnumInt() && b.IsCarrier == true)
|
|
|
|
|
.Select((a, b) => new ClientSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
@ -65,12 +153,12 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
.InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)
|
|
|
|
|
.Where((a, b) => a.Status == StatusEnum.Enable.ToEnumInt() && b.IsYard == true)
|
|
|
|
|
.Select((a, b) => new ClientSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
@ -86,12 +174,12 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
.InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)
|
|
|
|
|
.Where((a, b) => a.Status == StatusEnum.Enable.ToEnumInt() && b.IsBooking == true)
|
|
|
|
|
.Select((a, b) => new ClientSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
@ -107,12 +195,12 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
.InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)
|
|
|
|
|
.Where((a, b) => a.Status == StatusEnum.Enable.ToEnumInt() && b.IsTruck == true)
|
|
|
|
|
.Select((a, b) => new ClientSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
@ -128,12 +216,12 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
.InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)
|
|
|
|
|
.Where((a, b) => a.Status == StatusEnum.Enable.ToEnumInt() && b.IsController == true)
|
|
|
|
|
.Select((a, b) => new ClientSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
@ -149,12 +237,12 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
.InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)
|
|
|
|
|
.Where((a, b) => a.Status == StatusEnum.Enable.ToEnumInt() && b.IsCustom == true)
|
|
|
|
|
.Select((a, b) => new ClientSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
@ -170,12 +258,12 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
.InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)
|
|
|
|
|
.Where((a, b) => a.Status == StatusEnum.Enable.ToEnumInt() && b.IsAgent == true)
|
|
|
|
|
.Select((a, b) => new ClientSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
@ -191,12 +279,12 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
.InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)
|
|
|
|
|
.Where((a, b) => a.Status == StatusEnum.Enable.ToEnumInt() && b.IsAgentCn == true)
|
|
|
|
|
.Select((a, b) => new ClientSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
@ -212,12 +300,12 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
.InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)
|
|
|
|
|
.Where((a, b) => a.Status == StatusEnum.Enable.ToEnumInt() && b.IsExpress == true)
|
|
|
|
|
.Select((a, b) => new ClientSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
@ -233,12 +321,12 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
.InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)
|
|
|
|
|
.Where((a, b) => a.Status == StatusEnum.Enable.ToEnumInt() && b.IsAirLines == true)
|
|
|
|
|
.Select((a, b) => new ClientSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
@ -254,12 +342,12 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
.InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)
|
|
|
|
|
.Where((a, b) => a.Status == StatusEnum.Enable.ToEnumInt() && b.IsShipper == true)
|
|
|
|
|
.Select((a, b) => new ClientSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
@ -275,12 +363,12 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
.InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)
|
|
|
|
|
.Where((a, b) => a.Status == StatusEnum.Enable.ToEnumInt() && b.IsConsignee == true)
|
|
|
|
|
.Select((a, b) => new ClientSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
@ -296,12 +384,12 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
.InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)
|
|
|
|
|
.Where((a, b) => a.Status == StatusEnum.Enable.ToEnumInt() && b.IsNotifyParty == true)
|
|
|
|
|
.Select((a, b) => new ClientSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
@ -317,12 +405,12 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
.InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)
|
|
|
|
|
.Where((a, b) => a.Status == StatusEnum.Enable.ToEnumInt() && b.IsWareHouse == true)
|
|
|
|
|
.Select((a, b) => new ClientSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
@ -338,12 +426,12 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
.InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)
|
|
|
|
|
.Where((a, b) => a.Status == StatusEnum.Enable.ToEnumInt() && b.IsWharf == true)
|
|
|
|
|
.Select((a, b) => new ClientSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
@ -359,12 +447,12 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
.InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)
|
|
|
|
|
.Where((a, b) => a.Status == StatusEnum.Enable.ToEnumInt() && b.IsInsurer == true)
|
|
|
|
|
.Select((a, b) => new ClientSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
@ -380,12 +468,12 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
.InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)
|
|
|
|
|
.Where((a, b) => a.Status == StatusEnum.Enable.ToEnumInt() && b.IsLeasing == true)
|
|
|
|
|
.Select((a, b) => new ClientSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
@ -401,12 +489,12 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
.InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)
|
|
|
|
|
.Where((a, b) => a.Status == StatusEnum.Enable.ToEnumInt() && b.IsTradingAgency == true)
|
|
|
|
|
.Select((a, b) => new ClientSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
@ -422,12 +510,12 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
.InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)
|
|
|
|
|
.Where((a, b) => a.Status == StatusEnum.Enable.ToEnumInt() && b.IsShipAgency == true)
|
|
|
|
|
.Select((a, b) => new ClientSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
@ -443,16 +531,16 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
.InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)
|
|
|
|
|
.Where((a, b) => a.Status == StatusEnum.Enable.ToEnumInt() && b.IsEnterprise == true)
|
|
|
|
|
.Select((a, b) => new ClientSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
CodeName = a.CodeName,
|
|
|
|
|
ShortName = a.ShortName,
|
|
|
|
|
EnShortName = a.EnShortName
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 获取签单方式下拉列表
|
|
|
|
|
/// </summary>
|
|
|
|
@ -477,7 +565,7 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
.Select<CodeCtnSelectRes>().ToList();
|
|
|
|
|
return DataResult<List<CodeCtnSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 获取包装类型下拉列表
|
|
|
|
|
/// </summary>
|
|
|
|
@ -545,33 +633,33 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
public DataResult<List<UserSelectRes>> GetOperatorUserList()
|
|
|
|
|
{
|
|
|
|
|
{
|
|
|
|
|
var data = db.Queryable<SysUser>()
|
|
|
|
|
.Where(a => a.Status == StatusEnum.Enable.ToEnumInt() && a.IsOperator == true)
|
|
|
|
|
.Select(a => new UserSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
UserCode= a.UserCode,
|
|
|
|
|
UserName = a.UserName,
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
UserCode = a.UserCode,
|
|
|
|
|
UserName = a.UserName,
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<UserSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 获取单证员列表
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
public DataResult<List<UserSelectRes>> GetVouchingClerkList()
|
|
|
|
|
{
|
|
|
|
|
{
|
|
|
|
|
var data = db.Queryable<SysUser>()
|
|
|
|
|
.Where(a => a.Status == StatusEnum.Enable.ToEnumInt() && a.IsVouchingClerk == true)
|
|
|
|
|
.Select(a => new UserSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
UserCode= a.UserCode,
|
|
|
|
|
UserName = a.UserName,
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
UserCode = a.UserCode,
|
|
|
|
|
UserName = a.UserName,
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<UserSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
@ -580,87 +668,87 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
public DataResult<List<UserSelectRes>> GetSaleUserList()
|
|
|
|
|
{
|
|
|
|
|
{
|
|
|
|
|
var data = db.Queryable<SysUser>()
|
|
|
|
|
.Where(a => a.Status == StatusEnum.Enable.ToEnumInt() && a.IsSale == true)
|
|
|
|
|
.Select(a => new UserSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
UserCode= a.UserCode,
|
|
|
|
|
UserName = a.UserName,
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
UserCode = a.UserCode,
|
|
|
|
|
UserName = a.UserName,
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<UserSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 获取报关员列表
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
public DataResult<List<UserSelectRes>> GetCustomUserList()
|
|
|
|
|
{
|
|
|
|
|
{
|
|
|
|
|
var data = db.Queryable<SysUser>()
|
|
|
|
|
.Where(a => a.Status == StatusEnum.Enable.ToEnumInt() && a.IsCustom == true)
|
|
|
|
|
.Select(a => new UserSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
UserCode= a.UserCode,
|
|
|
|
|
UserName = a.UserName,
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
UserCode = a.UserCode,
|
|
|
|
|
UserName = a.UserName,
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<UserSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 获取财务员列表
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
public DataResult<List<UserSelectRes>> GetFinancialStaffList()
|
|
|
|
|
{
|
|
|
|
|
{
|
|
|
|
|
var data = db.Queryable<SysUser>()
|
|
|
|
|
.Where(a => a.Status == StatusEnum.Enable.ToEnumInt() && a.IsFinancialStaff == true)
|
|
|
|
|
.Select(a => new UserSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
UserCode= a.UserCode,
|
|
|
|
|
UserName = a.UserName,
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
UserCode = a.UserCode,
|
|
|
|
|
UserName = a.UserName,
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<UserSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 获取客服列表
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
public DataResult<List<UserSelectRes>> GetCustomerServiceList()
|
|
|
|
|
{
|
|
|
|
|
{
|
|
|
|
|
var data = db.Queryable<SysUser>()
|
|
|
|
|
.Where(a => a.Status == StatusEnum.Enable.ToEnumInt() && a.IsCustomerService == true)
|
|
|
|
|
.Select(a => new UserSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
UserCode= a.UserCode,
|
|
|
|
|
UserName = a.UserName,
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
UserCode = a.UserCode,
|
|
|
|
|
UserName = a.UserName,
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<UserSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 获取司机列表
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
public DataResult<List<UserSelectRes>> GetDiverList()
|
|
|
|
|
{
|
|
|
|
|
{
|
|
|
|
|
var data = db.Queryable<SysUser>()
|
|
|
|
|
.Where(a => a.Status == StatusEnum.Enable.ToEnumInt() && a.IsDriver == true)
|
|
|
|
|
.Select(a => new UserSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
UserCode= a.UserCode,
|
|
|
|
|
UserName = a.UserName,
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
UserCode = a.UserCode,
|
|
|
|
|
UserName = a.UserName,
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<UserSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
@ -669,15 +757,15 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
public DataResult<List<UserSelectRes>> GetDispatcherList()
|
|
|
|
|
{
|
|
|
|
|
{
|
|
|
|
|
var data = db.Queryable<SysUser>()
|
|
|
|
|
.Where(a => a.Status == StatusEnum.Enable.ToEnumInt() && a.IsDispatcher == true)
|
|
|
|
|
.Select(a => new UserSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
UserCode= a.UserCode,
|
|
|
|
|
UserName = a.UserName,
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|
UserCode = a.UserCode,
|
|
|
|
|
UserName = a.UserName,
|
|
|
|
|
}
|
|
|
|
|
).ToList();
|
|
|
|
|
return DataResult<List<UserSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);
|
|
|
|
|
}
|
|
|
|
|