usertest
cjy 4 months ago
parent 9c8301ff75
commit 5a7aa688d6

@ -1,80 +0,0 @@
using DS.Module.Core;
using FluentValidation;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DS.WMS.Core.Code.Dtos
{
/// <summary>
/// 订单关系人请求
/// </summary>
public class CodeOrderContactReq
{
/// <summary>
/// 主键Id
/// </summary>
public long Id { get; set; }
/// <summary>
/// 客户类别
/// </summary>
public string CustomerType { get; set; }
/// <summary>
/// 客户Id
/// </summary>
public long CustomerId { get; set; }
/// <summary>
/// 客户名称
/// </summary>
public string CustomerName { get; set; }
/// <summary>
/// 角色代码
/// </summary>
public string RoleCode { get; set; }
/// <summary>
/// 联系人
/// </summary>
public string Name { get; set; }
/// <summary>
/// 电话
/// </summary>
public string Tel { get; set; }
/// <summary>
/// 邮箱
/// </summary>
public string Email { get; set; }
/// <summary>
/// 排序
/// </summary>
public int? OrderNo { get; set; } = 100;
/// <summary>
/// 备注
/// </summary>
public string Note { get; set; }
/// <summary>
/// 状态 0启用 1禁用
/// </summary>
public StatusEnum? Status { get; set; } = StatusEnum.Enable;
}
/// <summary>
/// 验证
/// </summary>
public class CodeOrderContactReqValidator : AbstractValidator<CodeOrderContactReq>
{
/// <summary>
/// 构造函数
/// </summary>
public CodeOrderContactReqValidator()
{
this.RuleFor(o => o.CustomerType)
.NotEmpty().WithName("客户类别");
//this.RuleFor(o => o.SendType)
// .NotEmpty().WithName("发送类型");
}
}
}

@ -1,62 +0,0 @@
using DS.Module.Core;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DS.WMS.Core.Code.Dtos
{
/// <summary>
/// 订单关系人返回
/// </summary>
public class CodeOrderContactRes
{
/// <summary>
/// 主键Id
/// </summary>
public long Id { get; set; }
/// <summary>
/// 客户类别
/// </summary>
public string CustomerType { get; set; }
/// <summary>
/// 客户Id
/// </summary>
public long CustomerId { get; set; }
/// <summary>
/// 客户名称
/// </summary>
public string CustomerName { get; set; }
/// <summary>
/// 角色代码
/// </summary>
public string RoleCode { get; set; }
/// <summary>
/// 联系人
/// </summary>
public string Name { get; set; }
/// <summary>
/// 电话
/// </summary>
public string Tel { get; set; }
/// <summary>
/// 邮箱
/// </summary>
public string Email { get; set; }
/// <summary>
/// 排序
/// </summary>
public int? OrderNo { get; set; } = 100;
/// <summary>
/// 备注
/// </summary>
public string Note { get; set; }
/// <summary>
/// 状态 0启用 1禁用
/// </summary>
public StatusEnum? Status { get; set; } = StatusEnum.Enable;
}
}

@ -1,71 +0,0 @@
using DS.Module.Core;
using DS.Module.Core.Data;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DS.WMS.Core.Code.Entity
{
/// <summary>
/// 订单关系人
/// </summary>
[SqlSugar.SugarTable("code_order_contact", "订单关系人")]
public class CodeOrderContact : BaseModel<long>
{
/// <summary>
/// 客户类别
/// </summary>
[SugarColumn(ColumnDescription = "客户类别", Length = 50, IsNullable = false)]
public string CustomerType { get; set; }
/// <summary>
/// 客户Id
/// </summary>
[SugarColumn(ColumnDescription = "客户Id")]
public long CustomerId { get; set; }
/// <summary>
/// 客户名称
/// </summary>
[SugarColumn(ColumnDescription = "客户名称", Length = 100, IsNullable = true)]
public string CustomerName { get; set; }
/// <summary>
/// 角色代码
/// </summary>
[SugarColumn(ColumnDescription = "角色代码", Length = 50, IsNullable = true)]
public string RoleCode { get; set; }
/// <summary>
/// 联系人
/// </summary>
[SugarColumn(ColumnDescription = "联系人", Length = 50, IsNullable = true)]
public string Name { get; set; }
/// <summary>
/// 电话
/// </summary>
[SugarColumn(ColumnDescription = "电话", Length = 50, IsNullable = true)]
public string Tel { get; set; }
/// <summary>
/// 邮箱
/// </summary>
[SugarColumn(ColumnDescription = "邮箱", Length = 50, IsNullable = true)]
public string Email { get; set; }
/// <summary>
/// 排序
/// </summary>
[SugarColumn(ColumnDescription = "排序")]
public int? OrderNo { get; set; } = 100;
/// <summary>
/// 备注
/// </summary>
[SugarColumn(ColumnDescription = "备注", Length = 200, IsNullable = true)]
public string Note { get; set; }
/// <summary>
/// 状态 0启用 1禁用
/// </summary>
[SugarColumn(ColumnDescription = "状态", DefaultValue = "0")]
public StatusEnum? Status { get; set; } = StatusEnum.Enable;
}
}

@ -1,57 +0,0 @@
using DS.Module.Core;
using DS.Module.Core.Data;
using DS.WMS.Core.Code.Dtos;
using DS.WMS.Core.Sys.Dtos;
namespace DS.WMS.Core.Code.Interface;
/// <summary>
///
/// </summary>
public interface IOrderContactService
{
/// <summary>
/// 列表
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
DataResult<List<CodeOrderContactRes>> GetListByPage(PageRequest request);
/// <summary>
/// 编辑
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
DataResult EditOrderContact(CodeOrderContactReq model);
/// <summary>
/// 获取详情
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
DataResult<CodeOrderContactRes> GetOrderContactInfo(string id);
/// <summary>
/// 根据客户Id获取订单关系人列表
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
DataResult<List<CodeOrderContactRes>> GetOrderContactListByClientId(string id);
/// <summary>
/// 删除
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
DataResult DelOrderContact(string id);
/// <summary>
/// 批量删除
/// </summary>
/// <param name="req"></param>
/// <returns></returns>
public DataResult BatchDelOrderContact(IdModel req);
}

@ -1,138 +0,0 @@
using DS.Module.Core;
using DS.Module.Core.Data;
using DS.Module.Core.Extensions;
using DS.Module.SqlSugar;
using DS.Module.UserModule;
using DS.WMS.Core.Code.Dtos;
using DS.WMS.Core.Code.Entity;
using DS.WMS.Core.Code.Interface;
using DS.WMS.Core.Op.Entity;
using DS.WMS.Core.Sys.Dtos;
using DS.WMS.Core.Sys.Entity;
using DS.WMS.Core.Sys.Interface;
using Mapster;
using Microsoft.Extensions.DependencyInjection;
using SqlSugar;
namespace DS.WMS.Core.Code.Method;
/// <summary>
///
/// </summary>
public class OrderContactService : IOrderContactService
{
private readonly IServiceProvider _serviceProvider;
private readonly ISqlSugarClient db;
private readonly IUser user;
private readonly ISaasDbService saasService;
/// <summary>
///
/// </summary>
/// <param name="serviceProvider"></param>
public OrderContactService(IServiceProvider serviceProvider)
{
_serviceProvider = serviceProvider;
db = _serviceProvider.GetRequiredService<ISqlSugarClient>();
user = _serviceProvider.GetRequiredService<IUser>();
saasService = _serviceProvider.GetRequiredService<ISaasDbService>();
}
/// <summary>
/// 列表
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public DataResult<List<CodeOrderContactRes>> GetListByPage(PageRequest request)
{
var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
//序列化查询条件
var whereList = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(request.QueryCondition);
var data = tenantDb.Queryable<CodeOrderContact>()
.Where(whereList)
.Select<CodeOrderContactRes>().ToQueryPage(request.PageCondition);
return data;
}
/// <summary>
/// 编辑
/// </summary>
/// <param name="req"></param>
/// <returns></returns>
public DataResult EditOrderContact(CodeOrderContactReq req)
{
var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
//var orgId = user.GetOrgId();
if (req.Id == 0)
{
if (tenantDb.Queryable<CodeOrderContact>()
.Where(x => x.CustomerType == req.CustomerType && x.CustomerId == req.CustomerId && x.Name == req.Name).Any())
{
return DataResult.Failed("订单关系人设置已存在!", MultiLanguageConst.OrderContactExist);
}
var data = req.Adapt<CodeOrderContact>();
var entity = tenantDb.Insertable(data).ExecuteReturnEntity();
return DataResult.Successed("添加成功!", entity.Id, MultiLanguageConst.DataCreateSuccess);
}
else
{
var info = tenantDb.Queryable<CodeOrderContact>().Where(x => x.Id == req.Id).First();
info = req.Adapt(info);
tenantDb.Updateable(info).IgnoreColumns("DefaultContent").IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand();
return DataResult.Successed("更新成功!", MultiLanguageConst.DataUpdateSuccess);
}
}
/// <summary>
/// 详情
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public DataResult<CodeOrderContactRes> GetOrderContactInfo(string id)
{
var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
var data = tenantDb.Queryable<CodeOrderContact>()
.Where(x => x.Id == long.Parse(id) && x.Status == StatusEnum.Enable)
.Select<CodeOrderContactRes>()
.First();
return DataResult<CodeOrderContactRes>.Success(data, MultiLanguageConst.DataQuerySuccess);
}
public DataResult DelOrderContact(string id)
{
var info = db.Queryable<CodeOrderContact>().Where(x => x.Id == long.Parse(id)).First();
if (info == null)
{
return DataResult.Failed("订单关系人设置不存在!", MultiLanguageConst.OrderContactNotExist);
}
db.Deleteable(info).ExecuteCommand();
return DataResult.Successed("删除成功!", MultiLanguageConst.DataDelSuccess);
}
public DataResult BatchDelOrderContact(IdModel req)
{
var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
var list = tenantDb.Queryable<CodeOrderContact>().Where(x => req.Ids.Contains(x.Id)).ToList();
if (list.Count > 0)
{
tenantDb.Deleteable(list).ExecuteCommand();
}
return DataResult.Successed("删除成功!", MultiLanguageConst.DataDelSuccess);
}
public DataResult<List<CodeOrderContactRes>> GetOrderContactListByClientId(string id)
{
var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
var data = tenantDb.Queryable<CodeOrderContact>()
.Where(x => x.CustomerId == long.Parse(id) && x.Status == StatusEnum.Enable)
.Select<CodeOrderContactRes>()
.ToList();
return DataResult<List<CodeOrderContactRes>>.Success(data, MultiLanguageConst.DataQuerySuccess);
}
}

@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using DS.WMS.Core.Info.Dtos;
namespace DS.WMS.Core.Op.Interface
{
@ -39,5 +40,11 @@ namespace DS.WMS.Core.Op.Interface
/// <param name="req"></param>
/// <returns></returns>
public DataResult BatchDelBusinessOrderContact(IdModel req);
/// <summary>
/// 根据客户Id获取联系人
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public DataResult<List<ClientContactRes>> GetOrderContactListByClientId(string id);
}
}

@ -3,6 +3,9 @@ using DS.Module.Core.Data;
using DS.Module.Core.Extensions;
using DS.Module.SqlSugar;
using DS.Module.UserModule;
using DS.WMS.Core.Code.Dtos;
using DS.WMS.Core.Info.Dtos;
using DS.WMS.Core.Info.Entity;
using DS.WMS.Core.Map.Entity;
using DS.WMS.Core.Op.Dtos;
using DS.WMS.Core.Op.Entity;
@ -93,5 +96,15 @@ namespace DS.WMS.Core.Op.Method
}
return DataResult.Successed("删除成功!", MultiLanguageConst.DataDelSuccess);
}
public DataResult<List<ClientContactRes>> GetOrderContactListByClientId(string id)
{
var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
var data = tenantDb.Queryable<InfoClientContact>()
.Where(x => x.ClientId == long.Parse(id) && x.Status == StatusEnum.Enable)
.Select<ClientContactRes>()
.ToList();
return DataResult<List<ClientContactRes>>.Success(data, MultiLanguageConst.DataQuerySuccess);
}
}
}

@ -1211,11 +1211,11 @@ namespace DS.WMS.Core.Op.Method
{
return DataResult.Failed($"模板EXCEL文件未找到请联系管理员");
}
if (order.YardContactId == 0)
if (order.YardId == 0)
{
return DataResult.Failed("请选择场站关系人");
return DataResult.Failed("请选择场站");
}
var yardContact = tenantDb.Queryable<CodeOrderContact>().First(x => x.Id == order.YardContactId);
var yardContact = tenantDb.Queryable<BusinessOrderContact>().First(x => x.BusinessId == order.Id && x.CustomerId == order.YardId);
if (yardContact.IsNull())
{
return DataResult.Failed("场站关系人不存在");
@ -1461,7 +1461,7 @@ namespace DS.WMS.Core.Op.Method
{
ftpset = tenantDb.Queryable<CodeEdiSet>().First(f => f.EdiTypeCode == "XHZ_JIEFENG");
}
var yardContact = tenantDb.Queryable<CodeOrderContact>().First(x => x.Id == order.YardContactId);
var yardContact = tenantDb.Queryable<BusinessOrderContact>().First(x => x.BusinessId == order.Id && x.CustomerId == order.YardId);
if (yardContact.IsNull())
{
return DataResult.Failed("场站关系人不存在");
@ -1825,11 +1825,11 @@ namespace DS.WMS.Core.Op.Method
}
else //邮件方式
{
if (order.YardContactId == 0)
if (order.YardId == 0)
{
return DataResult.Failed("请选择场站关系人");
return DataResult.Failed("请选择场站");
}
var yardContact = tenantDb.Queryable<CodeOrderContact>().First(x => x.Id == order.YardContactId);
var yardContact = tenantDb.Queryable<BusinessOrderContact>().First(x => x.BusinessId == order.Id && x.CustomerId == order.YardId);
if (yardContact.IsNull())
{
return DataResult.Failed("场站关系人不存在");

@ -629,6 +629,7 @@ public partial class SeaExportService : ISeaExportService
Name = defaultContact.ShortName,
Tel = defaultContact.Tel,
Email = defaultContact.Email,
CustomerContactId = defaultContact.Id
});
}
}
@ -650,6 +651,7 @@ public partial class SeaExportService : ISeaExportService
Name = defaultContact.ShortName,
Tel = defaultContact.Tel,
Email = defaultContact.Email,
CustomerContactId = defaultContact.Id
});
}
}
@ -671,9 +673,8 @@ public partial class SeaExportService : ISeaExportService
Name = defaultContact.ShortName,
Tel = defaultContact.Tel,
Email = defaultContact.Email,
CustomerContactId = defaultContact.Id
});
//todo
seaExport.YardContactId = defaultContact.Id;
}
}
}
@ -694,6 +695,7 @@ public partial class SeaExportService : ISeaExportService
Name = defaultContact.ShortName,
Tel = defaultContact.Tel,
Email = defaultContact.Email,
CustomerContactId = defaultContact.Id
});
}
}

@ -1,89 +0,0 @@
using DS.Module.Core;
using DS.Module.Core.Data;
using DS.WMS.Core.Code.Dtos;
using DS.WMS.Core.Code.Interface;
using DS.WMS.Core.Sys.Dtos;
using DS.WMS.Core.Sys.Interface;
using Microsoft.AspNetCore.Mvc;
namespace DS.WMS.MainApi.Controllers;
/// <summary>
/// 订单关系人设置 模块
/// </summary>
public class OrderContactController : ApiController
{
private readonly IOrderContactService _invokeService;
/// <summary>
/// 构造函数
/// </summary>
/// <param name="invokeService"></param>
public OrderContactController(IOrderContactService invokeService)
{
_invokeService = invokeService;
}
/// <summary>
/// 列表
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpPost]
[Route("GetOrderContactList")]
public DataResult<List<CodeOrderContactRes>> GetOrderContactList([FromBody] PageRequest request)
{
var res = _invokeService.GetListByPage(request);
return res;
}
/// <summary>
/// 编辑
/// </summary>
/// <param name="req"></param>
/// <returns></returns>
[HttpPost]
[Route("EditOrderContact")]
public DataResult EditOrderContact([FromBody] CodeOrderContactReq req)
{
var res = _invokeService.EditOrderContact(req);
return res;
}
/// <summary>
/// 详情
/// </summary>
/// <param name="id">Id</param>
/// <returns></returns>
[HttpGet]
[Route("GetOrderContactInfo")]
public DataResult<CodeOrderContactRes> GetOrderContactInfo([FromQuery] string id)
{
var res = _invokeService.GetOrderContactInfo(id);
return res;
}
/// <summary>
/// 根据客户Id获取订单关系人列表
/// </summary>
/// <param name="id">Id</param>
/// <returns></returns>
[HttpGet]
[Route("GetOrderContactListByClientId")]
public DataResult<List<CodeOrderContactRes>> GetOrderContactListByClientId([FromQuery] string id)
{
var res = _invokeService.GetOrderContactListByClientId(id);
return res;
}
/// <summary>
/// 批量删除
/// </summary>
/// <param name="req">req</param>
/// <returns></returns>
[HttpPost]
[Route("BatchDelOrderContact")]
public DataResult BatchDelOrderContact([FromBody] IdModel req)
{
var res = _invokeService.BatchDelOrderContact(req);
return res;
}
}

@ -2,6 +2,7 @@ using DS.Module.Core;
using DS.Module.Core.Data;
using DS.WMS.Core.Code.Dtos;
using DS.WMS.Core.Code.Interface;
using DS.WMS.Core.Info.Dtos;
using DS.WMS.Core.Op.Dtos;
using DS.WMS.Core.Op.Interface;
using Microsoft.AspNetCore.Mvc;
@ -76,8 +77,19 @@ public class BusinessOrderContactController : ApiController
var res = _invokeService.BatchDelBusinessOrderContact(req);
return res;
}
/// <summary>
/// 根据客户Id获取联系人
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpGet]
[Route("GetOrderContactListByClientId")]
public DataResult<List<ClientContactRes>> GetOrderContactListByClientId([FromQuery] string id)
{
var res = _invokeService.GetOrderContactListByClientId(id);
return res;
}
}

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\Code\DS\ds8-solution-pro\ds-wms-service\DS.WMS.OpApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
</PropertyGroup>

Loading…
Cancel
Save