From 4e557f19c85ab7024f14e81ca8a17655804af179 Mon Sep 17 00:00:00 2001
From: wet <1034391973@qq.com>
Date: Thu, 10 Aug 2023 12:36:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entity/BookingExtendState.cs              | 46 +++++++++++++++++++
 .../BookingOrder/BookingOrderService.cs       |  2 +-
 .../Service/BookingYunZong/BookingYunZong.cs  |  2 -
 3 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 Myshipping.Application/Entity/BookingExtendState.cs

diff --git a/Myshipping.Application/Entity/BookingExtendState.cs b/Myshipping.Application/Entity/BookingExtendState.cs
new file mode 100644
index 00000000..e3eec2da
--- /dev/null
+++ b/Myshipping.Application/Entity/BookingExtendState.cs
@@ -0,0 +1,46 @@
+using Myshipping.Core.Entity;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Myshipping.Application.Entity
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarTable("booking_extendstate")]
+    [Description("扩展状态")]
+    public  class BookingExtendState: PrimaryKeyEntity
+    {
+
+        /// <summary>
+        /// 业务id
+        /// </summary>
+        public  long bookingId { get; set; }
+
+
+        /// <summary>
+        /// 提箱小票未申请
+        /// </summary>
+        public int noApply { get; set; }
+
+
+        /// <summary>
+        /// 提箱小票已申请未打印
+        /// </summary>
+        public int applyNoPrint { get; set; }
+
+
+
+        /// <summary>
+        /// 提箱小票已打印
+        /// </summary>
+        public int print { get; set; }
+
+
+    }
+}
diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
index 06dd8e4d..0375043f 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
@@ -1319,7 +1319,7 @@ namespace Myshipping.Application
                 {
                     long Id = Convert.ToInt64(ar);
                     var order = _rep.AsQueryable().Filter(null, true).Where(x => x.Id == Id).First();
-                    var et = await _rep.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false && x.MBLNO == order.MBLNO && x.TenantId == UserManager.TENANT_ID && x.ParentId == 0 && x.Id != Id).FirstAsync();
+                    var et = await _rep.AsQueryable().Filter(null, true).WhereIF(!string.IsNullOrWhiteSpace(order.MBLNO),x => x.MBLNO == order.MBLNO).Where(x => x.IsDeleted == false && x.TenantId == UserManager.TENANT_ID && x.ParentId == 0 && x.Id != Id).FirstAsync();
                     if (et != null)
                     {
                         throw Oops.Bah("当前主提单号已存在,无法恢复!");
diff --git a/Myshipping.Application/Service/BookingYunZong/BookingYunZong.cs b/Myshipping.Application/Service/BookingYunZong/BookingYunZong.cs
index 8857b8b6..a3878fa6 100644
--- a/Myshipping.Application/Service/BookingYunZong/BookingYunZong.cs
+++ b/Myshipping.Application/Service/BookingYunZong/BookingYunZong.cs
@@ -142,7 +142,6 @@ namespace Myshipping.Application
 
         }
 
-
         [NonAction]
         [SqlSugarUnitOfWork]
         public async Task ExecuteYard(string rtn)
@@ -245,7 +244,6 @@ namespace Myshipping.Application
             }
         }
 
-
         [NonAction]
         [SqlSugarUnitOfWork]
         public async Task ExecuteHLW(string rtn)