From 08f799c7322f6c237630723c6cafb5db1ea25104 Mon Sep 17 00:00:00 2001
From: wet <1034391973@qq.com>
Date: Tue, 20 Dec 2022 09:57:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Myshipping.Application/Myshipping.Application.xml    |  7 ++++++-
 .../Service/BookingOrder/BookingOrderService.cs      | 12 ++++--------
 Myshipping.Web.Core/dbsettings.json                  |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Myshipping.Application/Myshipping.Application.xml b/Myshipping.Application/Myshipping.Application.xml
index 42dc9b85..9d321af9 100644
--- a/Myshipping.Application/Myshipping.Application.xml
+++ b/Myshipping.Application/Myshipping.Application.xml
@@ -4778,7 +4778,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Myshipping.Application.BookingOrderService.SendTrace(System.String,System.String,System.String,System.String)">
+        <member name="M:Myshipping.Application.BookingOrderService.SendTrace(System.String,System.String,System.String,System.String,System.String,System.String,System.Boolean)">
             <summary>
             调用运踪接口
             </summary>
@@ -5186,6 +5186,11 @@
             创建者名称
             </summary>
         </member>
+        <member name="P:Myshipping.Application.Service.BookingOrder.Dto.BookingRemarkDto.Id">
+            <summary>
+            备注id
+            </summary>
+        </member>
         <member name="P:Myshipping.Application.Service.BookingOrder.Dto.BookingRemarkDto.PId">
             <summary>
             业务id
diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
index 826f0ac7..840695b4 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
@@ -891,10 +891,10 @@ namespace Myshipping.Application
             {
                 BusinessId = BusinessId,
                 MBLNO = MBLNO,
-                YARD = YARD,
-                YardCode = YARDID,
-                CARRIER = CARRIER,
-                CARRIERID = CARRIERID,
+                YARD = YARD==""?null: YARD,
+                YardCode = YARDID == ""? null: YARDID,
+                CARRIER = CARRIER == "" ? null : CARRIER,
+                CARRIERID = CARRIERID == "" ? null : CARRIERID,
                 isBook = isbook
             });
             billdto.Children = billTraceList;
@@ -2199,7 +2199,6 @@ namespace Myshipping.Application
         }
         #endregion
 
-
         public async Task<string> InnerBookingOrClosingEDI(BookingOrClosingEDIOrderDto model)
         {
             string batchNo = IDGen.NextID().ToString();
@@ -2499,9 +2498,6 @@ namespace Myshipping.Application
             await _bookingfile.InsertAsync(bookFile);
         }
  
-        
-
-
         #region 下载订舱、截单EDI
         /// <summary>
         /// 下载订舱、截单EDI
diff --git a/Myshipping.Web.Core/dbsettings.json b/Myshipping.Web.Core/dbsettings.json
index 91afdab4..e6c4caa4 100644
--- a/Myshipping.Web.Core/dbsettings.json
+++ b/Myshipping.Web.Core/dbsettings.json
@@ -2,7 +2,7 @@
   "ConnectionStrings": {
     "DefaultDbNumber": "0",
     "DefaultDbType": "MySql",
-    "DefaultDbString": "Data Source=60.209.125.238;Database=booking_auth_dev;User ID=djy;Password=123qwe;pooling=true;port=28012;sslmode=none;CharSet=utf8mb4;Convert Zero Datetime=True;Allow Zero Datetime=True;",
+    "DefaultDbString": "Data Source=60.209.125.238;Database=booking_hechuan_dev;User ID=djy;Password=123qwe;pooling=true;port=28012;sslmode=none;CharSet=utf8mb4;Convert Zero Datetime=True;Allow Zero Datetime=True;",
     "DbConfigs": [
       {
         "DbNumber": "1",