From 323dcfd7cf30476f0f0731268e40875f0b588879 Mon Sep 17 00:00:00 2001
From: wanghaomei <wanghaomei@myshipping.net>
Date: Fri, 11 Nov 2022 15:50:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BookingOrder/BookingOrderService.cs       | 16 +++---
 Myshipping.Core/Myshipping.Core.xml           | 52 ++++++++++++++++++-
 2 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
index d24f60af..e8418844 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
@@ -837,12 +837,12 @@ namespace Myshipping.Application
                 throw Oops.Oh(BookingErrorCode.BOOK119);
             }
 
-            ////场站转换
-            //var yardset = _cache.getallma().Result.FirstOrDefault(y => y.Code == order.YARDID && y.Module == "BookingTxxp");
-            //if (yardset == null)
-            //{
-            //    throw Oops.Oh(BookingErrorCode.BOOK120, order.YARDID);
-            //}
+            //场站转换
+            var yardset = _cache.GetAllMappingYard().Result.FirstOrDefault(y => y.Code == order.YARDID && y.Module == "BookingTxxp");
+            if (yardset == null)
+            {
+                throw Oops.Oh(BookingErrorCode.BOOK120, order.YARDID);
+            }
 
             var ctns = await _repCtn.Where(x => x.BILLID == bookingId).ToListAsync();
             //校验箱子数据录入
@@ -880,8 +880,8 @@ namespace Myshipping.Application
                 // userName = currUser.CODENAME,
                 //userPassword = currUser.PASSWORD,
                 operatorName = UserManager.Name,
-                //depotCode = yardset.MapCode,
-                //depotName = yardset.MapName,
+                depotCode = yardset.MapCode,
+                depotName = yardset.MapName,
                 AgentName = UserManager.TENANT_NAME,
                 linkName = UserManager.Name,
                 linkMobile = user.Tel,
diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml
index 0c497550..b916bb80 100644
--- a/Myshipping.Core/Myshipping.Core.xml
+++ b/Myshipping.Core/Myshipping.Core.xml
@@ -652,6 +652,11 @@
             船名映射
             </summary>
         </member>
+        <member name="F:Myshipping.Core.CommonConst.CACHE_KEY_COMMON_DB_MAPPING_YARD">
+            <summary>
+            场站映射
+            </summary>
+        </member>
         <member name="F:Myshipping.Core.CommonConst.CACHE_KEY_COMMON_DB_DICT_DATA">
             <summary>
             字典映射
@@ -659,7 +664,7 @@
         </member>
         <member name="F:Myshipping.Core.CommonConst.CACHE_KEY_DJY_EDI_SETTING">
             <summary>
-            船名映射
+            EDI映射
             </summary>
         </member>
         <member name="F:Myshipping.Core.CommonConst.ENTITY_ASSEMBLY_NAME">
@@ -1262,6 +1267,11 @@
             代码
             </summary>
         </member>
+        <member name="P:Myshipping.Core.Entity.MappingYard.Name">
+            <summary>
+            名称
+            </summary>
+        </member>
         <member name="P:Myshipping.Core.Entity.MappingYard.Module">
             <summary>
             模块
@@ -5503,6 +5513,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Myshipping.Core.Service.ISysCacheService.GetAllMappingYard">
+            <summary>
+            获取公共库 场站映射
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Myshipping.Core.Service.ISysCacheService.SetAllCodeCarrier(System.Collections.Generic.List{Myshipping.Core.Entity.CodeCarrier})">
             <summary>
             设置公共库 船公司
@@ -5587,6 +5603,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Myshipping.Core.Service.ISysCacheService.SetAllMappingYard(System.Collections.Generic.List{Myshipping.Core.Entity.MappingYard})">
+            <summary>
+            设置公共库 场站映射
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Myshipping.Core.Service.ISysCacheService.GetAllTenantParam">
             <summary>
             获取租户参数
@@ -5884,6 +5906,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Myshipping.Core.Service.SysCacheService.GetAllMappingYard">
+            <summary>
+            获取公共库 船名映射
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Myshipping.Core.Service.SysCacheService.SetAllCodeCarrier(System.Collections.Generic.List{Myshipping.Core.Entity.CodeCarrier})">
             <summary>
             设置公共库 船公司
@@ -5968,6 +5996,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Myshipping.Core.Service.SysCacheService.SetAllMappingYard(System.Collections.Generic.List{Myshipping.Core.Entity.MappingYard})">
+            <summary>
+            设置公共库 场站映射
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Myshipping.Core.Service.SysCacheService.GetAllTenantParam">
             <summary>
             获取租户参数
@@ -6573,6 +6607,16 @@
             新增场站信息
             </summary>
         </member>
+        <member name="M:Myshipping.Core.Service.CommonDBService.MappingYardList(Myshipping.Core.Service.MappingQueryDto)">
+            <summary>
+            获取场站映射
+            </summary>
+        </member>
+        <member name="M:Myshipping.Core.Service.CommonDBService.AddOrUpdateMappingYard(Myshipping.Core.Entity.MappingYard)">
+            <summary>
+            新增编辑场站映射信息
+            </summary>
+        </member>
         <member name="M:Myshipping.Core.Service.CommonDBService.PortloadList(Myshipping.Core.Service.NameQueryDto)">
             <summary>
             获取起始港信息
@@ -6704,6 +6748,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Myshipping.Core.Service.ICommonDBService.GetAllMappingYard">
+            <summary>
+            获取场站映射
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Myshipping.Core.Service.ICommonDBService.GetAllPortload">
             <summary>
             获取起始港