diff --git a/Myshipping.Application/Myshipping.Application.xml b/Myshipping.Application/Myshipping.Application.xml
index df9bb1bf..00b2b228 100644
--- a/Myshipping.Application/Myshipping.Application.xml
+++ b/Myshipping.Application/Myshipping.Application.xml
@@ -5201,6 +5201,17 @@
订舱主表输出参数
+
+
+ 提箱小票链接
+
+
+
+
+ vgm链接
+
+
+
订舱打印模板服务
diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
index eeefe3c3..7e2bbab5 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
@@ -159,7 +159,7 @@ namespace Myshipping.Application
.WhereIF(!string.IsNullOrWhiteSpace(input.HUMIDITY), u => u.HUMIDITY == input.HUMIDITY)
.WhereIF(!string.IsNullOrWhiteSpace(input.TEMPMIN), u => u.TEMPMIN == input.TEMPMIN)
.WhereIF(!string.IsNullOrWhiteSpace(input.TEMPMAX), u => u.TEMPMAX == input.TEMPMAX)
- .WhereIF(input.ISCONTAINERSOC!=null, u => u.ISCONTAINERSOC == input.ISCONTAINERSOC)
+ .WhereIF(input.ISCONTAINERSOC != null, u => u.ISCONTAINERSOC == input.ISCONTAINERSOC)
.WhereIF(!string.IsNullOrWhiteSpace(input.SOREMARK), u => u.SOREMARK.Contains(input.SOREMARK))
.WhereIF(!string.IsNullOrWhiteSpace(input.SIREMARK), u => u.SIREMARK.Contains(input.SIREMARK))
.WhereIF(!string.IsNullOrWhiteSpace(input.YARDREMARK), u => u.YARDREMARK.Contains(input.YARDREMARK))
@@ -196,7 +196,7 @@ namespace Myshipping.Application
.WhereIF(!string.IsNullOrWhiteSpace(input.CUSTSERVICEID), u => u.CUSTSERVICEID == input.CUSTSERVICEID)
.WhereIF(!string.IsNullOrWhiteSpace(input.CUSTSERVICE), u => u.CUSTSERVICE.Contains(input.CUSTSERVICE))
.WhereIF(!string.IsNullOrWhiteSpace(input.CUSTOMERNAME), u => u.CUSTOMERNAME.Contains(input.CUSTOMERNAME))
- .WhereIF(input.CUSTOMERID !=null, u => u.CUSTOMERID == input.CUSTOMERID)
+ .WhereIF(input.CUSTOMERID != null, u => u.CUSTOMERID == input.CUSTOMERID)
.WhereIF(!string.IsNullOrWhiteSpace(input.FORWARDER), u => u.FORWARDER.Contains(input.FORWARDER))
.WhereIF(!string.IsNullOrWhiteSpace(input.CUSTSERVICE), u => u.CUSTSERVICE == input.CUSTSERVICE)
.WhereIF(!string.IsNullOrWhiteSpace(input.CUSTOMERNAME), u => u.CUSTOMERNAME == input.CUSTOMERNAME)
@@ -401,11 +401,11 @@ namespace Myshipping.Application
[HttpGet("/BookingOrder/get")]
public async Task Get(long Id)
{
- BookingOrderOutput list = new BookingOrderOutput();
+ BookingOrderOutput ordOut = new BookingOrderOutput();
var main = await _rep.FirstOrDefaultAsync(u => u.Id == Id);
if (main != null)
{
- list = main.Adapt();
+ ordOut = main.Adapt();
var ctnlist = await _repCtn.AsQueryable().Where(x => x.BILLID == Id).ToListAsync();
var ctninput = ctnlist.Adapt>();
foreach (var item in ctninput)
@@ -413,9 +413,20 @@ namespace Myshipping.Application
var ctndetaillist = await _ctndetailrep.AsQueryable().Where(x => x.CTNID == item.Id).ToListAsync();
item.ctnDetailInputs = ctndetaillist.Adapt>();
}
- list.ctnInputs = ctninput;
+ ordOut.ctnInputs = ctninput;
+
+ var ordUrl = _repOrderUrl.FirstOrDefault(x => x.BookingId == Id);
+ if (ordUrl != null)
+ {
+ ordOut.Link = new BookingOrderUrlOutput()
+ {
+ LinkUrlTxxp = ordUrl.UrlTxxp,
+ LinkUrlVgm = ordUrl.UrlVgm,
+ LinkUrlVmgSi = ordUrl.UrlVgmSi,
+ };
+ }
}
- return list;
+ return ordOut;
}
#endregion
diff --git a/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderOutput.cs b/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderOutput.cs
index c374dd3c..8a416d36 100644
--- a/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderOutput.cs
+++ b/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderOutput.cs
@@ -5,9 +5,26 @@ namespace Myshipping.Application
///
/// 订舱主表输出参数
///
- public class BookingOrderOutput:BookingOrderDto
+ public class BookingOrderOutput : BookingOrderDto
{
-
-
+ public BookingOrderUrlOutput Link { get; set; }
+ }
+
+ public class BookingOrderUrlOutput
+ {
+ ///
+ /// 提箱小票链接
+ ///
+ public string LinkUrlTxxp { get; set; }
+
+ ///
+ /// vgm链接
+ ///
+ public string LinkUrlVgm { get; set; }
+
+ ///
+ /// vgm&si链接
+ ///
+ public string LinkUrlVmgSi { get; set; }
}
}