diff --git a/Myshipping.Application/Entity/BookingOrderSeaeEdi.cs b/Myshipping.Application/Entity/BookingOrderSeaeEdi.cs
index 654c5adf..b95043f5 100644
--- a/Myshipping.Application/Entity/BookingOrderSeaeEdi.cs
+++ b/Myshipping.Application/Entity/BookingOrderSeaeEdi.cs
@@ -41,6 +41,10 @@ namespace Myshipping.Application.Entity
///
public string VOYNO { get; set; }
///
+ /// 船公司ID
+ ///
+ public string CARRIERID { get; set; }
+ ///
/// 船公司EDI
///
public string CARRIER { get; set; }
diff --git a/Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs b/Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs
index a11220a2..b29108ff 100644
--- a/Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs
+++ b/Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs
@@ -109,7 +109,10 @@ namespace Myshipping.Application
entity.State = "已录入";
if (input.Id == 0)
{
-
+ if (!string.IsNullOrEmpty(entity.CARRIERID)) {
+ entity.CARRIER = _cache.GetAllCodeCarrier().Result.Where(x => x.Code == entity.CARRIERID).Select(x => x.EdiCode).FirstOrDefault();
+ }
+
await _seaeedi.InsertAsync(entity);
if (input.EdiCtn != null)
{
@@ -129,7 +132,10 @@ namespace Myshipping.Application
}
else
{
-
+ if (!string.IsNullOrEmpty(entity.CARRIERID))
+ {
+ entity.CARRIER = _cache.GetAllCodeCarrier().Result.Where(x => x.Code == entity.CARRIERID).Select(x => x.EdiCode).FirstOrDefault();
+ }
await _seaeedi.AsUpdateable(entity).IgnoreColumns(it => new
{
it.MBLNO,
diff --git a/Myshipping.Application/Service/BookingOrderSeaeEdi/Dto/BookingOrderSeaeEdiServiceDto.cs b/Myshipping.Application/Service/BookingOrderSeaeEdi/Dto/BookingOrderSeaeEdiServiceDto.cs
index d226a350..f42595b7 100644
--- a/Myshipping.Application/Service/BookingOrderSeaeEdi/Dto/BookingOrderSeaeEdiServiceDto.cs
+++ b/Myshipping.Application/Service/BookingOrderSeaeEdi/Dto/BookingOrderSeaeEdiServiceDto.cs
@@ -38,6 +38,10 @@ namespace Myshipping.Application.Service.BookingOrderSeaeEdi.Dto
///
public string VOYNO { get; set; }
///
+ /// 船公司ID
+ ///
+ public string CARRIERID { get; set; }
+ ///
/// 船公司EDI
///
public string CARRIER { get; set; }
diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml
index 59a82fb9..5a845f82 100644
--- a/Myshipping.Core/Myshipping.Core.xml
+++ b/Myshipping.Core/Myshipping.Core.xml
@@ -692,6 +692,11 @@
场站映射
+
+
+ 船代映射
+
+
起始港映射
@@ -6351,6 +6356,12 @@
+
+
+ 获取公共库 船代映射
+
+
+
设置公共库 船公司
@@ -6441,6 +6452,12 @@
+
+
+ 设置公共库 船代映射
+
+
+
设置公共库 起始港映射
@@ -6865,6 +6882,12 @@
+
+
+ 获取公共库 船代映射
+
+
+
设置公共库 船公司
@@ -6973,6 +6996,12 @@
+
+
+ 设置公共库 船代映射
+
+
+
设置公共库 起始港映射
@@ -7767,6 +7796,16 @@
新增船代信息
+
+
+ 获取船代映射
+
+
+
+
+ 新增编辑船代映射信息
+
+
获取场站列表信息
@@ -8138,6 +8177,31 @@
排序
+
+
+ 代码
+
+
+
+
+ 模块
+
+
+
+
+ 映射code
+
+
+
+
+ 备注
+
+
+
+
+ 排序
+
+
代码