diff --git a/Myshipping.Application/Enum/BookingErrorCode.cs b/Myshipping.Application/Enum/BookingErrorCode.cs
index b6473960..20c561ce 100644
--- a/Myshipping.Application/Enum/BookingErrorCode.cs
+++ b/Myshipping.Application/Enum/BookingErrorCode.cs
@@ -134,6 +134,7 @@ namespace Myshipping.Application.Enum
BOOK128,
+
///
/// 附件不存在
///
diff --git a/Myshipping.Application/Myshipping.Application.xml b/Myshipping.Application/Myshipping.Application.xml
index 3ea7c4d7..22388c82 100644
--- a/Myshipping.Application/Myshipping.Application.xml
+++ b/Myshipping.Application/Myshipping.Application.xml
@@ -4366,7 +4366,14 @@
- 保存(新增或修改)下货纸
+ 保存(新增或修改)放舱
+
+
+
+
+
+
+ 放舱发送
@@ -4393,6 +4400,13 @@
类型,1:pdf、2:xlsx
+
+
+ 发送下货纸
+
+
+
+
获取提箱小票链接
diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
index 91a9c86e..b3956a70 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
@@ -657,7 +657,7 @@ namespace Myshipping.Application
}
#endregion
- #region 放舱(下货纸)
+ #region 放舱(入货通知)
///
/// 获取放舱信息
@@ -696,7 +696,7 @@ namespace Myshipping.Application
}
///
- /// 保存(新增或修改)下货纸
+ /// 保存(新增或修改)放舱
///
///
///
@@ -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);
+ }
+ }
+
+ ///
+ /// 放舱发送
+ ///
+ ///
+ ///
+ [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("放舱信息未找到,请先保存数据");
+ }
+
+
}
///
@@ -828,6 +850,27 @@ namespace Myshipping.Application
}
#endregion
+ #region 下货纸
+ ///
+ /// 发送下货纸
+ ///
+ ///
+ ///
+ [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