客户信息详情增加提单信息字段

Myshipping.Core/Myshipping.Core.xml

@@ -11111,6 +11111,11 @@
             客服
             </summary>
         </member>
+        <member name="P:Myshipping.Core.Service.DjyCustomerOutput.TIDANINFO">
+            <summary>
+            提单信息
+            </summary>
+        </member>
         <member name="P:Myshipping.Core.Service.DjyCustomerOutput.ServiceItem">
             <summary>
             服务项目

Myshipping.Core/Service/DjyCustomer/Dto/DjyCustomerOutput.cs

@@ -156,6 +156,10 @@ namespace Myshipping.Core.Service
         /// </summary>
         public string CUSTSERVICE { get; set; }
         /// <summary>
+        /// 提单信息
+        /// </summary>
+        public string TIDANINFO { get; set; }
+        /// <summary>
         /// 服务项目
         /// </summary>
         public string ServiceItem { get; set; }

Myshipping.Report/Controllers/ReportController.cs

@@ -297,10 +297,10 @@ namespace Myshipping.Report.Controllers
         private string GetBookingJson(long bookingId)
         {
             log.Debug($"准备获取订舱数据：{bookingId}");
-            var order = sqlSugarClient.Queryable<BookingOrder>().First(x => x.Id == bookingId);
+            var order = sqlSugarClient.Queryable<BookingOrder>().First(x => x.Id == bookingId && x.IsDeleted == false);
-            var ctns = sqlSugarClient.Queryable<BookingCtn>().Where(x => x.BILLID == bookingId).ToList();
+            var ctns = sqlSugarClient.Queryable<BookingCtn>().Where(x => x.BILLID == bookingId && x.IsDeleted == false).ToList();
-            var bookingEdi = sqlSugarClient.Queryable<BookingEDIExt>().First(x => x.BookingId == bookingId);
+            var bookingEdi = sqlSugarClient.Queryable<BookingEDIExt>().First(x => x.BookingId == bookingId && x.IsDeleted == false);
-            var letterYard = sqlSugarClient.Queryable<BookingLetteryard>().First(x => x.BookingId == bookingId);
+            var letterYard = sqlSugarClient.Queryable<BookingLetteryard>().First(x => x.BookingId == bookingId && x.IsDeleted == false);
 
             long uid = 0;
             if (!string.IsNullOrEmpty(order.OPID))