1

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -70,7 +70,6 @@ namespace Myshipping.Application
         private readonly SqlSugarRepository<BookingLogDetail> _bookinglogdetail;
         private readonly SqlSugarRepository<BookingRemark> _bookingremark;
         private readonly SqlSugarRepository<BookingFile> _bookingfile;
- 
         private readonly SqlSugarRepository<BookingPrintTemplate> _repPrint;
         private readonly ILogger<BookingOrderService> _logger;
         private readonly ISysCacheService _cache;
@@ -89,20 +88,19 @@ namespace Myshipping.Application
         private readonly SqlSugarRepository<BookingEDIExt> _bookingEDIExt;
         private readonly SqlSugarRepository<DjyUserConfig> _repUserConfig;
         private readonly IHttpContextAccessor _httpContextAccessor;
-
         const string CONST_MAPPING_MODULE = "BOOK_OR_CLOSING";
         const string CONST_MAPPING_MODULE_ROUTE = "BOOK_OR_CLOSING_RT";
         private const string PrintRecentListTypeKey = "booking_print_recent_list";
 
         public BookingOrderService(SqlSugarRepository<BookingOrder> rep, SqlSugarRepository<BookingCtn> repCtn, SqlSugarRepository<BookingCtnDetail> ctndetailrep,
-            SqlSugarRepository<BookingLog> bookinglog, SqlSugarRepository<BookingLogDetail> bookinglogdetail, SqlSugarRepository<BookingRemark> bookingremark,
-            SqlSugarRepository<BookingFile> bookingfile, SqlSugarRepository<DjyUserConfig> repUserConfig, SqlSugarRepository<BookingPrintTemplate> repPrint,
-            SqlSugarRepository<SysDictData> dicdata, SqlSugarRepository<BookingStatusLog> statuslog, SqlSugarRepository<BookingStatusLogDetail> statuslogdetail,
-            ILogger<BookingOrderService> logger, ISysCacheService cache, IDjyWebsiteAccountConfigService webAccountConfig,
+        SqlSugarRepository<BookingLog> bookinglog, SqlSugarRepository<BookingLogDetail> bookinglogdetail, SqlSugarRepository<BookingRemark> bookingremark,
+        SqlSugarRepository<BookingFile> bookingfile, SqlSugarRepository<DjyUserConfig> repUserConfig, SqlSugarRepository<BookingPrintTemplate> repPrint,
+        SqlSugarRepository<SysDictData> dicdata, SqlSugarRepository<BookingStatusLog> statuslog, SqlSugarRepository<BookingStatusLogDetail> statuslogdetail,
+        ILogger<BookingOrderService> logger, ISysCacheService cache, IDjyWebsiteAccountConfigService webAccountConfig,
         SqlSugarRepository<BookingPrintTemplate> repPrintTemplate, SqlSugarRepository<BookingLetteryard> repLetterYard, SqlSugarRepository<SysUser> repUser,
-            SqlSugarRepository<BookingOrderUrl> repOrderUrl, SqlSugarRepository<BookingOrderContact> repOrderContact, SqlSugarRepository<BookingSampleBill> repSampleBill,
-            SqlSugarRepository<DjyUserMailAccount> repUserMail, SqlSugarRepository<SysTenant> repTenant, SqlSugarRepository<BookingStatus> repBookingStatus, SqlSugarRepository<BookingEDIExt> bookingEDIExt,
-            IHttpContextAccessor httpContextAccessor)
+        SqlSugarRepository<BookingOrderUrl> repOrderUrl, SqlSugarRepository<BookingOrderContact> repOrderContact, SqlSugarRepository<BookingSampleBill> repSampleBill,
+        SqlSugarRepository<DjyUserMailAccount> repUserMail, SqlSugarRepository<SysTenant> repTenant, SqlSugarRepository<BookingStatus> repBookingStatus, SqlSugarRepository<BookingEDIExt> bookingEDIExt,
+        IHttpContextAccessor httpContextAccessor)
         {
             this._logger = logger;
             this._rep = rep;
@@ -113,7 +111,6 @@ namespace Myshipping.Application
             this._bookingremark = bookingremark;
             this._bookingfile = bookingfile;
             this._repPrint = repPrint;
-           
             this._cache = cache;
             this._webAccountConfig = webAccountConfig;
             this._repStatuslog = statuslog;
@@ -1026,9 +1023,6 @@ namespace Myshipping.Application
         }
         #endregion
 
-
-
-
         #region 放舱(入货通知)
 
         /// <summary>
@@ -2088,8 +2082,6 @@ namespace Myshipping.Application
             {
                 throw Oops.Bah(BookingErrorCode.BOOK128, jobjResp.GetStringValue("message"));
             }
-
-
             //货运动态
             var bsl = new BookingStatusLog();
             bsl.BookingId = bookingId;
@@ -2098,12 +2090,9 @@ namespace Myshipping.Application
             bsl.Category = "ship";
             bsl.MBLNO = order.MBLNO;
             await _repStatuslog.InsertAsync(bsl);
-
-
         }
 
 
-
         /// <summary>
         /// 批量编辑vgm
         /// </summary>
@@ -2186,6 +2175,7 @@ namespace Myshipping.Application
         }
         #endregion
 
+
         public async Task<string> InnerBookingOrClosingEDI(BookingOrClosingEDIOrderDto model)
         {
             string batchNo = IDGen.NextID().ToString();
@@ -2484,6 +2474,8 @@ namespace Myshipping.Application
 
             await _bookingfile.InsertAsync(bookFile);
         }
+        
+
         #region 下载订舱、截单EDI
         /// <summary>
         /// 下载订舱、截单EDI
@@ -3031,6 +3023,5 @@ namespace Myshipping.Application
         }
         #endregion
 
-
     }
 }

Myshipping.Core/Service/CommonDB/CommonDBService.cs

@@ -303,7 +303,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     public async Task AddForwarder([FromBody] CodeForwarderDto dto)
     {
         var list = await _sysCacheService.GetAllCodeForwarder();
-        var count = list.Where(x =>   x.Code == dto.Code).Count();
+        var count = list.Where(x =>x.Code == dto.Code).Count();
         if (count > 0)
         {
             throw Oops.Bah(ErrorCode.D1006);