Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

Myshipping.Application/Enum/BookingErrorCode.cs

@@ -134,6 +134,7 @@ namespace Myshipping.Application.Enum
         BOOK128,
 
 
+
         /// <summary>
         /// 附件不存在
         /// </summary>

Myshipping.Application/Myshipping.Application.xml

@@ -4366,7 +4366,14 @@
         </member>
         <member name="M:Myshipping.Application.BookingOrderService.Save(Myshipping.Application.UpdateBookingLetteryardInput)">
             <summary>
-            保存（新增或修改）下货纸
+            保存（新增或修改）放舱
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Myshipping.Application.BookingOrderService.SendLetterYard(System.Int64)">
+            <summary>
+            放舱发送
             </summary>
             <param name="input"></param>
             <returns></returns>
@@ -4393,6 +4400,13 @@
             <param name="type">类型，1：pdf、2：xlsx</param>
             <returns></returns>
         </member>
+        <member name="M:Myshipping.Application.BookingOrderService.SendXHZ(System.Int64)">
+            <summary>
+            发送下货纸
+            </summary>
+            <param name="bookingId"></param>
+            <returns></returns>
+        </member>
         <member name="M:Myshipping.Application.BookingOrderService.TxxpLink(System.Int64)">
             <summary>
             获取提箱小票链接

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -657,7 +657,7 @@ namespace Myshipping.Application
         }
         #endregion
 
-        #region 放舱(下货纸)
+        #region 放舱(入货通知)
 
         /// <summary>
         /// 获取放舱信息
@@ -696,7 +696,7 @@ namespace Myshipping.Application
         }
 
         /// <summary>
-        /// 保存（新增或修改）下货纸
+        /// 保存（新增或修改）放舱
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -724,8 +724,30 @@ namespace Myshipping.Application
                 var txxpLink = await TxxpLink(input.BookingId);
             }
 
-            //todo：vgm、vgm&si链接
-            //...
+            //vgm链接
+            allowCarrier = _cache.GetAllDictData().Result.Where(x => x.TypeCode == "vgm_carrier_list").Select(x => x.Code).ToList();
+            if (!allowCarrier.Contains(order.CARRIERID))
+            {
+                await VgmLink(input.BookingId);
+            }
+        }
+
+        /// <summary>
+        /// 放舱发送
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("/BookingLetteryard/sendletteryard")]
+        public async Task SendLetterYard(long bookingId)
+        {
+            var order = _rep.FirstOrDefault(x => x.Id == bookingId);
+            var letterYard = await _repLetterYard.FirstOrDefaultAsync(x => x.BookingId == bookingId);
+            if (letterYard == null)
+            {
+                throw Oops.Oh("放舱信息未找到，请先保存数据");
+            }
+
+
         }
 
         /// <summary>
@@ -828,6 +850,27 @@ namespace Myshipping.Application
         }
         #endregion
 
+        #region 下货纸
+        /// <summary>
+        /// 发送下货纸
+        /// </summary>
+        /// <param name="bookingId"></param>
+        /// <returns></returns>
+        [HttpPost("/BookingOrder/sendxhz")]
+        public async Task SendXHZ(long bookingId)
+        {
+            await Task.Run(() =>
+             {
+                 var succ = XiahuozhiHelpler.Send(bookingId, "9", out string msg);
+                 if (!succ)
+                 {
+                     throw Oops.Oh($"发送失败：{msg}");
+                 }
+             });
+
+        }
+        #endregion
+
         #region 样单
 
         #endregion