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

修改往来单位所属分部为多选

Browse Source
usertest
嵇文龙 4 months ago
parent 317ae49794
commit d5113c3171
4 changed files with 112 additions and 98 deletions
Show Stats Download Patch File Download Diff File

31
ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoReq.cs
Unescape Escape View File

@ -16,7 +16,6 @@ public class ClientInfoReq
/// </summary>
public long Id { get; set; }
/// <summary>
/// Desc:客户代码
/// </summary>
@ -103,7 +102,6 @@ public class ClientInfoReq
/// </summary>
public string City { get; set; }
/// <summary>
/// Desc:提单信息
/// </summary>
@ -112,7 +110,7 @@ public class ClientInfoReq
/// <summary>
/// Desc:是否停用
/// </summary>
public bool? IsStop { get; set; } = false;
public bool IsStop { get; set; }
///// <summary>
///// Desc:发票抬头1
@ -306,7 +304,7 @@ public class ClientInfoReq
/// <summary>
/// 审批状态
/// </summary>
public AuditStatusEnum? AuditStatus { get; set; } = AuditStatusEnum.Approve;
public AuditStatusEnum AuditStatus { get; set; } = AuditStatusEnum.Approve;
/// <summary>
/// 审批时间
@ -341,19 +339,25 @@ public class ClientInfoReq
public string InvoiceAddrTel { get; set; }
/// <summary>
/// Desc:所属分部
/// 所属分部
/// </summary>
public long[]? SaleOrgIdList { get; set; }
/// <summary>
/// 所属分部值
/// </summary>
public long? SaleOrgId { get; set; }
[IgnoreDataMember]
public string? SaleOrgId => SaleOrgIdList == null ? null : string.Join(",", SaleOrgIdList);
/// <summary>
/// Desc:提成比例
/// </summary>
public decimal? CommissionRate { get; set; } = 0;
public decimal CommissionRate { get; set; }
/// <summary>
/// Desc:分成比例
/// </summary>
public decimal? ProportionRate { get; set; } = 0;
public decimal ProportionRate { get; set; }
/// <summary>
/// Desc:提成参与人
@ -374,7 +378,7 @@ public class ClientInfoReq
/// <summary>
/// Desc: 客服
/// </summary>
public long CustomerService { get; set; } = 0;
public long CustomerService { get; set; }
/// <summary>
/// Desc:英文简称
@ -386,16 +390,15 @@ public class ClientInfoReq
/// </summary>
public string WMSFeeRateType { get; set; }
/// <summary>
/// 状态 0 启用 1 禁用
/// </summary>
public StatusEnum? Status { get; set; } = StatusEnum.Enable;
public StatusEnum Status { get; set; } = StatusEnum.Enable;
/// <summary>
/// 备注
/// </summary>
public string Note { get; set; } = "";
public string Note { get; set; }
/// <summary>
/// 客户标识
@ -426,9 +429,9 @@ public class ClientInfoReq
return PushNotification.None;
PushNotification flags = PushNotification.None;
for (int i = 0; i < Notifications.Length; i++)
for (int i = 0; i < Notifications.Length; i++)
flags |= Notifications[i];
return flags;
}
}

40
ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoRes.cs
Unescape Escape View File

@ -1,6 +1,7 @@
using System.Runtime.Serialization;
using DS.Module.Core;
using DS.Module.Core.Enums;
using DS.Module.Core.Extensions;
using DS.WMS.Core.Info.Entity;
using Masuit.Tools.Systems;
@ -86,7 +87,6 @@ public class ClientInfoRes
/// </summary>
public long Doc { get; set; }
/// <summary>
/// Desc:国家
/// </summary>
@ -102,7 +102,6 @@ public class ClientInfoRes
/// </summary>
public string City { get; set; }
/// <summary>
/// Desc:提单信息
/// </summary>
@ -111,7 +110,7 @@ public class ClientInfoRes
/// <summary>
/// Desc:是否停用
/// </summary>
public bool? IsStop { get; set; } = false;
public bool IsStop { get; set; }
///// <summary>
///// Desc:发票抬头1
@ -224,7 +223,6 @@ public class ClientInfoRes
/// </summary>
public string Level { get; set; }
/// <summary>
/// Desc:QQ
/// </summary>
@ -235,7 +233,6 @@ public class ClientInfoRes
/// </summary>
public string MSN { get; set; }
/// <summary>
/// Desc:财务应收账款代码
/// </summary>
@ -305,7 +302,7 @@ public class ClientInfoRes
/// <summary>
/// 审批状态
/// </summary>
public AuditStatusEnum? AuditStatus { get; set; } = AuditStatusEnum.Approve;
public AuditStatusEnum AuditStatus { get; set; } = AuditStatusEnum.Approve;
/// <summary>
/// 审批时间
@ -317,14 +314,11 @@ public class ClientInfoRes
/// </summary>
public string AuditNote { get; set; }
/// <summary>
/// Desc:默认付费方式
/// </summary>
public string FeeFRT { get; set; }
/// <summary>
/// Desc:业务来源Id
/// </summary>
@ -341,19 +335,31 @@ public class ClientInfoRes
public string InvoiceAddrTel { get; set; }
/// <summary>
/// Desc:所属分部
/// 所属分部值
/// </summary>
[IgnoreDataMember]
public string? SaleOrgId { get; set; }
/// <summary>
/// 所属分部
/// </summary>
public long[] SaleOrgIdList => SaleOrgId.IsNullOrEmpty() ? [] :
SaleOrgId.Split([','], StringSplitOptions.RemoveEmptyEntries).Select(long.Parse).ToArray();
/// <summary>
/// 所属分部名称
/// </summary>
public long? SaleOrgId { get; set; }
public string? SaleOrgNames { get; set; }
/// <summary>
/// Desc:提成比例
/// </summary>
public decimal? CommissionRate { get; set; } = 0;
public decimal CommissionRate { get; set; }
/// <summary>
/// Desc:分成比例
/// </summary>
public decimal? ProportionRate { get; set; } = 0;
public decimal ProportionRate { get; set; }
/// <summary>
/// Desc:提成参与人
@ -370,11 +376,10 @@ public class ClientInfoRes
/// </summary>
public string CtnType { get; set; }
/// <summary>
/// Desc: 客服
/// </summary>
public long CustomerService { get; set; } = 0;
public long CustomerService { get; set; }
/// <summary>
/// Desc:英文简称
@ -389,13 +394,12 @@ public class ClientInfoRes
/// <summary>
/// 状态 0 启用 1 禁用
/// </summary>
public StatusEnum? Status { get; set; } = StatusEnum.Enable;
public StatusEnum Status { get; set; } = StatusEnum.Enable;
/// <summary>
/// 备注
/// </summary>
public string Note { get; set; } = "";
public string Note { get; set; }
/// <summary>
/// 创建时间

113
ds-wms-service/DS.WMS.Core/Info/Entity/InfoClient.cs
Unescape Escape View File

@ -12,7 +12,7 @@ namespace DS.WMS.Core.Info.Entity;
public class InfoClient : BaseModelV2<long>
{
/// <summary>
/// Desc:客户代码
/// 客户代码（助记码）
/// </summary>
[SugarColumn(ColumnDescription = "客户代码", IsNullable = false, Length = 20)]
public string CodeName { get; set; }
@ -27,19 +27,19 @@ public class InfoClient : BaseModelV2<long>
/// Desc:客户中文名称或描述信息
/// </summary>
[SugarColumn(ColumnDescription = "客户中文名称或描述信息", IsNullable = true, Length = 50)]
public string Description { get; set; }
public string? Description { get; set; }
/// <summary>
/// Desc:客户英文简称
/// </summary>
[SugarColumn(ColumnDescription = "客户英文简称", IsNullable = true, Length = 50)]
public string Name { get; set; }
public string? Name { get; set; }
/// <summary>
/// Desc:客户英文全称
/// </summary>
[SugarColumn(ColumnDescription = "客户英文全称", IsNullable = true, Length = 50)]
public string EnFullName { get; set; }
public string? EnFullName { get; set; }
/// <summary>
/// Desc:客户状态
@ -51,7 +51,7 @@ public class InfoClient : BaseModelV2<long>
/// Desc:通讯地址
/// </summary>
[SugarColumn(ColumnDescription = "通讯地址", IsNullable = true, Length = 1000)]
public string Address { get; set; }
public string? Address { get; set; }
/// <summary>
/// Desc:邮箱
@ -63,75 +63,74 @@ public class InfoClient : BaseModelV2<long>
/// Desc:网页
/// </summary>
[SugarColumn(ColumnDescription = "网页", IsNullable = true, Length = 50)]
public string Web { get; set; }
public string? Web { get; set; }
/// <summary>
/// Desc:电话
/// </summary>
[SugarColumn(ColumnDescription = "电话", IsNullable = true, Length = 50)]
public string Tel { get; set; }
public string? Tel { get; set; }
/// <summary>
/// Desc:传真
/// </summary>
[SugarColumn(ColumnDescription = "传真", IsNullable = true, Length = 50)]
public string Fax { get; set; }
public string? Fax { get; set; }
/// <summary>
/// Desc:负责人
/// </summary>
[SugarColumn(ColumnDescription = "负责人", IsNullable = true, Length = 20)]
public string Chief { get; set; }
public string? Chief { get; set; }
/// <summary>
/// Desc:所属揽货人
/// </summary>
[SugarColumn(ColumnDescription = "所属揽货人", IsNullable = true)]
public long SaleId { get; set; }
public long? SaleId { get; set; }
/// <summary>
/// Desc:所属操作人
/// </summary>
[SugarColumn(ColumnDescription = "所属操作人", IsNullable = true)]
public long Op { get; set; }
public long? Op { get; set; }
/// <summary>
/// Desc:所属单证
/// </summary>
[SugarColumn(ColumnDescription = "所属单证", IsNullable = true)]
public long Doc { get; set; }
public long? Doc { get; set; }
/// <summary>
/// Desc:国家
/// </summary>
[SugarColumn(ColumnDescription = "国家", Length = 50, IsNullable = true)]
public string Country { get; set; }
public string? Country { get; set; }
/// <summary>
/// Desc:省或州
/// </summary>
[SugarColumn(ColumnDescription = "省或州", Length = 50, IsNullable = true)]
public string Province { get; set; }
public string? Province { get; set; }
/// <summary>
/// Desc:城市
/// </summary>
[SugarColumn(ColumnDescription = "城市", Length = 50, IsNullable = true)]
public string City { get; set; }
public string? City { get; set; }
/// <summary>
/// Desc:提单信息
/// </summary>
[SugarColumn(ColumnDescription = "提单信息", Length = 600, IsNullable = true)]
public string BLContent { get; set; }
public string? BLContent { get; set; }
/// <summary>
/// Desc:是否停用该客户信息
/// </summary>
[SugarColumn(ColumnDescription = "是否停用该客户信息", DefaultValue = "0")]
public bool? IsStop { get; set; } = false;
public bool IsStop { get; set; }
///// <summary>
///// Desc:发票抬头1
@ -264,84 +263,79 @@ public class InfoClient : BaseModelV2<long>
/// Desc:等级
/// </summary>
[SugarColumn(ColumnDescription = "等级", Length = 1, IsNullable = true)]
public string Level { get; set; }
public string? Level { get; set; }
/// <summary>
/// Desc:QQ
/// </summary>
[SugarColumn(ColumnDescription = "QQ", Length = 50, IsNullable = true)]
public string QQ { get; set; }
public string? QQ { get; set; }
/// <summary>
/// Desc:MSN
/// </summary>
[SugarColumn(ColumnDescription = "MSN", Length = 50, IsNullable = true)]
public string MSN { get; set; }
public string? MSN { get; set; }
/// <summary>
/// Desc:财务应收账款代码
/// </summary>
[SugarColumn(ColumnDescription = "财务应收账款代码", Length = 50, IsNullable = true)]
public string FARCode { get; set; }
public string? FARCode { get; set; }
/// <summary>
/// Desc:财务应付账款代码
/// </summary>
[SugarColumn(ColumnDescription = "财务应付账款代码", Length = 50, IsNullable = true)]
public string FAPCode { get; set; }
public string? FAPCode { get; set; }
/// <summary>
/// Desc:冷藏费率
/// </summary>
[SugarColumn(ColumnDescription = "冷藏费率", Length = 50, DefaultValue = "0", IsNullable = true)]
public string UnitPrice { get; set; }
public string? UnitPrice { get; set; }
/// <summary>
/// Desc:企业备案号
/// </summary>
[SugarColumn(ColumnDescription = "企业备案号", Length = 50, IsNullable = true)]
public string RegistrationNo { get; set; }
public string? RegistrationNo { get; set; }
/// <summary>
/// Desc:财务序号
/// </summary>
[SugarColumn(ColumnDescription = "财务序号", Length = 50, IsNullable = true)]
public string OrderNo { get; set; }
public string? OrderNo { get; set; }
/// <summary>
/// Desc:纳税人识别号
/// </summary>
[SugarColumn(ColumnDescription = "纳税人识别号", Length = 30, IsNullable = true)]
public string TaxNo { get; set; }
public string? TaxNo { get; set; }
/// <summary>
/// Desc:EDI代码
/// </summary>
[SugarColumn(ColumnDescription = "EDI代码", Length = 20, IsNullable = true)]
public string EDICode { get; set; }
public string? EDICode { get; set; }
/// <summary>
/// Desc:EDI代码2
/// </summary>
[SugarColumn(ColumnDescription = "EDI代码2", Length = 20, IsNullable = true)]
public string EDICode2 { get; set; }
public string? EDICode2 { get; set; }
/// <summary>
/// Desc:EDI代码3
/// </summary>
[SugarColumn(ColumnDescription = "EDI代码3", Length = 20, IsNullable = true)]
public string EDICode3 { get; set; }
public string? EDICode3 { get; set; }
/// <summary>
/// Desc:组织机构代码
/// </summary>
[SugarColumn(ColumnDescription = "组织机构代码", Length = 50, IsNullable = true)]
public string OrganizationCode { get; set; }
public string? OrganizationCode { get; set; }
/// <summary>
/// 所属集团ID
@ -359,32 +353,32 @@ public class InfoClient : BaseModelV2<long>
/// Desc:企业商检备案号
/// </summary>
[SugarColumn(ColumnDescription = "商检备案号", Length = 50, IsNullable = true)]
public string InspectionNo { get; set; }
public string? InspectionNo { get; set; }
/// <summary>
/// 审批状态
/// </summary>
[SugarColumn(ColumnDescription = "审批状态", DefaultValue = "0")]
public AuditStatusEnum? AuditStatus { get; set; } = AuditStatusEnum.Approve;
public AuditStatusEnum AuditStatus { get; set; } = AuditStatusEnum.Approve;
/// <summary>
/// 审批时间
/// </summary>
[SugarColumn(ColumnDescription = "审批时间", IsNullable = true)]
public DateTime? AuditTime { get; set; }
/// <summary>
/// 审批意见
/// </summary>
[SugarColumn(ColumnDescription = "审批意见", Length = 100, IsNullable = true)]
public string AuditNote { get; set; }
public string? AuditNote { get; set; }
/// <summary>
/// Desc:默认付费方式
/// </summary>
[SugarColumn(ColumnDescription = "默认付费方式", Length = 20, IsNullable = true)]
public string FeeFRT { get; set; }
public string? FeeFRT { get; set; }
/// <summary>
/// Desc:业务来源Id
/// </summary>
@ -395,92 +389,91 @@ public class InfoClient : BaseModelV2<long>
/// Desc:发票银行
/// </summary>
[SugarColumn(ColumnDescription = "发票银行", Length = 150, IsNullable = true)]
public string InvoiceBank { get; set; }
public string? InvoiceBank { get; set; }
/// <summary>
/// Desc:发票地址电话
/// </summary>
[SugarColumn(ColumnDescription = "发票地址电话", Length = 200, IsNullable = true)]
public string InvoiceAddrTel { get; set; }
public string? InvoiceAddrTel { get; set; }
/// <summary>
/// Desc:所属分部
/// 所属分部
/// </summary>
[SugarColumn(ColumnDescription = "所属分部")]
public long? SaleOrgId { get; set; }
[SugarColumn(ColumnDescription = "所属分部", IsNullable = true)]
public string? SaleOrgId { get; set; }
/// <summary>
/// Desc:提成比例
/// </summary>
[SugarColumn(ColumnDescription = "提成比例", Length = 18, DecimalDigits = 2, DefaultValue = "0")]
public decimal? CommissionRate { get; set; } = 0;
public decimal CommissionRate { get; set; } = 0;
/// <summary>
/// Desc:分成比例
/// </summary>
[SugarColumn(ColumnDescription = "分成比例", Length = 18, DecimalDigits = 2, DefaultValue = "0")]
public decimal? ProportionRate { get; set; } = 0;
public decimal ProportionRate { get; set; } = 0;
/// <summary>
/// Desc:提成参与人
/// </summary>
[SugarColumn(ColumnDescription = "提成参与人", IsNullable = true)]
public long CommissionUserId { get; set; }
public long? CommissionUserId { get; set; }
/// <summary>
/// Desc:运输公司列表
/// </summary>
[SugarColumn(ColumnDescription = "运输公司列表", Length = 200, IsNullable = true)]
public string CarrierList { get; set; }
public string? CarrierList { get; set; }
/// <summary>
/// Desc:集装箱尺寸
/// </summary>
[SugarColumn(ColumnDescription = "集装箱尺寸", Length = 50, IsNullable = true)]
public string CtnType { get; set; }
public string? CtnType { get; set; }
/// <summary>
/// Desc: 客服
/// </summary>
[SugarColumn(ColumnDescription = "客服")]
public long CustomerService { get; set; } = 0;
public long CustomerService { get; set; }
/// <summary>
/// Desc:英文简称
/// </summary>
[SugarColumn(ColumnDescription = "英文简称", Length = 50, IsNullable = true)]
public string EnShortName { get; set; }
public string? EnShortName { get; set; }
/// <summary>
/// Desc:仓储费开始日期模式
/// </summary>
[SugarColumn(ColumnDescription = "仓储费开始日期模式", Length = 50, IsNullable = true)]
public string WMSFeeRateType { get; set; }
public string? WMSFeeRateType { get; set; }
/// <summary>
/// 揽货人名字
/// </summary>
[SugarColumn(ColumnDescription = "揽货人名字", Length = 50, IsNullable = true)]
public string SaleName { get; set; }
public string? SaleName { get; set; }
/// <summary>
/// 操作名字
/// </summary>
[SugarColumn(ColumnDescription = "操作名字", Length = 50, IsNullable = true)]
public string OpName { get; set; }
public string? OpName { get; set; }
/// <summary>
/// 单证名字
/// </summary>
[SugarColumn(ColumnDescription = "单证名字", Length = 50, IsNullable = true)]
public string DocName { get; set; }
public string? DocName { get; set; }
/// <summary>
/// 客服名字
/// </summary>
[SugarColumn(ColumnDescription = "客服名字", Length = 50, IsNullable = true)]
public string CustomerServiceName { get; set; }
public string? CustomerServiceName { get; set; }
/// <summary>
/// 是否共享

26
ds-wms-service/DS.WMS.Core/Info/Method/ClientInfoService.cs
Unescape Escape View File

@ -7,6 +7,7 @@ using DS.WMS.Core.Info.Dtos;
using DS.WMS.Core.Info.Entity;
using DS.WMS.Core.Info.Interface;
using DS.WMS.Core.Op.Entity;
using DS.WMS.Core.Sys.Entity;
using Mapster;
namespace DS.WMS.Core.Info.Method;
@ -34,11 +35,24 @@ public class ClientInfoService : ServiceBase, IClientInfoService
long orgId = User.OrgId;
//序列化查询条件
var whereList = request.GetConditionalModels(Db);
var data = TenantDb.Queryable<InfoClient>()
var result = TenantDb.Queryable<InfoClient>()
.Where(x => x.OrgId == orgId || x.IsShared)
.Where(whereList)
.Select<ClientInfoRes>().ToQueryPage(request.PageCondition);
return data;
if (result.Data?.Count > 0)
{
var ids = result.Data.SelectMany(x => x.SaleOrgIdList).Distinct();
var orgs = Db.Queryable<SysOrg>().Where(x => ids.Contains(x.Id)).Select(x => new { x.Id, x.OrgName }).ToList();
foreach (var item in result.Data)
{
var list = orgs.FindAll(x => item.SaleOrgIdList.Contains(x.Id));
item.SaleOrgNames = string.Join(",", list.Select(x => x.OrgName));
}
}
return result;
}
/// <summary>
@ -50,10 +64,10 @@ public class ClientInfoService : ServiceBase, IClientInfoService
{
if (req.Id == 0)
{
if (TenantDb.Queryable<InfoClient>().Where(x => x.CodeName == req.CodeName).Any())
{
return DataResult.Failed("客户信息已存在!", MultiLanguageConst.ClientInfoExist);
}
//if (TenantDb.Queryable<InfoClient>().Where(x => x.CodeName == req.CodeName).Any())
//{
// return DataResult.Failed("客户信息已存在!", MultiLanguageConst.ClientInfoExist);
//}
var data = req.Adapt<InfoClient>();
var tag = req.ClientTag.Adapt<InfoClientTag>();

Write Preview
Loading…
Cancel
Save