diff --git a/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientAccountDateReq.cs b/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientAccountDateReq.cs index cd95796a..96e42728 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientAccountDateReq.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientAccountDateReq.cs @@ -105,15 +105,15 @@ public class ClientAccountDateReq /// public bool IsSpecial { get; set; } - /// - /// 人民币账户ID - /// - public long? RMBAccountId { get; set; } - - /// - /// 美金账户ID - /// - public long? USDAccountId { get; set; } + ///// + ///// 人民币账户ID + ///// + //public long? RMBAccountId { get; set; } + + ///// + ///// 美金账户ID + ///// + //public long? USDAccountId { get; set; } } /// diff --git a/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientAccountDateRes.cs b/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientAccountDateRes.cs index 4d3b8ac5..afb1dac1 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientAccountDateRes.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientAccountDateRes.cs @@ -118,13 +118,13 @@ public class ClientAccountDateRes /// public bool IsSpecial { get; set; } - /// - /// 人民币账户ID - /// - public long? RMBAccountId { get; set; } - - /// - /// 美金账户ID - /// - public long? USDAccountId { get; set; } + ///// + ///// 人民币账户ID + ///// + //public long? RMBAccountId { get; set; } + + ///// + ///// 美金账户ID + ///// + //public long? USDAccountId { get; set; } } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoReq.cs b/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoReq.cs index b687d866..f51fed44 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoReq.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoReq.cs @@ -1,6 +1,7 @@ using System.Runtime.Serialization; using DS.Module.Core.Enums; using FluentValidation; +using SqlSugar; namespace DS.WMS.Core.Info.Dtos; @@ -514,6 +515,33 @@ public class ClientInfoReq /// 账单抬头 /// public string? BillHeader { get; set; } + + + /// + /// 进账人民币账户ID + /// + public long? RMBAccountId { get; set; } + + /// + /// 进账人民币银行名称 + /// + public string RMBBankName { get; set; } + /// + /// Desc:进账人民币银行账户 + /// + public string RMBBankAccountNo { get; set; } + /// + /// 进账美金账户ID + /// + public long? USDAccountId { get; set; } + /// + /// 进账美金银行名称 + /// + public string USDBankName { get; set; } + /// + /// Desc:进账美金银行账户 + /// + public string USDBankAccountNo { get; set; } } /// diff --git a/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoRes.cs b/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoRes.cs index 0b13679f..7a1b2782 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoRes.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoRes.cs @@ -446,7 +446,31 @@ public class ClientInfoRes /// 账单抬头 /// public string? BillHeader { get; set; } + /// + /// 进账人民币账户ID + /// + public long? RMBAccountId { get; set; } + /// + /// 进账人民币银行名称 + /// + public string RMBBankName { get; set; } + /// + /// Desc:进账人民币银行账户 + /// + public string RMBBankAccountNo { get; set; } + /// + /// 进账美金账户ID + /// + public long? USDAccountId { get; set; } + /// + /// 进账美金银行名称 + /// + public string USDBankName { get; set; } + /// + /// Desc:进账美金银行账户 + /// + public string USDBankAccountNo { get; set; } /// /// 默认联系人 /// diff --git a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClient.cs b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClient.cs index 249f27b9..586b46cb 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClient.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClient.cs @@ -454,6 +454,37 @@ public class InfoClient : SharedOrgModel [SugarColumn(ColumnDescription = "账单抬头", Length = 500, IsNullable = true)] public string? BillHeader { get; set; } + /// + /// 进账人民币账户ID + /// + [SugarColumn(ColumnDescription = "人民币账户ID")] + public long? RMBAccountId { get; set; } + + /// + /// 进账人民币银行名称 + /// + [SugarColumn(ColumnDescription = "进账人民币银行名称", IsNullable = true, Length = 200)] + public string RMBBankName { get; set; } + /// + /// Desc:进账人民币银行账户 + /// + [SugarColumn(ColumnDescription = "进账人民币银行账户", Length = 100, IsNullable = true)] + public string RMBBankAccountNo { get; set; } + /// + /// 进账美金账户ID + /// + [SugarColumn(ColumnDescription = "美金账户ID")] + public long? USDAccountId { get; set; } + /// + /// 进账美金银行名称 + /// + [SugarColumn(ColumnDescription = "进账美金银行名称", IsNullable = true, Length = 200)] + public string USDBankName { get; set; } + /// + /// Desc:进账美金银行账户 + /// + [SugarColumn(ColumnDescription = "进账美金银行账户", Length = 100, IsNullable = true)] + public string USDBankAccountNo { get; set; } /// /// 客户属性 /// diff --git a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientAccountDate.cs b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientAccountDate.cs index a87beaf8..fe526cd6 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientAccountDate.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientAccountDate.cs @@ -118,15 +118,15 @@ public class InfoClientAccountDate : BaseModelV2 [SugarColumn(ColumnDescription = "机构Id")] public long OrgId { get; set; } - /// - /// 人民币账户ID - /// - [SugarColumn(ColumnDescription = "人民币账户ID")] - public long? RMBAccountId { get; set; } - - /// - /// 美金账户ID - /// - [SugarColumn(ColumnDescription = "美金账户ID")] - public long? USDAccountId { get; set; } + ///// + ///// 人民币账户ID + ///// + //[SugarColumn(ColumnDescription = "人民币账户ID")] + //public long? RMBAccountId { get; set; } + + ///// + ///// 美金账户ID + ///// + //[SugarColumn(ColumnDescription = "美金账户ID")] + //public long? USDAccountId { get; set; } } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs index 3040223a..e9fecb08 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs @@ -599,6 +599,11 @@ public partial class SeaExportService : ISeaExportService return await Task.FromResult(DataResult.Failed(sequence.Message, MultiLanguageConst.SequenceSetNotExist)); } data.CustomerNo = sequence.Data; + //新生成委托编号判断是否重复 + if (tenantDb.Queryable().Where(x => x.CustomerNo == sequence.Data).Any()) + { + return await Task.FromResult(DataResult.Failed("海运出口信息委托编号已存在!", MultiLanguageConst.SeaExportCustomerNoExist)); + } } #region 处理箱型箱量 if (req.CtnInfo.Count > 0)