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 +{ + /// + /// + /// + [SugarTable("booking_extendstate")] + [Description("扩展状态")] + public class BookingExtendState: PrimaryKeyEntity + { + + /// + /// 业务id + /// + public long bookingId { get; set; } + + + /// + /// 提箱小票未申请 + /// + public int noApply { get; set; } + + + /// + /// 提箱小票已申请未打印 + /// + public int applyNoPrint { get; set; } + + + + /// + /// 提箱小票已打印 + /// + 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)