chenjingyong
/
ds8-solution-pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

用户管理、海运出口添加航线人员信息

Browse Source
usertest
cjy 3 months ago
parent 9b86720f52
commit c3e0db53d0
9 changed files with 313 additions and 235 deletions
Show Stats Download Patch File Download Diff File

10
ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs
Unescape Escape View File

@ -1220,6 +1220,16 @@ public class SeaExportReq
/// Desc:业务来源明细名称
/// </summary>
public string SourceDetailName { get; set; }
/// <summary>
/// 航线人员Id
/// </summary>
public long? LanerId { get; set; }
/// <summary>
/// 航线人员名称
/// </summary>
public string Laner { get; set; }
}
/// <summary>

11
ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs
Unescape Escape View File

@ -1417,4 +1417,15 @@ public class SeaExportRes
/// Desc:运踪状态 虚值
/// </summary>
public string BookStatus { get; set; }
/// <summary>
/// 航线人员Id
/// </summary>
public long? LanerId { get; set; }
/// <summary>
/// 航线人员名称
/// </summary>
public string Laner { get; set; }
}

14
ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs
Unescape Escape View File

@ -1599,4 +1599,18 @@ public class SeaExport : BaseOrgModel<long>
/// </summary>
[SugarColumn(ColumnDescription = "业务来源明细名称", Length = 100, IsNullable = true)]
public string SourceDetailName { get; set; }
/// <summary>
/// 航线人员Id
/// </summary>
[SugarColumn(ColumnDescription = "航线人员Id", IsNullable = true)]
public long? LanerId { get; set; }
/// <summary>
/// 航线人员名称
/// </summary>
[SugarColumn(ColumnDescription = "航线人员名称", IsNullable = true, Length = 100)]
public string Laner { get; set; }
}

5
ds-wms-service/DS.WMS.Core/Sys/Dtos/UserReq.cs
Unescape Escape View File

@ -164,7 +164,10 @@ public class UserReq
/// 用戶航线
/// </summary>
public long?[] LaneIds { get; set; }
/// <summary>
/// 是否航线操作人员
/// </summary>
public bool IsLaner { get; set; } = false;
/// <summary>
/// 业务来源Id
/// </summary>

5
ds-wms-service/DS.WMS.Core/Sys/Dtos/UserViewModel.cs
Unescape Escape View File

@ -199,4 +199,9 @@ public class UserViewModel
/// 邮件签名
/// </summary>
public string SignatureHtml { get; set; } = "";
/// <summary>
/// 是否航线操作人员
/// </summary>
public bool IsLaner { get; set; } = false;
}

6
ds-wms-service/DS.WMS.Core/Sys/Entity/SysUser.cs
Unescape Escape View File

@ -206,7 +206,11 @@ public class SysUser : UserTenantModel<long>
/// </summary>
[Description("是否派车调度人员")]
public bool IsDispatcher { get; set; } = false;
/// <summary>
/// 是否航线操作人员
/// </summary>
[Description("是否航线操作人员")]
public bool IsLaner { get; set; } = false;
/// <summary>
/// 签名图片
/// </summary>

6
ds-wms-service/DS.WMS.Core/Sys/Interface/IClientCommonService.cs
Unescape Escape View File

@ -14,7 +14,11 @@ namespace DS.WMS.Core.Sys.Interface;
/// </summary>
public interface IClientCommonService
{
/// <summary>
/// 获取航线操作员列表
/// </summary>
/// <returns></returns>
public Task<DataResult<List<UserSelectRes>>> GetLaneUserList(string queryKey = "");
/// <summary>
/// 获取委托单位下拉列表
/// </summary>

16
ds-wms-service/DS.WMS.Core/Sys/Method/ClientCommonService.cs
Unescape Escape View File

@ -47,7 +47,21 @@ public class ClientCommonService : IClientCommonService
user = _serviceProvider.GetRequiredService<IUser>();
saasService = _serviceProvider.GetRequiredService<ISaasDbService>();
}
/// <summary>
/// 获取航线操作员列表
/// </summary>
/// <returns></returns>
public async Task<DataResult<List<UserSelectRes>>> GetLaneUserList(string queryKey = "")
{
var data = await db.Queryable<SysUser>()
.Where(a => a.Status == StatusEnum.Enable.ToEnumInt() && a.IsLaner == true)
.WhereIF(!string.IsNullOrEmpty(queryKey), a => a.UserCode.Contains(queryKey) || a.UserName.Contains(queryKey))
.Select<UserSelectRes>()
.Take(20)
.WithCache($"{SqlSugarCacheConst.User}{user.TenantId}")
.ToListAsync();
return await Task.FromResult(DataResult<List<UserSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess));
}
/// <summary>
/// 获取委托单位下拉列表
/// </summary>

475
ds-wms-service/DS.WMS.MainApi/Controllers/ClientCommonController.cs
Unescape Escape View File

@ -28,6 +28,19 @@ public class ClientCommonController : ApiController
{
_invokeService = invokeService;
}
/// <summary>
/// 获取航线操作员列表-客户端
/// </summary>
/// <param name="queryKey">用户代码或中文名称</param>
/// <returns></returns>
[HttpGet]
[Route("GetLaneUserList")]
public async Task<DataResult<List<UserSelectRes>>> GetLaneUserList([FromQuery] string queryKey)
{
var res = await _invokeService.GetLaneUserList(queryKey);
return res;
}
/// <summary>
/// 获取委托单位下拉列表-客户端
/// </summary>
@ -236,237 +249,237 @@ public class ClientCommonController : ApiController
var res = await _invokeService.GetClientListByCode(code, queryKey);
return res;
}
///// <summary>
///// 获取所有往来单位下拉列表
///// </summary>
///// <returns></returns>
//[HttpGet]
//[Route("GetAllClientList")]
//public DataResult<List<ClientSelectRes>> GetAllClientList()
//{
// var res = _invokeService.GetAllClientList();
// return res;
//}
///// <summary>
///// 获取船公司下拉列表
///// </summary>
///// <returns></returns>
//[HttpGet]
//[Route("GetCarrierClientList")]
//public DataResult<List<ClientSelectRes>> GetCarrierClientList()
//{
// var res = _invokeService.GetCarrierClientList();
// return res;
//}
///// <summary>
///// 获取场站下拉列表
///// </summary>
///// <returns></returns>
//[HttpGet]
//[Route("GetYardClientList")]
//public DataResult<List<ClientSelectRes>> GetYardClientList()
//{
// var res = _invokeService.GetYardClientList();
// return res;
//}
///// <summary>
///// 获取订舱公司下拉列表
///// </summary>
///// <returns></returns>
//[HttpGet]
//[Route("GetBookingClientList")]
//public DataResult<List<ClientSelectRes>> GetBookingClientList()
//{
// var res = _invokeService.GetBookingClientList();
// return res;
//}
///// <summary>
///// 获取车队下拉列表
///// </summary>
///// <returns></returns>
//[HttpGet]
//[Route("GetTruckClientList")]
//public DataResult<List<ClientSelectRes>> GetTruckClientList()
//{
// var res = _invokeService.GetTruckClientList();
// return res;
//}
///// <summary>
///// 获取委托单位下拉列表
///// </summary>
///// <returns></returns>
//[HttpGet]
//[Route("GetControllerClientList")]
//public DataResult<List<ClientSelectRes>> GetControllerClientList()
//{
// var res = _invokeService.GetControllerClientList();
// return res;
//}
///// <summary>
///// 获取报关行下拉列表
///// </summary>
///// <returns></returns>
//[HttpGet]
//[Route("GetCustomClientList")]
//public DataResult<List<ClientSelectRes>> GetCustomClientList()
//{
// var res = _invokeService.GetCustomClientList();
// return res;
//}
///// <summary>
///// 获取代理(国外)下拉列表
///// </summary>
///// <returns></returns>
//[HttpGet]
//[Route("GetAgentClientList")]
//public DataResult<List<ClientSelectRes>> GetAgentClientList()
//{
// var res = _invokeService.GetAgentClientList();
// return res;
//}
///// <summary>
///// 获取代理(国内)下拉列表
///// </summary>
///// <returns></returns>
//[HttpGet]
//[Route("GetAgentCnClientList")]
//public DataResult<List<ClientSelectRes>> GetAgentCnClientList()
//{
// var res = _invokeService.GetAgentCnClientList();
// return res;
//}
///// <summary>
///// 获取快递公司下拉列表
///// </summary>
///// <returns></returns>
//[HttpGet]
//[Route("GetExpressClientList")]
//public DataResult<List<ClientSelectRes>> GetExpressClientList()
//{
// var res = _invokeService.GetExpressClientList();
// return res;
//}
///// <summary>
///// 获取航空公司下拉列表
///// </summary>
///// <returns></returns>
//[HttpGet]
//[Route("GetAirLinesClientList")]
//public DataResult<List<ClientSelectRes>> GetAirLinesClientList()
//{
// var res = _invokeService.GetAirLinesClientList();
// return res;
//}
///// <summary>
///// 获取发货人下拉列表
///// </summary>
///// <returns></returns>
//[HttpGet]
//[Route("GetShipperClientList")]
//public DataResult<List<ClientSelectRes>> GetShipperClientList()
//{
// var res = _invokeService.GetShipperClientList();
// return res;
//}
///// <summary>
///// 获取收货人下拉列表
///// </summary>
///// <returns></returns>
//[HttpGet]
//[Route("GetConsigneeClientList")]
//public DataResult<List<ClientSelectRes>> GetConsigneeClientList()
//{
// var res = _invokeService.GetConsigneeClientList();
// return res;
//}
///// <summary>
///// 获取通知人下拉列表
///// </summary>
///// <returns></returns>
//[HttpGet]
//[Route("GetNotifyPartyClientList")]
//public DataResult<List<ClientSelectRes>> GetNotifyPartyClientList()
//{
// var res = _invokeService.GetNotifyPartyClientList();
// return res;
//}
///// <summary>
///// 获取仓库下拉列表
///// </summary>
///// <returns></returns>
//[HttpGet]
//[Route("GetWareHouseClientList")]
//public DataResult<List<ClientSelectRes>> GetWareHouseClientList()
//{
// var res = _invokeService.GetWareHouseClientList();
// return res;
//}
///// <summary>
///// 获取保险公司下拉列表
///// </summary>
///// <returns></returns>
//[HttpGet]
//[Route("GetInsurerClientList")]
//public DataResult<List<ClientSelectRes>> GetInsurerClientList()
//{
// var res = _invokeService.GetInsurerClientList();
// return res;
//}
///// <summary>
///// 获取租箱公司下拉列表
///// </summary>
///// <returns></returns>
//[HttpGet]
//[Route("GetLeasingClientList")]
//public DataResult<List<ClientSelectRes>> GetLeasingClientList()
//{
// var res = _invokeService.GetLeasingClientList();
// return res;
//}
///// <summary>
///// 获取贸易代理下拉列表
///// </summary>
///// <returns></returns>
//[HttpGet]
//[Route("GetTradingAgencyClientList")]
//public DataResult<List<ClientSelectRes>> GetTradingAgencyClientList()
//{
// var res = _invokeService.GetTradingAgencyClientList();
// return res;
//}
///// <summary>
///// 获取船代下拉列表
///// </summary>
///// <returns></returns>
//[HttpGet]
//[Route("GetShipAgencyClientList")]
//public DataResult<List<ClientSelectRes>> GetShipAgencyClientList()
//{
// var res = _invokeService.GetShipAgencyClientList();
// return res;
//}
///// <summary>
///// 获取经营单位下拉列表
///// </summary>
///// <returns></returns>
//[HttpGet]
//[Route("GetEnterpriseClientList")]
//public DataResult<List<ClientSelectRes>> GetEnterpriseClientList()
//{
// var res = _invokeService.GetEnterpriseClientList();
// return res;
//}
///// <summary>
///// 获取码头下拉列表
///// </summary>
///// <returns></returns>
//[HttpGet]
//[Route("GetWharfClientList")]
//public DataResult<List<ClientSelectRes>> GetWharfClientList()
//{
// var res = _invokeService.GetWharfClientList();
// return res;
//}
/// <summary>
/// 获取所有往来单位下拉列表
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("GetAllClientList")]
public DataResult<List<ClientSelectRes>> GetAllClientList()
{
var res = _invokeService.GetAllClientList();
return res;
}
/// <summary>
/// 获取船公司下拉列表
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("GetCarrierClientList")]
public DataResult<List<ClientSelectRes>> GetCarrierClientList()
{
var res = _invokeService.GetCarrierClientList();
return res;
}
/// <summary>
/// 获取场站下拉列表
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("GetYardClientList")]
public DataResult<List<ClientSelectRes>> GetYardClientList()
{
var res = _invokeService.GetYardClientList();
return res;
}
/// <summary>
/// 获取订舱公司下拉列表
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("GetBookingClientList")]
public DataResult<List<ClientSelectRes>> GetBookingClientList()
{
var res = _invokeService.GetBookingClientList();
return res;
}
/// <summary>
/// 获取车队下拉列表
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("GetTruckClientList")]
public DataResult<List<ClientSelectRes>> GetTruckClientList()
{
var res = _invokeService.GetTruckClientList();
return res;
}
/// <summary>
/// 获取委托单位下拉列表
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("GetControllerClientList")]
public DataResult<List<ClientSelectRes>> GetControllerClientList()
{
var res = _invokeService.GetControllerClientList();
return res;
}
/// <summary>
/// 获取报关行下拉列表
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("GetCustomClientList")]
public DataResult<List<ClientSelectRes>> GetCustomClientList()
{
var res = _invokeService.GetCustomClientList();
return res;
}
/// <summary>
/// 获取代理(国外)下拉列表
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("GetAgentClientList")]
public DataResult<List<ClientSelectRes>> GetAgentClientList()
{
var res = _invokeService.GetAgentClientList();
return res;
}
/// <summary>
/// 获取代理(国内)下拉列表
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("GetAgentCnClientList")]
public DataResult<List<ClientSelectRes>> GetAgentCnClientList()
{
var res = _invokeService.GetAgentCnClientList();
return res;
}
/// <summary>
/// 获取快递公司下拉列表
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("GetExpressClientList")]
public DataResult<List<ClientSelectRes>> GetExpressClientList()
{
var res = _invokeService.GetExpressClientList();
return res;
}
/// <summary>
/// 获取航空公司下拉列表
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("GetAirLinesClientList")]
public DataResult<List<ClientSelectRes>> GetAirLinesClientList()
{
var res = _invokeService.GetAirLinesClientList();
return res;
}
/// <summary>
/// 获取发货人下拉列表
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("GetShipperClientList")]
public DataResult<List<ClientSelectRes>> GetShipperClientList()
{
var res = _invokeService.GetShipperClientList();
return res;
}
/// <summary>
/// 获取收货人下拉列表
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("GetConsigneeClientList")]
public DataResult<List<ClientSelectRes>> GetConsigneeClientList()
{
var res = _invokeService.GetConsigneeClientList();
return res;
}
/// <summary>
/// 获取通知人下拉列表
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("GetNotifyPartyClientList")]
public DataResult<List<ClientSelectRes>> GetNotifyPartyClientList()
{
var res = _invokeService.GetNotifyPartyClientList();
return res;
}
/// <summary>
/// 获取仓库下拉列表
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("GetWareHouseClientList")]
public DataResult<List<ClientSelectRes>> GetWareHouseClientList()
{
var res = _invokeService.GetWareHouseClientList();
return res;
}
/// <summary>
/// 获取保险公司下拉列表
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("GetInsurerClientList")]
public DataResult<List<ClientSelectRes>> GetInsurerClientList()
{
var res = _invokeService.GetInsurerClientList();
return res;
}
/// <summary>
/// 获取租箱公司下拉列表
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("GetLeasingClientList")]
public DataResult<List<ClientSelectRes>> GetLeasingClientList()
{
var res = _invokeService.GetLeasingClientList();
return res;
}
/// <summary>
/// 获取贸易代理下拉列表
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("GetTradingAgencyClientList")]
public DataResult<List<ClientSelectRes>> GetTradingAgencyClientList()
{
var res = _invokeService.GetTradingAgencyClientList();
return res;
}
/// <summary>
/// 获取船代下拉列表
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("GetShipAgencyClientList")]
public DataResult<List<ClientSelectRes>> GetShipAgencyClientList()
{
var res = _invokeService.GetShipAgencyClientList();
return res;
}
/// <summary>
/// 获取经营单位下拉列表
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("GetEnterpriseClientList")]
public DataResult<List<ClientSelectRes>> GetEnterpriseClientList()
{
var res = _invokeService.GetEnterpriseClientList();
return res;
}
/// <summary>
/// 获取码头下拉列表
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("GetWharfClientList")]
public DataResult<List<ClientSelectRes>> GetWharfClientList()
{
var res = _invokeService.GetWharfClientList();
return res;
}
/// <summary>
/// 获取部门列表
/// </summary>

Write Preview
Loading…
Cancel
Save