From 3fe3341e111cdc4b0dbcbc311c52a7e15988e21b Mon Sep 17 00:00:00 2001
From: wanghaomei <wanghaomei@myshipping.net>
Date: Thu, 31 Aug 2023 15:34:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=AD=97=E6=AE=B5=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=20bsno=E5=8F=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Myshipping.Application/Entity/BookingOrder.cs |  4 +--
 .../BookingOrder/BookingOrderService.cs       |  2 +-
 .../BookingOrder/Dto/BookingOrderInput.cs     |  2 +-
 .../BookingOrder/Dto/SyncCustomerDto.cs       | 26 +++++++++++++++++++
 .../Properties/launchSettings.json            |  4 +--
 5 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/Myshipping.Application/Entity/BookingOrder.cs b/Myshipping.Application/Entity/BookingOrder.cs
index 7ced34d..416f52f 100644
--- a/Myshipping.Application/Entity/BookingOrder.cs
+++ b/Myshipping.Application/Entity/BookingOrder.cs
@@ -12,7 +12,7 @@ namespace Myshipping.Application.Entity
     public class BookingOrder : DBEntityTenant
     {
         /// <summary>
-        /// 第三方系统编号
+        /// 第三方系统编号（客户订舱系统中的编号）
         /// </summary>
         //[Description("第三方系统编号")]
         public string BSNO { get; set; }
@@ -42,7 +42,7 @@ namespace Myshipping.Application.Entity
         [Description("分提单号")]
         public string HBLNO { get; set; }
         /// <summary>
-        /// 业务编号
+        /// 业务编号（订单编号)
         /// </summary>
         [Description("业务编号")]
         public string BOOKINGNO { get; set; }
diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
index 336be44..5813d05 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
@@ -972,7 +972,7 @@ namespace Myshipping.Application
                 {
                     it.ParentId,
                     it.BSDATE,
-                    it.BSNO,
+                    //it.BSNO,
                     it.TenantId,
                     it.CreatedTime,
                     it.CreatedUserId,
diff --git a/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderInput.cs b/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderInput.cs
index 3839e98..2bc967b 100644
--- a/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderInput.cs
+++ b/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderInput.cs
@@ -56,7 +56,7 @@ namespace Myshipping.Application
         public virtual string HBLNO { get; set; }
 
         /// <summary>
-        /// 业务编号
+        /// 业务编号（订单编号）
         /// </summary>
         public virtual string BOOKINGNO { get; set; }
 
diff --git a/Myshipping.Application/Service/BookingOrder/Dto/SyncCustomerDto.cs b/Myshipping.Application/Service/BookingOrder/Dto/SyncCustomerDto.cs
index a4baec7..17b42f0 100644
--- a/Myshipping.Application/Service/BookingOrder/Dto/SyncCustomerDto.cs
+++ b/Myshipping.Application/Service/BookingOrder/Dto/SyncCustomerDto.cs
@@ -20,6 +20,10 @@ namespace Myshipping.Application.Service.BookingOrder.Dto
         /// </summary>
         public string MBLNO { get; set; }
         /// <summary>
+        /// 分提单号
+        /// </summary>
+        public string HBLNO { get; set; }
+        /// <summary>
         /// 场站代码
         /// </summary>
         public string YARDID { get; set; }
@@ -207,6 +211,28 @@ namespace Myshipping.Application.Service.BookingOrder.Dto
         /// 箱高
         /// </summary>
         public decimal CtrnHeight { get; set; }
+
+        /// <summary>
+        /// 是否占舱
+        /// </summary>
+        public string ZhanCangFlag { get; set; }
+
+        /// <summary>
+        /// 申请箱使
+        /// </summary>
+        public string ShenQingXiangShi { get; set; }
+        /// <summary>
+        /// 中转港代码
+        /// </summary>
+        public string TRANSPORTID { get; set; }
+        /// <summary>
+        /// 中转港
+        /// </summary>
+        public string TRANSPORT { get; set; }
+        /// <summary>
+        /// 第三付款地
+        /// </summary>
+        public string THIRDPAYADDR { get; set; }
     }
 
     /// <summary>
diff --git a/Myshipping.Web.Entry/Properties/launchSettings.json b/Myshipping.Web.Entry/Properties/launchSettings.json
index 0e72b22..22439a4 100644
--- a/Myshipping.Web.Entry/Properties/launchSettings.json
+++ b/Myshipping.Web.Entry/Properties/launchSettings.json
@@ -3,8 +3,8 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:63602/",
-      "sslPort": 44337
+      "applicationUrl": "http://localhost:52082/",
+      "sslPort": 44350
     }
   },
   "profiles": {