From 8da82c37a072d4f0d148bef3b41c0fc91276b73c Mon Sep 17 00:00:00 2001
From: whm <86whm@163.com>
Date: Tue, 18 Jul 2023 09:35:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E6=8F=90=E5=8D=95=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Myshipping.Core/Myshipping.Core.xml                       | 5 +++++
 .../Service/DjyCustomer/Dto/DjyCustomerOutput.cs          | 4 ++++
 Myshipping.Report/Controllers/ReportController.cs         | 8 ++++----
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml
index 29e2a6b4..237160c5 100644
--- a/Myshipping.Core/Myshipping.Core.xml
+++ b/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>
             服务项目
diff --git a/Myshipping.Core/Service/DjyCustomer/Dto/DjyCustomerOutput.cs b/Myshipping.Core/Service/DjyCustomer/Dto/DjyCustomerOutput.cs
index 459cfa14..8eb9de90 100644
--- a/Myshipping.Core/Service/DjyCustomer/Dto/DjyCustomerOutput.cs
+++ b/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; }
diff --git a/Myshipping.Report/Controllers/ReportController.cs b/Myshipping.Report/Controllers/ReportController.cs
index 73682e78..a09ac03d 100644
--- a/Myshipping.Report/Controllers/ReportController.cs
+++ b/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 ctns = sqlSugarClient.Queryable<BookingCtn>().Where(x => x.BILLID == bookingId).ToList();
-            var bookingEdi = sqlSugarClient.Queryable<BookingEDIExt>().First(x => x.BookingId == bookingId);
-            var letterYard = sqlSugarClient.Queryable<BookingLetteryard>().First(x => x.BookingId == bookingId);
+            var order = sqlSugarClient.Queryable<BookingOrder>().First(x => x.Id == bookingId && x.IsDeleted == false);
+            var ctns = sqlSugarClient.Queryable<BookingCtn>().Where(x => x.BILLID == bookingId && x.IsDeleted == false).ToList();
+            var bookingEdi = sqlSugarClient.Queryable<BookingEDIExt>().First(x => x.BookingId == bookingId && x.IsDeleted == false);
+            var letterYard = sqlSugarClient.Queryable<BookingLetteryard>().First(x => x.BookingId == bookingId && x.IsDeleted == false);
 
             long uid = 0;
             if (!string.IsNullOrEmpty(order.OPID))

From 0724d1f35e39ee535902521b0e1cbbc9866032bd Mon Sep 17 00:00:00 2001
From: whm <86whm@163.com>
Date: Tue, 18 Jul 2023 13:43:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=AF=94=E5=AF=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9C=AC=E5=8F=B7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Myshipping.Application/Job/HCDataCompareWorker.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Myshipping.Application/Job/HCDataCompareWorker.cs b/Myshipping.Application/Job/HCDataCompareWorker.cs
index c8b3c8a2..458376a5 100644
--- a/Myshipping.Application/Job/HCDataCompareWorker.cs
+++ b/Myshipping.Application/Job/HCDataCompareWorker.cs
@@ -71,7 +71,8 @@ namespace Myshipping.Application.Job
                 {
                     x.Id,
                     x.MBLNO,
-                    x.ParentId
+                    x.ParentId,
+                    x.VERSION
                 })
                 .ToList();
 
@@ -82,7 +83,8 @@ namespace Myshipping.Application.Job
                     .Select(x => new HCDataCompareSendSubModel
                     {
                         Id = x.Id,
-                        MBLNO = x.MBLNO
+                        MBLNO = x.MBLNO,
+                        VERSION = x.VERSION
                     })
                     .ToList();
             }
@@ -98,7 +100,8 @@ namespace Myshipping.Application.Job
                     .Select(x => new HCDataCompareSendModel
                     {
                         Id = x.Id,
-                        MBLNO = x.MBLNO
+                        MBLNO = x.MBLNO,
+                        VERSION = x.VERSION
                     })
                     .ToList();
 
@@ -171,6 +174,8 @@ namespace Myshipping.Application.Job
 
         public string MBLNO { get; set; }
 
+        public string VERSION { get; set; }
+
         public List<HCDataCompareSendSubModel> Sub { get; set; }
     }
 
@@ -179,5 +184,7 @@ namespace Myshipping.Application.Job
         public long Id { get; set; }
 
         public string MBLNO { get; set; }
+
+        public string VERSION { get; set; }
     }
 }