From ac7a048f9509db03c7193891652a501495842f9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ZR20090193-=E9=99=88=E6=95=AC=E5=8B=87?= Date: Sun, 28 Apr 2024 18:08:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E7=9B=B8=E5=85=B3=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DS.WMS.Core/Fee/Dtos/FeeCodeReq.cs | 4 +- .../DS.WMS.Core/Fee/Dtos/FeeCodeRes.cs | 4 +- .../DS.WMS.Core/Fee/Dtos/FeeCodeSelectRes.cs | 106 +++++ .../Fee/Dtos/FeeCurrencySelectRes.cs | 40 ++ .../Fee/Dtos/FeeCustTemplateDetailReq.cs | 2 +- .../Fee/Dtos/FeeCustTemplateDetailRes.cs | 2 +- .../DS.WMS.Core/Fee/Dtos/FeeRecordReq.cs | 2 +- .../DS.WMS.Core/Fee/Dtos/FeeRecordRes.cs | 2 +- .../Fee/Dtos/FeeTemplateDetailReq.cs | 2 +- .../Fee/Dtos/FeeTemplateDetailRes.cs | 2 +- .../DS.WMS.Core/Fee/Entity/FeeCode.cs | 8 +- .../Fee/Entity/FeeCustTemplateDetail.cs | 4 +- .../DS.WMS.Core/Fee/Entity/FeeRecord.cs | 4 +- .../Fee/Entity/FeeTemplateDetail.cs | 4 +- .../System/Interface/IClientCommonService.cs | 22 +- .../System/Method/ClientCommonService.cs | 438 +++++++++++------- .../System/Method/CommonService.cs | 2 +- .../Controllers/FeeCodeController.cs | 66 +++ .../Controllers/FeeRecordController.cs | 66 +++ .../Controllers/ClientCommonController.cs | 49 +- .../DS.WMS.MainApi/Logs/internal-nlog.txt | 14 + 21 files changed, 644 insertions(+), 199 deletions(-) create mode 100644 ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCodeSelectRes.cs create mode 100644 ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCurrencySelectRes.cs create mode 100644 ds-wms-service/DS.WMS.FeeApi/Controllers/FeeCodeController.cs create mode 100644 ds-wms-service/DS.WMS.FeeApi/Controllers/FeeRecordController.cs diff --git a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCodeReq.cs b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCodeReq.cs index 416a5a3d..3443d3d5 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCodeReq.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCodeReq.cs @@ -38,11 +38,11 @@ public class FeeCodeReq /// /// 默认收费客户类型 /// - public int DefaultDebit { get; set; } + public string DefaultDebit { get; set; } /// /// 默认付费客户类型 /// - public int DefaultCredit { get; set; } + public string DefaultCredit { get; set; } /// /// 海运 海运相关模块使用 /// diff --git a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCodeRes.cs b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCodeRes.cs index 844842b6..8aa766b0 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCodeRes.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCodeRes.cs @@ -38,11 +38,11 @@ public class FeeCodeRes /// /// 默认收费客户类型 /// - public int DefaultDebit { get; set; } + public string DefaultDebit { get; set; } /// /// 默认付费客户类型 /// - public int DefaultCredit { get; set; } + public string DefaultCredit { get; set; } /// /// 海运 海运相关模块使用 /// diff --git a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCodeSelectRes.cs b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCodeSelectRes.cs new file mode 100644 index 00000000..9cc43e26 --- /dev/null +++ b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCodeSelectRes.cs @@ -0,0 +1,106 @@ +using DS.Module.Core; +using SqlSugar; + +namespace DS.WMS.Core.Fee.Dtos; + +/// +/// 费用代码下拉返回实体 +/// +public class FeeCodeSelectRes +{ + /// + /// 主键Id + /// + public long Id { get; set; } + + /// + /// 费用代码 录入费用是作为检索 + /// + public string Code { get; set; } + /// + /// 费用名称 + /// + public string Name { get; set; } + + /// + /// 费用英文名称 + /// + public string EnName { get; set; } + /// + /// 币别Id + /// + public long CurrencyId { get; set; } + + /// + /// 默认计费标准 + /// + public int DefaultUnit { get; set; } + /// + /// 默认收费客户类型 + /// + public string DefaultDebit { get; set; } + /// + /// 默认付费客户类型 + /// + public string DefaultCredit { get; set; } + /// + /// 海运 海运相关模块使用 + /// + public bool? IsSea { get; set; } = false; + /// + /// 空运 空运相关模块使用 + /// + public bool? IsAir { get; set; } = false; + + /// + /// 陆运 陆运相关模块使用 + /// + public bool? IsTrucking { get; set; } = false; + /// + /// 是否陆运固定费用 + /// + public bool? IsTruckingFixed { get; set; } = false; + /// + /// 仓储 仓储相关模块使用 + /// + public bool? IsWms { get; set; } = false; + /// + /// 是否垫付费用 + /// + public bool? IsAdvancedPay { get; set; } = false; + /// + /// 默认是否机密 + /// + public bool? IsOpen { get; set; } = false; + /// + /// 默认是否开票 + /// + public bool? IsInvoice { get; set; } = false; + /// + /// 费用默认税率 + /// + public decimal? TaxRate { get; set; } + /// + /// 费用分组 枚举可维护 + /// + public string FeeGroup { get; set; } + /// + /// 费用默认FRT 枚举可维护 + /// + public string FeeFrt { get; set; } + + /// + /// 默认发票费用名称 发票费用名称模块可维护 + /// + public string GoodName { get; set; } + + /// + /// 对帐类型 枚举可维护 + /// + public string CheckingType { get; set; } + /// + /// 默认币别 + /// + public string DefaultCurrency { get; set; } + +} \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCurrencySelectRes.cs b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCurrencySelectRes.cs new file mode 100644 index 00000000..5e5c034f --- /dev/null +++ b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCurrencySelectRes.cs @@ -0,0 +1,40 @@ +using DS.Module.Core; +using SqlSugar; + +namespace DS.WMS.Core.Fee.Dtos; + +/// +/// 币别信息下拉选择返回实体 +/// +public class FeeCurrencySelectRes +{ + /// + /// 主键Id + /// + public long Id { get; set; } + + /// + /// 币别代码 + /// + public string CodeName { get; set; } + + /// + /// 币别名称 + /// + public string Name { get; set; } + + /// + /// 描述 + /// + public string Description { get; set; } + /// + /// 财务软件代码 + /// + public string FinanceSoftCode { get; set; } + + + /// + /// 默认对人民币汇率 + /// + public decimal? DefaultRate { get; set; } +} \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCustTemplateDetailReq.cs b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCustTemplateDetailReq.cs index 3b01cd79..afb53e1c 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCustTemplateDetailReq.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCustTemplateDetailReq.cs @@ -32,7 +32,7 @@ public class FeeCustTemplateDetailReq /// /// 结算对象类型 /// - public int CustomerType { get; set; } + public string CustomerType { get; set; } /// /// 收付类型（收、付） /// diff --git a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCustTemplateDetailRes.cs b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCustTemplateDetailRes.cs index d7889c37..8a119d6b 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCustTemplateDetailRes.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCustTemplateDetailRes.cs @@ -32,7 +32,7 @@ public class FeeCustTemplateDetailRes /// /// 结算对象类型 /// - public int CustomerType { get; set; } + public string CustomerType { get; set; } /// /// 收付类型（收、付） /// diff --git a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeRecordReq.cs b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeRecordReq.cs index 06bdc786..a4b14ea7 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeRecordReq.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeRecordReq.cs @@ -49,7 +49,7 @@ public class FeeRecordReq /// /// 费用对象类型 /// - public int CustomerType { get; set; } + public string CustomerType { get; set; } /// /// 费用标准 diff --git a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeRecordRes.cs b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeRecordRes.cs index d430fd13..833353df 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeRecordRes.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeRecordRes.cs @@ -50,7 +50,7 @@ public class FeeRecordRes /// /// 费用对象类型 /// - public int CustomerType { get; set; } + public string CustomerType { get; set; } /// /// 费用标准 diff --git a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeTemplateDetailReq.cs b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeTemplateDetailReq.cs index d80ba45a..8d252ba6 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeTemplateDetailReq.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeTemplateDetailReq.cs @@ -40,7 +40,7 @@ public class FeeTemplateDetailReq /// /// 结算对象类型 /// - public int CustomerType { get; set; } + public string CustomerType { get; set; } /// /// 收付类型（收、付） /// diff --git a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeTemplateDetailRes.cs b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeTemplateDetailRes.cs index deafc147..b54ff349 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeTemplateDetailRes.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeTemplateDetailRes.cs @@ -40,7 +40,7 @@ public class FeeTemplateDetailRes /// /// 结算对象类型 /// - public int CustomerType { get; set; } + public string CustomerType { get; set; } /// /// 收付类型（收、付） /// diff --git a/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeCode.cs b/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeCode.cs index 898a48cc..f11f0856 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeCode.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeCode.cs @@ -39,13 +39,13 @@ public class FeeCode : BaseModel /// /// 默认收费客户类型 /// - [SugarColumn(ColumnDescription = "默认收费客户类型", DefaultValue = "0")] - public int DefaultDebit { get; set; } + [SugarColumn(ColumnDescription = "默认收费客户类型", IsNullable = true, Length = 50)] + public string DefaultDebit { get; set; } /// /// 默认付费客户类型 /// - [SugarColumn(ColumnDescription = "默认付费客户类型", DefaultValue = "0")] - public int DefaultCredit { get; set; } + [SugarColumn(ColumnDescription = "默认付费客户类型", IsNullable = true ,Length =50)] + public string DefaultCredit { get; set; } /// /// 海运 海运相关模块使用 /// diff --git a/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeCustTemplateDetail.cs b/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeCustTemplateDetail.cs index 6abb6f35..7313f29b 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeCustTemplateDetail.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeCustTemplateDetail.cs @@ -37,8 +37,8 @@ namespace DS.WMS.Core.Fee.Entity /// /// 结算对象类型 /// - [SugarColumn(ColumnDescription = "结算对象类型", IsNullable = false, DefaultValue = "1")] - public int CustomerType { get; set; } + [SugarColumn(ColumnDescription = "结算对象类型", IsNullable = true, Length = 50)] + public string CustomerType { get; set; } /// /// 收付类型（收、付） /// diff --git a/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeRecord.cs b/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeRecord.cs index d6f53798..46cb211a 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeRecord.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeRecord.cs @@ -59,8 +59,8 @@ namespace DS.WMS.Core.Fee.Entity /// /// 费用对象类型 /// - [SugarColumn(ColumnDescription = "费用对象类型", IsNullable = false, DefaultValue = "1")] - public int CustomerType { get; set; } + [SugarColumn(ColumnDescription = "费用对象类型", IsNullable = true, Length = 50)] + public string CustomerType { get; set; } /// /// 费用标准 diff --git a/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeTemplateDetail.cs b/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeTemplateDetail.cs index 022ebe12..f9d61f5a 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeTemplateDetail.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeTemplateDetail.cs @@ -47,8 +47,8 @@ namespace DS.WMS.Core.Fee.Entity /// /// 结算对象类型 /// - [SugarColumn(ColumnDescription = "结算对象类型", Length = 50, IsNullable = false, DefaultValue = "1")] - public int CustomerType { get; set; } + [SugarColumn(ColumnDescription = "结算对象类型", IsNullable = true, Length = 50)] + public string CustomerType { get; set; } /// /// 收付类型（收、付） /// diff --git a/ds-wms-service/DS.WMS.Core/System/Interface/IClientCommonService.cs b/ds-wms-service/DS.WMS.Core/System/Interface/IClientCommonService.cs index 92ea9479..121f3d75 100644 --- a/ds-wms-service/DS.WMS.Core/System/Interface/IClientCommonService.cs +++ b/ds-wms-service/DS.WMS.Core/System/Interface/IClientCommonService.cs @@ -1,6 +1,7 @@ using DS.Module.Core; using DS.Module.Core.Extensions; using DS.WMS.Core.Code.Dtos; +using DS.WMS.Core.Fee.Dtos; using DS.WMS.Core.Info.Dtos; using DS.WMS.Core.System.Dtos; using DS.WMS.Core.System.Entity; @@ -12,7 +13,26 @@ namespace DS.WMS.Core.System.Interface; /// public interface IClientCommonService { - + /// + /// 获取费用代码下拉选择 + /// + /// + public DataResult> GetFeeCodeSelectList(); + /// + /// 获取币别信息下拉选择 + /// + /// + public DataResult> GetFeeCurrencySelectList(); + /// + /// 根据类型获取往来单位下拉列表 + /// + /// + public DataResult> GetClientListByCode(string code =""); + /// + /// 获取所有往来单位下拉列表 + /// + /// + public DataResult> GetAllClientList(); /// /// 获取船公司下拉列表 /// diff --git a/ds-wms-service/DS.WMS.Core/System/Method/ClientCommonService.cs b/ds-wms-service/DS.WMS.Core/System/Method/ClientCommonService.cs index f379209d..ba5a366e 100644 --- a/ds-wms-service/DS.WMS.Core/System/Method/ClientCommonService.cs +++ b/ds-wms-service/DS.WMS.Core/System/Method/ClientCommonService.cs @@ -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(); saasService = _serviceProvider.GetRequiredService(); } + /// + /// 获取币别信息下拉选择 + /// + /// + public DataResult> GetFeeCurrencySelectList() + { + var tenantDb = saasService.GetBizDbScopeById(user.TenantId); + var data = tenantDb.Queryable() + .Where(x=>x.Status == StatusEnum.Enable) + .Select() + .ToList(); + return DataResult>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); + } + /// + /// 获取费用代码下拉选择 + /// + /// + public DataResult> GetFeeCodeSelectList() + { + var tenantDb = saasService.GetBizDbScopeById(user.TenantId); + var data = tenantDb.Queryable() + .Where(x => x.Status == StatusEnum.Enable) + .Select() + .ToList(); + return DataResult>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); + } + /// + /// 根据类型获取往来单位下拉列表 + /// + /// + public DataResult> GetClientListByCode(string code = "") + { + var tenantDb = saasService.GetBizDbScopeById(user.TenantId); + code = code.ToLower(); + var data = tenantDb.Queryable() + .InnerJoin((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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); + } + /// + /// 获取所有往来单位下拉列表 + /// + /// + public DataResult> GetAllClientList() + { + var tenantDb = saasService.GetBizDbScopeById(user.TenantId); + var data = tenantDb.Queryable() + .InnerJoin((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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); + } /// /// 获取船公司下拉列表 /// @@ -44,12 +132,12 @@ public class ClientCommonService : IClientCommonService .InnerJoin((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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } @@ -65,12 +153,12 @@ public class ClientCommonService : IClientCommonService .InnerJoin((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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } @@ -86,12 +174,12 @@ public class ClientCommonService : IClientCommonService .InnerJoin((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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } @@ -107,12 +195,12 @@ public class ClientCommonService : IClientCommonService .InnerJoin((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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } @@ -128,12 +216,12 @@ public class ClientCommonService : IClientCommonService .InnerJoin((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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } @@ -149,12 +237,12 @@ public class ClientCommonService : IClientCommonService .InnerJoin((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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } @@ -170,12 +258,12 @@ public class ClientCommonService : IClientCommonService .InnerJoin((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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } @@ -191,12 +279,12 @@ public class ClientCommonService : IClientCommonService .InnerJoin((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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } @@ -212,12 +300,12 @@ public class ClientCommonService : IClientCommonService .InnerJoin((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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } @@ -233,12 +321,12 @@ public class ClientCommonService : IClientCommonService .InnerJoin((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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } @@ -254,12 +342,12 @@ public class ClientCommonService : IClientCommonService .InnerJoin((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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } @@ -275,12 +363,12 @@ public class ClientCommonService : IClientCommonService .InnerJoin((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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } @@ -296,12 +384,12 @@ public class ClientCommonService : IClientCommonService .InnerJoin((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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } @@ -317,12 +405,12 @@ public class ClientCommonService : IClientCommonService .InnerJoin((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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } @@ -338,12 +426,12 @@ public class ClientCommonService : IClientCommonService .InnerJoin((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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } @@ -359,12 +447,12 @@ public class ClientCommonService : IClientCommonService .InnerJoin((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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } @@ -380,12 +468,12 @@ public class ClientCommonService : IClientCommonService .InnerJoin((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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } @@ -401,12 +489,12 @@ public class ClientCommonService : IClientCommonService .InnerJoin((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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } @@ -422,12 +510,12 @@ public class ClientCommonService : IClientCommonService .InnerJoin((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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } @@ -443,16 +531,16 @@ public class ClientCommonService : IClientCommonService .InnerJoin((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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } - + /// /// 获取签单方式下拉列表 /// @@ -477,7 +565,7 @@ public class ClientCommonService : IClientCommonService .Select().ToList(); return DataResult>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } - + /// /// 获取包装类型下拉列表 /// @@ -545,33 +633,33 @@ public class ClientCommonService : IClientCommonService /// /// public DataResult> GetOperatorUserList() - { + { var data = db.Queryable() .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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } - + /// /// 获取单证员列表 /// /// public DataResult> GetVouchingClerkList() - { + { var data = db.Queryable() .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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } @@ -580,87 +668,87 @@ public class ClientCommonService : IClientCommonService /// /// public DataResult> GetSaleUserList() - { + { var data = db.Queryable() .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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } - + /// /// 获取报关员列表 /// /// public DataResult> GetCustomUserList() - { + { var data = db.Queryable() .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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } - + /// /// 获取财务员列表 /// /// public DataResult> GetFinancialStaffList() - { + { var data = db.Queryable() .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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } - + /// /// 获取客服列表 /// /// public DataResult> GetCustomerServiceList() - { + { var data = db.Queryable() .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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } - + /// /// 获取司机列表 /// /// public DataResult> GetDiverList() - { + { var data = db.Queryable() .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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } @@ -669,15 +757,15 @@ public class ClientCommonService : IClientCommonService /// /// public DataResult> GetDispatcherList() - { + { var data = db.Queryable() .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>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess); } diff --git a/ds-wms-service/DS.WMS.Core/System/Method/CommonService.cs b/ds-wms-service/DS.WMS.Core/System/Method/CommonService.cs index 457b67c3..3408b1e8 100644 --- a/ds-wms-service/DS.WMS.Core/System/Method/CommonService.cs +++ b/ds-wms-service/DS.WMS.Core/System/Method/CommonService.cs @@ -669,7 +669,7 @@ public class CommonService : ICommonService { var grandsons = db.Queryable().Where(x => x.MenuType == 2 && x.ParentId == child.Id && x.IsHidden == false && - permissions.Contains(x.Id)) //排除企业用户维护 + permissions.Contains(x.Id)) //获取第三层路由 .OrderBy(x => x.SortCode) .Select(a => new RouteItem { diff --git a/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeCodeController.cs b/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeCodeController.cs new file mode 100644 index 00000000..c71900e6 --- /dev/null +++ b/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeCodeController.cs @@ -0,0 +1,66 @@ +using DS.Module.Core; +using DS.WMS.Core.Code.Dtos; +using DS.WMS.Core.Code.Interface; +using DS.WMS.Core.Fee.Dtos; +using DS.WMS.Core.Fee.Interface; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; + +namespace DS.WMS.FeeApi.Controllers +{ + /// + /// 费用代码服务 + /// + public class FeeCodeController : ApiController + { + private readonly IFeeCodeService _invokeService; + + /// + /// 构造函数 + /// + /// + public FeeCodeController(IFeeCodeService invokeService) + { + _invokeService = invokeService; + } + + /// + /// 列表 + /// + /// + /// + [HttpPost] + [Route("GetFeeCodeList")] + public DataResult> GetFeeCodeList([FromBody] PageRequest request) + { + var res = _invokeService.GetListByPage(request); + return res; + } + + /// + /// 编辑 + /// + /// + /// + [HttpPost] + [Route("EditFeeCode")] + public DataResult EditFeeCode([FromBody] FeeCodeReq model) + { + var res = _invokeService.EditFeeCode(model); + return res; + } + + /// + /// 详情 + /// + /// + /// + [HttpGet] + [Route("GetFeeCodeInfo")] + public DataResult GetFeeCodeInfo([FromQuery] string id) + { + var res = _invokeService.GetFeeCodeInfo(id); + return res; + } + } +} diff --git a/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeRecordController.cs b/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeRecordController.cs new file mode 100644 index 00000000..adc5d84b --- /dev/null +++ b/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeRecordController.cs @@ -0,0 +1,66 @@ +using DS.Module.Core; +using DS.WMS.Core.Code.Dtos; +using DS.WMS.Core.Code.Interface; +using DS.WMS.Core.Fee.Dtos; +using DS.WMS.Core.Fee.Interface; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; + +namespace DS.WMS.FeeApi.Controllers +{ + /// + /// 费用记录服务 + /// + public class FeeRecordController : ApiController + { + private readonly IFeeRecordService _invokeService; + + /// + /// 构造函数 + /// + /// + public FeeRecordController(IFeeRecordService invokeService) + { + _invokeService = invokeService; + } + + /// + /// 列表 + /// + /// + /// + [HttpPost] + [Route("GetFeeRecordList")] + public DataResult> GetFeeRecordList([FromBody] PageRequest request) + { + var res = _invokeService.GetListByPage(request); + return res; + } + + /// + /// 编辑 + /// + /// + /// + [HttpPost] + [Route("EditFeeRecord")] + public DataResult EditFeeRecord([FromBody] FeeRecordReq model) + { + var res = _invokeService.EditFeeRecord(model); + return res; + } + + /// + /// 详情 + /// + /// + /// + [HttpGet] + [Route("GetFeeRecordInfo")] + public DataResult GetFeeRecordInfo([FromQuery] string id) + { + var res = _invokeService.GetFeeRecordInfo(id); + return res; + } + } +} diff --git a/ds-wms-service/DS.WMS.MainApi/Controllers/ClientCommonController.cs b/ds-wms-service/DS.WMS.MainApi/Controllers/ClientCommonController.cs index c2d7c6d8..99196d34 100644 --- a/ds-wms-service/DS.WMS.MainApi/Controllers/ClientCommonController.cs +++ b/ds-wms-service/DS.WMS.MainApi/Controllers/ClientCommonController.cs @@ -1,6 +1,7 @@ using DS.Module.Core; using DS.Module.Core.Extensions; using DS.WMS.Core.Code.Dtos; +using DS.WMS.Core.Fee.Dtos; using DS.WMS.Core.Info.Dtos; using DS.WMS.Core.System.Dtos; using DS.WMS.Core.System.Entity; @@ -25,8 +26,52 @@ public class ClientCommonController : ApiController public ClientCommonController(IClientCommonService invokeService) { _invokeService = invokeService; - } - + } + /// + /// 获取币别下拉列表 + /// + /// + [HttpGet] + [Route("GetFeeCurrencySelectList")] + public DataResult> GetFeeCurrencySelectList() + { + var res = _invokeService.GetFeeCurrencySelectList(); + return res; + } + /// + /// 获取费用代码下拉列表 + /// + /// + [HttpGet] + [Route("GetFeeCodeSelectList")] + public DataResult> GetFeeCodeSelectList() + { + var res = _invokeService.GetFeeCodeSelectList(); + return res; + } + /// + /// 根据类型获取往来单位下拉列表 + /// + /// 单位类型 + /// + [HttpGet] + [Route("GetClientListByCode")] + public DataResult> GetClientListByCode([FromQuery]string code = "") + { + var res = _invokeService.GetClientListByCode(code); + return res; + } + /// + /// 获取所有往来单位下拉列表 + /// + /// + [HttpGet] + [Route("GetAllClientList")] + public DataResult> GetAllClientList() + { + var res = _invokeService.GetAllClientList(); + return res; + } /// /// 获取船公司下拉列表 /// diff --git a/ds-wms-service/DS.WMS.MainApi/Logs/internal-nlog.txt b/ds-wms-service/DS.WMS.MainApi/Logs/internal-nlog.txt index 41722e94..f250b60a 100644 --- a/ds-wms-service/DS.WMS.MainApi/Logs/internal-nlog.txt +++ b/ds-wms-service/DS.WMS.MainApi/Logs/internal-nlog.txt @@ -1265,3 +1265,17 @@ 2024-04-26 16:00:39.9054 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config 2024-04-26 16:00:39.9054 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile 2024-04-26 16:00:39.9229 Info Configuration initialized. +2024-04-28 16:49:27.2448 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-04-28 16:49:27.2771 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-04-28 16:49:27.2921 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-04-28 16:49:27.3214 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False +2024-04-28 16:49:27.3503 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config +2024-04-28 16:49:27.3657 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-04-28 16:49:27.3914 Info Configuration initialized. +2024-04-28 17:04:22.7089 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-04-28 17:04:22.7573 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-04-28 17:04:22.7771 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-04-28 17:04:22.8289 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False +2024-04-28 17:04:22.8626 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config +2024-04-28 17:04:22.8762 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-04-28 17:04:22.9041 Info Configuration initialized.