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

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");
+            var yardset = _cache.GetAllMappingYard().Result.FirstOrDefault(y => y.Code == order.YARDID && y.Module == "BookingTxxp");
-            //if (yardset == null)
+            if (yardset == null)
-            //{
+            {
-            //    throw Oops.Oh(BookingErrorCode.BOOK120, order.YARDID);
+                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,
+                depotCode = yardset.MapCode,
-                //depotName = yardset.MapName,
+                depotName = yardset.MapName,
                 AgentName = UserManager.TENANT_NAME,
                 linkName = UserManager.Name,
                 linkMobile = user.Tel,