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

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; }
+
+
+    }
+}

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -1341,7 +1341,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("当前主提单号已存在,无法恢复!");

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)