Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -7677,6 +7677,23 @@ namespace Myshipping.Application
 
         }
 
+        /// <summary>
+        /// 自动引入场站数据消息已读
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("/BookingOrder/ReadAutoYardImport")]
+        public async Task ReadAutoYardImport(long bookId)
+        {
+            var model = _repAutoYard.FirstOrDefault(x => x.Id == bookId);
+            if (model != null)
+            {
+                model.IsRead = true;
+                model.ReadTime = DateTime.Now;
+                model.ReadUser = UserManager.Name;
+                await _repAutoYard.UpdateAsync(model);
+            }
+        }
+
         /// <summary>
         /// 获取场站数据
         /// </summary>
@@ -8245,7 +8262,7 @@ HLCUTA12307DPXJ3 以这票为例   6个柜
             }
 
             //自动引入场站记录信息
-            allData.AutoYardImport = _repAutoYard.FirstOrDefault(x => x.Id == bookingId);
+            allData.AutoYardImport = _repAutoYard.FirstOrDefault(x => x.Id == bookingId && !x.IsRead);
 
             return allData;
         }
@@ -9293,7 +9310,7 @@ HLCUTA12307DPXJ3 以这票为例   6个柜
             var order = _rep.FirstOrDefault(x => x.Id == Id);
             //条件判断 目前只支持CMA 的数据 
 
-            var CARRIERID= _cache.GetAllMappingCarrier().Result.Where(x => order.CARRIERID == x.Code&&x.Module== "BookingTxxp").Select(x => x.MapCode).FirstOrDefault();
+            var CARRIERID = _cache.GetAllMappingCarrier().Result.Where(x => order.CARRIERID == x.Code && x.Module == "BookingTxxp").Select(x => x.MapCode).FirstOrDefault();
             if (CARRIERID != "CMA")
             {
                 throw Oops.Bah("船公司目前只支持CMA");