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

Myshipping.Report/Controllers/ReportController.cs

@@ -302,6 +302,19 @@ namespace Myshipping.Report.Controllers
             var bookingEdi = sqlSugarClient.Queryable<BookingEDIExt>().First(x => x.BookingId == bookingId);
             var letterYard = sqlSugarClient.Queryable<BookingLetteryard>().First(x => x.BookingId == bookingId);
 
+            long uid = 0;
+            if (!string.IsNullOrEmpty(order.OPID))
+            {
+                uid = Convert.ToInt64(order.OPID);
+            }
+            else
+            {
+                uid = Convert.ToInt64(order.CreatedUserId);
+            }
+
+            var opUser = sqlSugarClient.Queryable<SysUser>().First(x => x.Id == uid);
+
+
             DjyCustomer customer = null;
             if (!string.IsNullOrEmpty(order.AGENTID)) //根据国外代理，获取客户的提单信息
             {
@@ -315,6 +328,7 @@ namespace Myshipping.Report.Controllers
                 letterYard,
                 agentCustomer = customer,
                 ediExt = bookingEdi,
+                opUser = opUser,
             });
 
             log.Debug($"订舱数据：{strObj}");

Myshipping.Report/DB/SysUser.cs

@@ -0,0 +1,54 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Web;
+
+namespace Myshipping.Report.DB
+{
+    /// <summary>
+    /// 用户表
+    /// </summary>
+    [SugarTable("sys_user")]
+    [Description("用户表")]
+    public class SysUser
+    {
+        /// <summary>
+        /// 账号
+        /// </summary>
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 账号
+        /// </summary>
+        public string Account { get; set; }
+
+
+        /// <summary>
+        /// 昵称
+        /// </summary>
+        public string NickName { get; set; }
+
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 邮箱
+        /// </summary>
+        public string Email { get; set; }
+
+        /// <summary>
+        /// 手机
+        /// </summary>
+        public string Phone { get; set; }
+
+        /// <summary>
+        /// 电话
+        /// </summary>
+        public string Tel { get; set; }
+
+    }
+}

Myshipping.Report/Myshipping.Report.csproj

@@ -196,6 +196,7 @@
     <Compile Include="DB\BookingSqlSugarClient.cs" />
     <Compile Include="DB\DBEntityTenant.cs" />
     <Compile Include="DB\DEntityBase.cs" />
+    <Compile Include="DB\SysUser.cs" />
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>