运踪

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

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

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",