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

Myshipping.Application/EDI/BookingHelper/ONESoApiHelper.cs

@@ -202,7 +202,7 @@ namespace Myshipping.Application.EDI
                         _ => throw Oops.Oh("暂不支持的货物类型")
                     },
                     boxSize = mapCtn.MapCode,
-                    quantity = ctn.PKGS.Value,
+                    quantity = ctn.CTNNUM.Value,
                 };
                 postModel.boxInfos.Add(apiBox);
             }

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -8172,6 +8172,23 @@ namespace Myshipping.Application
             {
                 var user = await _repUser.FirstOrDefaultAsync(x => x.Id == UserManager.UserId);
 
+                if (string.IsNullOrWhiteSpace(user.EnName))
+                {
+                    throw Oops.Oh($"当前操作人未配置英文名称，请先维护英文名称");
+                }
+
+                if (string.IsNullOrWhiteSpace(UserManager.Email))
+                {
+                    throw Oops.Oh($"当前操作人未配置邮箱，请先维护邮箱");
+                }
+
+                string phone = string.IsNullOrEmpty(user.Tel) ? user.Phone : user.Tel;
+
+                if (string.IsNullOrWhiteSpace(phone))
+                {
+                    throw Oops.Oh($"当前操作人未配置电话或手机，请先维护电话或手机");
+                }
+
                 primaryModel.OpEmail = $"{user.EnName};{(string.IsNullOrEmpty(user.Tel) ? user.Phone : user.Tel)};{UserManager.Email}";
 
                 //这里需要调取拆分数据，填充收发通