海运出口新生成委托编号判断是否重复及客户信息添加进账RMB及USD账户

ds-wms-service/DS.WMS.Core/Info/Dtos/ClientAccountDateReq.cs

@@ -105,15 +105,15 @@ public class ClientAccountDateReq
     /// </summary>
     public bool IsSpecial { get; set; }
 
-    /// <summary>
+    ///// <summary>
-    /// 人民币账户ID
+    ///// 人民币账户ID
-    /// </summary>
+    ///// </summary>
-    public long? RMBAccountId { get; set; }
+    //public long? RMBAccountId { get; set; }
-
+
-    /// <summary>
+    ///// <summary>
-    /// 美金账户ID
+    ///// 美金账户ID
-    /// </summary>
+    ///// </summary>
-    public long? USDAccountId { get; set; }
+    //public long? USDAccountId { get; set; }
 }
 
 /// <summary>

ds-wms-service/DS.WMS.Core/Info/Dtos/ClientAccountDateRes.cs

@@ -118,13 +118,13 @@ public class ClientAccountDateRes
     /// </summary>
     public bool IsSpecial { get; set; }
 
-    /// <summary>
+    ///// <summary>
-    /// 人民币账户ID
+    ///// 人民币账户ID
-    /// </summary>
+    ///// </summary>
-    public long? RMBAccountId { get; set; }
+    //public long? RMBAccountId { get; set; }
-
+
-    /// <summary>
+    ///// <summary>
-    /// 美金账户ID
+    ///// 美金账户ID
-    /// </summary>
+    ///// </summary>
-    public long? USDAccountId { get; set; }
+    //public long? USDAccountId { get; set; }
 }

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
     /// 账单抬头
     /// </summary>
     public string? BillHeader { get; set; }
+
+
+    /// <summary>
+    /// 进账人民币账户ID
+    /// </summary>
+    public long? RMBAccountId { get; set; }
+
+    /// <summary>
+    /// 进账人民币银行名称
+    /// </summary>
+    public string RMBBankName { get; set; }
+    /// <summary>
+    /// Desc:进账人民币银行账户
+    /// </summary>
+    public string RMBBankAccountNo { get; set; }
+    /// <summary>
+    /// 进账美金账户ID
+    /// </summary>
+    public long? USDAccountId { get; set; }
+    /// <summary>
+    /// 进账美金银行名称
+    /// </summary>
+    public string USDBankName { get; set; }
+    /// <summary>
+    /// Desc:进账美金银行账户
+    /// </summary>
+    public string USDBankAccountNo { get; set; }
 }
 
 /// <summary>

ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoRes.cs

@@ -446,7 +446,31 @@ public class ClientInfoRes
     /// 账单抬头
     /// </summary>
     public string? BillHeader { get; set; }
+    /// <summary>
+    /// 进账人民币账户ID
+    /// </summary>
+    public long? RMBAccountId { get; set; }
 
+    /// <summary>
+    /// 进账人民币银行名称
+    /// </summary>
+    public string RMBBankName { get; set; }
+    /// <summary>
+    /// Desc:进账人民币银行账户
+    /// </summary>
+    public string RMBBankAccountNo { get; set; }
+    /// <summary>
+    /// 进账美金账户ID
+    /// </summary>
+    public long? USDAccountId { get; set; }
+    /// <summary>
+    /// 进账美金银行名称
+    /// </summary>
+    public string USDBankName { get; set; }
+    /// <summary>
+    /// Desc:进账美金银行账户
+    /// </summary>
+    public string USDBankAccountNo { get; set; }
     /// <summary>
     /// 默认联系人
     /// </summary>

ds-wms-service/DS.WMS.Core/Info/Entity/InfoClient.cs

@@ -454,6 +454,37 @@ public class InfoClient : SharedOrgModel<long>
     [SugarColumn(ColumnDescription = "账单抬头", Length = 500, IsNullable = true)]
     public string? BillHeader { get; set; }
 
+    /// <summary>
+    /// 进账人民币账户ID
+    /// </summary>
+    [SugarColumn(ColumnDescription = "人民币账户ID")]
+    public long? RMBAccountId { get; set; }
+
+    /// <summary>
+    /// 进账人民币银行名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "进账人民币银行名称", IsNullable = true, Length = 200)]
+    public string RMBBankName { get; set; }
+    /// <summary>
+    /// Desc:进账人民币银行账户
+    /// </summary>
+    [SugarColumn(ColumnDescription = "进账人民币银行账户", Length = 100, IsNullable = true)]
+    public string RMBBankAccountNo { get; set; }
+    /// <summary>
+    /// 进账美金账户ID
+    /// </summary>
+    [SugarColumn(ColumnDescription = "美金账户ID")]
+    public long? USDAccountId { get; set; }
+    /// <summary>
+    /// 进账美金银行名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "进账美金银行名称", IsNullable = true, Length = 200)]
+    public string USDBankName { get; set; }
+    /// <summary>
+    /// Desc:进账美金银行账户
+    /// </summary>
+    [SugarColumn(ColumnDescription = "进账美金银行账户", Length = 100, IsNullable = true)]
+    public string USDBankAccountNo { get; set; }
     /// <summary>
     /// 客户属性
     /// </summary>

ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientAccountDate.cs

@@ -118,15 +118,15 @@ public class InfoClientAccountDate : BaseModelV2<long>
     [SugarColumn(ColumnDescription = "机构Id")]
     public long OrgId { get; set; }
 
-    /// <summary>
+    ///// <summary>
-    /// 人民币账户ID
+    ///// 人民币账户ID
-    /// </summary>
+    ///// </summary>
-    [SugarColumn(ColumnDescription = "人民币账户ID")]
+    //[SugarColumn(ColumnDescription = "人民币账户ID")]
-    public long? RMBAccountId { get; set; }
+    //public long? RMBAccountId { get; set; }
-
+
-    /// <summary>
+    ///// <summary>
-    /// 美金账户ID
+    ///// 美金账户ID
-    /// </summary>
+    ///// </summary>
-    [SugarColumn(ColumnDescription = "美金账户ID")]
+    //[SugarColumn(ColumnDescription = "美金账户ID")]
-    public long? USDAccountId { get; set; }
+    //public long? USDAccountId { get; set; }
 }

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<SeaExport>().Where(x => x.CustomerNo == sequence.Data).Any())
+            {
+                return await Task.FromResult(DataResult.Failed("海运出口信息委托编号已存在!", MultiLanguageConst.SeaExportCustomerNoExist));
+            }
         }
         #region 处理箱型箱量
         if (req.CtnInfo.Count > 0)