From 9a5681151c8bc9887d7392b016a79ab3deeee329 Mon Sep 17 00:00:00 2001
From: wanghaomei <wanghaomei@myshipping.net>
Date: Mon, 6 Mar 2023 17:19:43 +0800
Subject: [PATCH] =?UTF-8?q?EDI=E8=AE=BE=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Myshipping.Core/Entity/DJY/DjyEdiSetting.cs   |   8 ++
 Myshipping.Core/Myshipping.Core.xml           |  33 +++++-
 .../DjyEdiSetting/DjyEdiSettingService.cs     | 103 ++++++++++++++++--
 .../DjyEdiSetting/Dto/DjyEdiSettingInput.cs   |  72 ++++++------
 .../DjyEdiSetting/IDjyEdiSettingService.cs    |   5 +-
 5 files changed, 177 insertions(+), 44 deletions(-)

diff --git a/Myshipping.Core/Entity/DJY/DjyEdiSetting.cs b/Myshipping.Core/Entity/DJY/DjyEdiSetting.cs
index e0186db6..1baf217e 100644
--- a/Myshipping.Core/Entity/DJY/DjyEdiSetting.cs
+++ b/Myshipping.Core/Entity/DJY/DjyEdiSetting.cs
@@ -111,5 +111,13 @@ namespace Myshipping.Core.Entity
         /// 租户名称
         /// </summary>
         public string TenantName { get; set; }
+        /// <summary>
+        /// 发送类型
+        /// </summary>
+        public string SendType { get; set; }
+        /// <summary>
+        /// 启用标志
+        /// </summary>
+        public bool EnableFlag { get; set; } = true;
     }
 }
\ No newline at end of file
diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml
index e42bc08d..f855d73c 100644
--- a/Myshipping.Core/Myshipping.Core.xml
+++ b/Myshipping.Core/Myshipping.Core.xml
@@ -2034,6 +2034,16 @@
             租户名称
             </summary>
         </member>
+        <member name="P:Myshipping.Core.Entity.DjyEdiSetting.SendType">
+            <summary>
+            发送类型
+            </summary>
+        </member>
+        <member name="P:Myshipping.Core.Entity.DjyEdiSetting.EnableFlag">
+            <summary>
+            启用标志
+            </summary>
+        </member>
         <member name="T:Myshipping.Core.Entity.DjyTenantConfig">
             <summary>
             
@@ -10766,18 +10776,32 @@
         </member>
         <member name="M:Myshipping.Core.Service.DjyEdiSettingService.Add(Myshipping.Core.AddDjyEdiSettingInput)">
             <summary>
-            增加EDI参数设置
+            增加EDI参数设置（准备作废，使用save接口代替）
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Myshipping.Core.Service.DjyEdiSettingService.Save(Myshipping.Core.UpdateDjyEdiSettingInput)">
+            <summary>
+            保存EDI参数设置
             </summary>
             <param name="input"></param>
             <returns></returns>
         </member>
         <member name="M:Myshipping.Core.Service.DjyEdiSettingService.Update(Myshipping.Core.UpdateDjyEdiSettingInput)">
             <summary>
-            更新EDI参数设置
+            更新EDI参数设置（准备作废，使用save接口代替）
             </summary>
             <param name="input"></param>
             <returns></returns>
         </member>
+        <member name="M:Myshipping.Core.Service.DjyEdiSettingService.SetEnable(System.Int64)">
+            <summary>
+            设置启用（启用后，同船司、同发送类型的其他EDI通道会被取消启用）
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
         <member name="M:Myshipping.Core.Service.DjyEdiSettingService.Delete(Myshipping.Core.GetDjyEdiSettingInput)">
             <summary>
             删除EDI参数设置
@@ -15474,6 +15498,11 @@
             租户名称
             </summary>
         </member>
+        <member name="P:Myshipping.Core.DjyEdiSettingInput.SendType">
+            <summary>
+            发送类型
+            </summary>
+        </member>
         <member name="T:Myshipping.Core.AddDjyEdiSettingInput">
             <summary>
             EDI参数设置新增输入参数
diff --git a/Myshipping.Core/Service/DjyEdiSetting/DjyEdiSettingService.cs b/Myshipping.Core/Service/DjyEdiSetting/DjyEdiSettingService.cs
index 59bc77c1..f680df21 100644
--- a/Myshipping.Core/Service/DjyEdiSetting/DjyEdiSettingService.cs
+++ b/Myshipping.Core/Service/DjyEdiSetting/DjyEdiSettingService.cs
@@ -49,7 +49,7 @@ namespace Myshipping.Core.Service
         }
 
         /// <summary>
-        /// 增加EDI参数设置
+        /// 增加EDI参数设置（准备作废，使用save接口代替）
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -58,20 +58,80 @@ namespace Myshipping.Core.Service
         {
             var cc = _rep.AsQueryable()
                 .Filter(null, true)
-                .Count(x => x.EDICODE == input.EDICODE && x.TenantId == input.TenantId && x.CARRIERID == input.CARRIERID);
+                .Count(x => x.EDICODE == input.EDICODE && x.TenantId == input.TenantId && x.CARRIERID == input.CARRIERID && x.SendType == input.SendType);
             if (cc > 0)
             {
-                throw Oops.Bah($"该租户（{input.TenantName}）已存在相同类型（{input.EDICODE}）相同船司（{input.CARRIERID}）的参数设置");
+                throw Oops.Bah($"该租户（{input.TenantName}）已存在相同类型（{input.EDICODE}）、相同船司（{input.CARRIERID}）、相同发送类型（{input.SendType}）的参数设置");
             }
 
             var entity = input.Adapt<DjyEdiSetting>();
             await _rep.InsertAsync(entity);
             await CacheData();
+
+
+
             return entity.Id;
         }
 
         /// <summary>
-        /// 更新EDI参数设置
+        /// 保存EDI参数设置
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("/DjyEdiSetting/save")]
+        public async Task<long> Save(UpdateDjyEdiSettingInput input)
+        {
+            DjyEdiSetting entity = null;
+            if (input.Id == 0) //新增
+            {
+                var cc = _rep.AsQueryable()
+                .Filter(null, true)
+                .Count(x => x.EDICODE == input.EDICODE && x.TenantId == input.TenantId && x.CARRIERID == input.CARRIERID && x.SendType == input.SendType);
+
+                if (cc > 0)
+                {
+                    throw Oops.Bah($"该租户（{input.TenantName}）已存在相同类型（{input.EDICODE}）、相同船司（{input.CARRIERID}）、相同发送类型（{input.SendType}）的参数设置");
+                }
+
+                entity = input.Adapt<DjyEdiSetting>();
+                await _rep.InsertAsync(entity);
+
+                //其他同船司、同发送类型的都禁用
+                var otherList = _rep.Where(x => x.TenantId == input.TenantId && x.CARRIERID == input.CARRIERID && x.Id != entity.Id).ToList();
+                foreach (var item in otherList)
+                {
+                    item.EnableFlag = false;
+                    await _rep.UpdateAsync(item);
+                }
+            }
+            else
+            {
+                entity = _rep.AsQueryable()
+                .Filter(null, true)
+                .First(x => x.Id == input.Id);
+                if (entity == null)
+                {
+                    throw Oops.Bah($"未找到数据");
+                }
+
+                var cc = _rep.AsQueryable().Filter(null, true)
+                    .Count(x => x.EDICODE == input.EDICODE && x.TenantId == input.TenantId && x.CARRIERID == input.CARRIERID && x.SendType == input.SendType && x.Id != input.Id);
+                if (cc > 0)
+                {
+                    throw Oops.Bah($"该租户（{input.TenantName}）已存在相同类型（{input.EDICODE}）、相同船司（{input.CARRIERID}）、相同发送类型（{input.SendType}）的参数设置");
+                }
+
+                entity = input.Adapt(entity);
+                await _rep.UpdateAsync(entity);
+            }
+
+            await CacheData();
+            return entity.Id;
+
+        }
+
+        /// <summary>
+        /// 更新EDI参数设置（准备作废，使用save接口代替）
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -87,10 +147,10 @@ namespace Myshipping.Core.Service
             }
 
             var cc = _rep.AsQueryable().Filter(null, true)
-                .Count(x => x.EDICODE == input.EDICODE && x.TenantId == input.TenantId && x.CARRIERID == input.CARRIERID && x.Id != input.Id);
+                .Count(x => x.EDICODE == input.EDICODE && x.TenantId == input.TenantId && x.CARRIERID == input.CARRIERID && x.SendType == input.SendType && x.Id != input.Id);
             if (cc > 0)
             {
-                throw Oops.Bah($"该租户（{input.TenantName}）已存在相同类型（{input.EDICODE}）相同船司（{input.CARRIERID}）的参数设置");
+                throw Oops.Bah($"该租户（{input.TenantName}）已存在相同类型（{input.EDICODE}）、相同船司（{input.CARRIERID}）、相同发送类型（{input.SendType}）的参数设置");
             }
 
             entity = input.Adapt(entity);
@@ -100,6 +160,35 @@ namespace Myshipping.Core.Service
             return entity.Id;
         }
 
+        /// <summary>
+        /// 设置启用（启用后，同船司、同发送类型的其他EDI通道会被取消启用）
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpPost("/DjyEdiSetting/SetEnable")]
+        public async Task SetEnable(long id)
+        {
+            var entity = _rep.AsQueryable()
+                .Filter(null, true)
+                .First(x => x.Id == id);
+            if (entity == null)
+            {
+                throw Oops.Bah($"未找到数据");
+            }
+
+            entity.EnableFlag = true;
+            await _rep.UpdateAsync(entity);
+
+
+            //其他同船司、同发送类型的都禁用
+            var otherList = _rep.Where(x => x.TenantId == entity.TenantId && x.CARRIERID == entity.CARRIERID && x.Id != entity.Id).ToList();
+            foreach (var item in otherList)
+            {
+                item.EnableFlag = false;
+                await _rep.UpdateAsync(item);
+            }
+        }
+
         /// <summary>
         /// 删除EDI参数设置
         /// </summary>
@@ -141,7 +230,7 @@ namespace Myshipping.Core.Service
             {
                 if (!_cacheService.Exists(CommonConst.CACHE_KEY_DJY_EDI_SETTING))
                 {
-                    var list = _rep.AsQueryable().Filter(null, true).OrderBy(x=>x.EDINAME).ToList();
+                    var list = _rep.AsQueryable().Filter(null, true).OrderBy(x => x.EDINAME).ToList();
                     await _cacheService.SetAllEdiSetting(list);
                 }
             }
diff --git a/Myshipping.Core/Service/DjyEdiSetting/Dto/DjyEdiSettingInput.cs b/Myshipping.Core/Service/DjyEdiSetting/Dto/DjyEdiSettingInput.cs
index 223eeaf8..9e6e964c 100644
--- a/Myshipping.Core/Service/DjyEdiSetting/Dto/DjyEdiSettingInput.cs
+++ b/Myshipping.Core/Service/DjyEdiSetting/Dto/DjyEdiSettingInput.cs
@@ -13,132 +13,136 @@ namespace Myshipping.Core
         /// EDI类型代码
         /// </summary>
         public virtual string EDICODE { get; set; }
-        
+
         /// <summary>
         /// EDI类型名称
         /// </summary>
         public virtual string EDINAME { get; set; }
-        
+
         /// <summary>
         /// 服务器IP
         /// </summary>
         public virtual string SERVERIP { get; set; }
-        
+
         /// <summary>
         /// 文件夹
         /// </summary>
         public virtual string FOLDERNAME { get; set; }
-        
+
         /// <summary>
         /// 用户名
         /// </summary>
         public virtual string USERNAME { get; set; }
-        
+
         /// <summary>
         /// 密码
         /// </summary>
         public virtual string PASSWORD { get; set; }
-        
+
         /// <summary>
         /// 发送方代码
         /// </summary>
         public virtual string SENDCODE { get; set; }
-        
+
         /// <summary>
         /// 接收方代码
         /// </summary>
         public virtual string RECEIVECODE { get; set; }
-        
+
         /// <summary>
         /// 发送方名称
         /// </summary>
         public virtual string SENDNAME { get; set; }
-        
+
         /// <summary>
         /// 发送方联系人
         /// </summary>
         public virtual string SENDATTN { get; set; }
-        
+
         /// <summary>
         /// 发送方邮箱
         /// </summary>
         public virtual string SENDTEL { get; set; }
-        
+
         /// <summary>
         /// 发送方电话
         /// </summary>
         public virtual string SENDEMAIL { get; set; }
-        
+
         /// <summary>
         /// 发送方公司代码
         /// </summary>
         public virtual string SENDCOMPANYCODE { get; set; }
-        
+
         /// <summary>
         /// 发送方部门代码
         /// </summary>
         public virtual string SENDSUBCOMPANYCODE { get; set; }
-        
+
         /// <summary>
         /// 船公司代码
         /// </summary>
         public virtual string CARRIERID { get; set; }
-        
+
         /// <summary>
         /// 接收方邮箱
         /// </summary>
         public virtual string RECEIVEEMAIL { get; set; }
-        
+
         /// <summary>
         /// 接收方SI邮箱
         /// </summary>
         public virtual string RECEIVESIEMAIL { get; set; }
-        
+
         /// <summary>
         /// 接收方操作
         /// </summary>
         public virtual string RECEIVEOP { get; set; }
-        
+
         /// <summary>
         /// 接收方销售
         /// </summary>
         public virtual string RECEIVESALE { get; set; }
-        
+
         /// <summary>
         /// 接收方部门
         /// </summary>
         public virtual string RECEIVEDEPT { get; set; }
-        
+
         /// <summary>
         /// 发送人电话
         /// </summary>
         public virtual string SHIPPERTEL { get; set; }
-        
+
         /// <summary>
         /// 收货人电话
         /// </summary>
         public virtual string CONSIGNEETEL { get; set; }
-        
+
         /// <summary>
         /// 通知人电话
         /// </summary>
         public virtual string NOTIFYPARTYTEL { get; set; }
-        
+
         /// <summary>
         /// 是否设置TEL
         /// </summary>
         public virtual string ISUSETEL { get; set; }
-        
+
         /// <summary>
         /// 租户ID
         /// </summary>
         public virtual long TenantId { get; set; }
-        
+
         /// <summary>
         /// 租户名称
         /// </summary>
         public virtual string TenantName { get; set; }
-        
+        /// <summary>
+        /// 发送类型
+        /// </summary>
+        public string SendType { get; set; } = string.Empty;
+
     }
 
     /// <summary>
@@ -158,7 +162,7 @@ namespace Myshipping.Core
         /// </summary>
         [Required(ErrorMessage = "主键不能为空")]
         public long Id { get; set; }
-        
+
     }
 
     /// <summary>
@@ -171,7 +175,7 @@ namespace Myshipping.Core
         /// </summary>
         [Required(ErrorMessage = "主键不能为空")]
         public long Id { get; set; }
-        
+
     }
 
     /// <summary>
@@ -183,31 +187,31 @@ namespace Myshipping.Core
         /// 主键
         /// </summary>
         public virtual long Id { get; set; }
-        
+
         /// <summary>
         /// EDI类型代码
         /// </summary>
         public virtual string EDICODE { get; set; }
-        
+
         /// <summary>
         /// EDI类型名称
         /// </summary>
         public virtual string EDINAME { get; set; }
-                
+
         /// <summary>
         /// 船公司代码
         /// </summary>
         public virtual string CARRIERID { get; set; }
-        
+
         /// <summary>
         /// 租户ID
         /// </summary>
         public virtual long TenantId { get; set; }
-        
+
         /// <summary>
         /// 租户名称
         /// </summary>
         public virtual string TenantName { get; set; }
-        
+
     }
 }
diff --git a/Myshipping.Core/Service/DjyEdiSetting/IDjyEdiSettingService.cs b/Myshipping.Core/Service/DjyEdiSetting/IDjyEdiSettingService.cs
index 0846e035..921bbb70 100644
--- a/Myshipping.Core/Service/DjyEdiSetting/IDjyEdiSettingService.cs
+++ b/Myshipping.Core/Service/DjyEdiSetting/IDjyEdiSettingService.cs
@@ -10,11 +10,14 @@ namespace Myshipping.Core.Service
         Task<dynamic> Page([FromQuery] QueryDjyEdiSettingInput input);
         Task<long> Add(AddDjyEdiSettingInput input);
         Task<long> Update(UpdateDjyEdiSettingInput input);
+        Task<long> Save(UpdateDjyEdiSettingInput input);
         Task Delete(GetDjyEdiSettingInput input);
         Task<DjyEdiSetting> Get([FromQuery] GetDjyEdiSettingInput input);
         //Task<dynamic> List([FromQuery] QueryDjyEdiSettingInput input);
 
+        Task SetEnable(long id);
+
         Task CacheData(bool flag);
-       
+
     }
 }
\ No newline at end of file