diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 455fb109..fe7fe8bd 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -26,6 +26,7 @@ using Myshipping.Application.Service.BookingOrder.Dto; using Myshipping.Application.ConfigOption; using System.IO; using Yitter.IdGenerator; +using Myshipping.Core.Entity; namespace Myshipping.Application { @@ -42,10 +43,11 @@ namespace Myshipping.Application private readonly SqlSugarRepository _bookinglogdetail; private readonly SqlSugarRepository _bookingremark; private readonly SqlSugarRepository _bookingfile; + SqlSugarRepository _webconfig private readonly ILogger _logger; public BookingOrderService(SqlSugarRepository rep, SqlSugarRepository repCtn, SqlSugarRepository ctndetailrep, SqlSugarRepository bookinglog, SqlSugarRepository bookinglogdetail, SqlSugarRepository bookingremark, - SqlSugarRepository bookingfile, + SqlSugarRepository bookingfile, SqlSugarRepository webconfig, ILogger logger) { this._logger = logger; @@ -56,6 +58,7 @@ namespace Myshipping.Application this._bookinglogdetail = bookinglogdetail; this._bookingremark = bookingremark; this._bookingfile = bookingfile; + this._webconfig = webconfig; } /// @@ -239,6 +242,14 @@ namespace Myshipping.Application CreatedUserId = UserManager.UserId, CreatedUserName = UserManager.Name }); + + + if (input.YARD!=null&&input.YARDID!=null) { + + + + + } } /// @@ -492,5 +503,8 @@ namespace Myshipping.Application + + + } } diff --git a/Myshipping.Application/Service/BookingOrder/Dto/BillTraceDto.cs b/Myshipping.Application/Service/BookingOrder/Dto/BillTraceDto.cs new file mode 100644 index 00000000..f0487472 --- /dev/null +++ b/Myshipping.Application/Service/BookingOrder/Dto/BillTraceDto.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Application.Service.BookingOrder.Dto +{ + + public class BillTraceDto + { + + public string Key { get; set; } + + public string PWD { get; set; } + + public List Children { get; set; } + + + } + + public class BillTraceList + { + public string MBLNO { get; set; } + + public string YARD { get; set; } + + public string YardCode { get; set; } + + public string CARRIERID { get; set; } + + public string CARRIER { get; set; } + + public bool isBook { get; set; } + } +} diff --git a/Myshipping.Core/Entity/DJY/DJYTenantParam.cs b/Myshipping.Core/Entity/DJY/DJYTenantParam.cs deleted file mode 100644 index e87c5797..00000000 --- a/Myshipping.Core/Entity/DJY/DJYTenantParam.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using SqlSugar; -using System.ComponentModel; -using Myshipping.Core.Entity; -namespace Myshipping.Core.Entity -{ - /// - /// 租户参数类别表 - /// - [SugarTable("djy_tenant_param")] - [Description("租户参数类别表")] - public class DjyTenantParam : PrimaryKeyEntity - { - /// - /// 类别代码 - /// - public string ParaCode { get; set; } - /// - /// 类别名称 - /// - public string ParaName { get; set; } - /// - /// 业务大类 - /// - public string Type { get; set; } - /// - /// 备注 - /// - public string Remark { get; set; } - /// - /// 排序 - /// - public int? Sort { get; set; } - } -} \ No newline at end of file diff --git a/Myshipping.Core/Entity/DJY/DJYTenantParamItem.cs b/Myshipping.Core/Entity/DJY/DJYTenantParamItem.cs deleted file mode 100644 index 73f44e37..00000000 --- a/Myshipping.Core/Entity/DJY/DJYTenantParamItem.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using SqlSugar; -using System.ComponentModel; -using Myshipping.Core.Entity; -namespace Myshipping.Core.Entity -{ - /// - /// 租户参数定义 - /// - [SugarTable("djy_tenant_param_item")] - [Description("租户参数定义")] - public class DjyTenantParamItem : PrimaryKeyEntity - { - /// - /// 租户参数类别 - /// - public string ParaCode { get; set; } - /// - /// 租户参数代码 - /// - public string ItemCode { get; set; } - /// - /// 租户参数名称 - /// - public string ItemName { get; set; } - /// - /// 备注 - /// - public string Remark { get; set; } - /// - /// 排序 - /// - public int? Sort { get; set; } - } -} \ No newline at end of file diff --git a/Myshipping.Core/Entity/DJY/DJYTenantParamValue.cs b/Myshipping.Core/Entity/DJY/DJYTenantParamValue.cs deleted file mode 100644 index 8711752e..00000000 --- a/Myshipping.Core/Entity/DJY/DJYTenantParamValue.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using SqlSugar; -using System.ComponentModel; -using Myshipping.Core.Entity; -namespace Myshipping.Core.Entity -{ - /// - /// 租户参数表 - /// - [SugarTable("djy_tenant_param_value")] - [Description("租户参数表")] - public class DjyTenantParamValue : PrimaryKeyEntity - { - /// - /// 参数类别 - /// - public string ParaCode { get; set; } - /// - /// 租户id - /// - public long? TenantId { get; set; } - /// - /// 参数 - /// - public string ItemCode { get; set; } - /// - /// 备注 - /// - public string Remark { get; set; } - /// - /// 排序 - /// - public int? Sort { get; set; } - } -} \ No newline at end of file