jianghaiqing 8 months ago
commit 4a2f6d8537

@ -1136,11 +1136,11 @@ namespace Myshipping.Application
}
}
BookingOrderSyncTypeEnum syncTypeEnum = syncType switch
BookingOrderSyncTypeEnum? syncTypeEnum = syncType switch
{
"ALL" => BookingOrderSyncTypeEnum.ALL,
"BC" => BookingOrderSyncTypeEnum.BC,
_ => BookingOrderSyncTypeEnum.ALL,
//"FILE" => BookingOrderSyncTypeEnum.FILE,
_ => null,
};
await bookingOrderService.SendBookingOrder(new long[] { dbOrder.Id }, syncTypeEnum);
@ -1988,7 +1988,7 @@ namespace Myshipping.Application
custOrder.ExtendData = jobjBookAcc.ToJsonString();
var ctns = input.CtnList.Adapt<List<BookingCtn>>();
foreach(var ctn in ctns)
foreach (var ctn in ctns)
{
ctn.CTNALL = ctnList.First(x => x.Code == ctn.CTNCODE).Name;
}

@ -83,6 +83,7 @@ using Myshipping.Application.EDI.VOLTA;
using TinyPinyin;
using Furion.EventBus;
using Myshipping.Application.Service.BookingSlot.Dto;
using Myshipping.Application.Service.BookingOrder.Dto.MSKAPI;
namespace Myshipping.Application
{
@ -2182,7 +2183,7 @@ namespace Myshipping.Application
// 客户订舱:运营端发送订舱数据给客户端
if (App.Configuration["RunType"] == CommonConst.RUN_TYPE_DJY)
{
CustomerBookingSyncHelper.SendCustomerBookingSync(Id, "ALL");
CustomerBookingSyncHelper.SendCustomerBookingSync(Id, BookingOrderSyncTypeEnum.BC.ToString());
}
return ordOut;
@ -5084,8 +5085,10 @@ namespace Myshipping.Application
/// <param name="bookingId"></param>
/// <returns></returns>
[HttpPost("/BookingOrder/VgmSend")]
public async Task VgmSend(long bookingId)
public async Task<object> VgmSend(long bookingId)
{
object result = null;
var order = _rep.FirstOrDefault(x => x.Id == bookingId);
var ctns = _repCtn.Where(x => x.BILLID == bookingId).ToList();
@ -5101,14 +5104,150 @@ namespace Myshipping.Application
throw Oops.Bah(BookingErrorCode.BOOK127);
}
var config = _cache.GetAllTenantParam().Result.FirstOrDefault(x => x.TenantId == UserManager.TENANT_ID && x.ParaCode == "VgmDirectSendCarrierId");
/* 1. API API
* 2. API
*/
var tenantParamList = _cache.GetAllTenantParam().Result;
var vgmApiSendCarrierIdStr = tenantParamList.FirstOrDefault(x => x.TenantId == UserManager.TENANT_ID && x.ParaCode == "VgmApiSendCarrierId");
string[] vgmApiSendCarrierIdArr = vgmApiSendCarrierIdStr == null
? new string[0]
: vgmApiSendCarrierIdStr.ItemCode.Split(",");
// VGM发送方式1通过API发送
if (vgmApiSendCarrierIdArr.Contains(order.CARRIERID))
{
try
{
if (!order.CARRIERID.Equals("MSK", StringComparison.OrdinalIgnoreCase))
{
throw Oops.Bah($"[{order.CARRIERID}]船公司暂不支持通过API发送VGM");
}
//config1
string userKey = App.Configuration["MSKAPIDjyUserKey"];
string userSecret = App.Configuration["MSKAPIDjyUserSecret"];
string env = App.Configuration["MSKAPIOPEnvironment"];
if (string.IsNullOrWhiteSpace(userKey) || string.IsNullOrWhiteSpace(userSecret) || string.IsNullOrWhiteSpace(env))
{
throw Oops.Bah("通过MSKAPI发送VGM所需的Key或Secret或Environment未配置请联系管理员");
}
// config2
var webAccount = await _webAccountConfig.GetAccountConfig("MSKApi", UserManager.UserId) ?? throw Oops.Bah("未配置网站账户类型MSKApi");
// config3
var allSysConfig = await _cache.GetAllSysConfig();
var url = allSysConfig.FirstOrDefault(x => x.Code == "VgmSendMskApiUrl")?.Value;
if (string.IsNullOrWhiteSpace(url))
{
throw Oops.Bah("通过MSKAPI发送VGM所需的Url未配置请联系管理员配置名称[VgmSendMskApiUrl]");
}
// config4
var vgmSendMskCustomerCode = tenantParamList.FirstOrDefault(x => x.TenantId == UserManager.TENANT_ID && x.ParaCode == "VgmSendMskCustomerCode")?.ItemCode;
if (string.IsNullOrWhiteSpace(vgmSendMskCustomerCode))
{
throw Oops.Bah("通过MSKAPI发送VGM所需的[客户编号],请联系管理员,配置名称:[VgmSendMskCustomerCode]");
}
var param = new
{
userKey,
userSecret,
operatingEnvironment = env,
mskAppKey = webAccount.Account,
mskAppSecret = webAccount.Password,
shipmentNumber = order.MBLNO,
brandCode = "MAEU",
customerCode = vgmSendMskCustomerCode,
terminalCode = "",
containerList = new List<object>()
};
foreach (var ctn in ctns)
{
if (string.IsNullOrEmpty(ctn.CNTRNO)
|| !ctn.WEIGHKGS.HasValue
|| ctn.WEIGHKGS == 0
|| string.IsNullOrWhiteSpace(ctn.WEIGHTYPE))
{
throw Oops.Bah("所有箱子的箱号、称重重量、称重方式都不能为空");
}
var vgmMethod = ctn.WEIGHTYPE switch
{
"累加" => "CALCULATED",
"总重" => "SCALED",
_ => throw Oops.Bah($"箱号为[{ctn.CNTRNO}]的箱子称重方式非[累加]或[总重],请检查")
};
param.containerList.Add(new
{
containerNumber = ctn.CNTRNO,
vgmSource = "Shipper",
vgm = ctn.WEIGHKGS,
vgmUnit = "KGS",
vgmMethod,
authorizedPersonName = UserManager.Name,
authorizedPersonEmail = UserManager.Email
});
}
_logger.LogInformation("通过MSKAPI发送VGM单号{mblno},入参:{param}", order.MBLNO, param.ToJson());
var resp = await url.SetBody(param).PostAsAsync<MSKAPISendVgmResultDto>();
_logger.LogInformation("通过MSKAPI发送VGM单号{mblno},响应:{resp}", order.MBLNO, resp.ToJson());
if (resp.code == 200)
{
if (resp.data.Any(x => !x.status))
{
result = resp.data.Select(x => new
{
CNTRNO = x.containerNumber,
IsSuccess = x.status,
FailReason = x.error_msg
}).ToList();
_logger.LogInformation("通过MSKAPI发送VGM部分成功单号{mblno},详细结果:{data}", order.MBLNO, result.ToJson());
}
else
{
_logger.LogInformation("通过MSKAPI发送VGM全部成功单号{mblno},详细结果:{data}", order.MBLNO, result.ToJson());
//货运动态
var bsl = new BookingStatusLog();
bsl.BookingId = order.Id;
bsl.Status = $"直发VGM(API)";
bsl.OpTime = DateTime.Now;
bsl.Category = "ship";
bsl.MBLNO = order.MBLNO;
await _repStatuslog.InsertAsync(bsl);
}
}
else
{
_logger.LogInformation("通过MSKAPI发送VGMVGM服务接口返回失败结果单号{mblno}", order.MBLNO);
throw Oops.Bah($"VGM服务接口返回失败结果{resp.msg}");
}
}
catch (Exception ex)
{
_logger.LogError(ex, "通过MSKAPI发送VGM时发生未知异常单号{mblno}", order.MBLNO);
throw Oops.Bah($"发送失败:{ex.Message}");
}
}
else
{
var config = tenantParamList.FirstOrDefault(x => x.TenantId == UserManager.TENANT_ID && x.ParaCode == "VgmDirectSendCarrierId");
if (config == null)
{
throw Oops.Bah("请配置租户的VGM直发船司参数");
}
var arrCarr = config.ItemCode.Split(",", StringSplitOptions.RemoveEmptyEntries);
if (!arrCarr.Contains(order.CARRIERID)) //使用大简云发送vgm
// VGM发送方式2使用大简云发送vgm
if (!arrCarr.Contains(order.CARRIERID))
{
//ETD不能为空
if (!order.ETD.HasValue)
@ -5199,7 +5338,8 @@ namespace Myshipping.Application
throw Oops.Bah(jobjRtn.GetStringValue("Message"));
}
}
else //直接调用vgm接口直发
// VGM发送方式3直接调用vgm接口直发
else
{
//判断船公司是否支持
var allowCarrier = _cache.GetAllDictData().Result.Where(x => x.TypeCode == "vgm_carrier_list").Select(x => x.Code).ToList();
@ -5359,10 +5499,13 @@ namespace Myshipping.Application
bsl.MBLNO = order.MBLNO;
await _repStatuslog.InsertAsync(bsl);
}
}
//设置货物状态已发VGM并回传东胜
await SetGoodsStatus("YFVGM", bookingId);
await SendBookingOrder(new long[] { bookingId });
return result;
}
@ -9845,6 +9988,7 @@ namespace Myshipping.Application
var files = await _bookingfile.AsQueryable().Filter(null, true).Where(x => x.BookingId == item.Id).ToListAsync();
dto.Files = files.Select(x => new ReceiveBcInfoDto.DownloadFile()
{
Id = x.Id,
FileName = x.FileName,
FileType = x.TypeCode,
FilePath = x.FilePath
@ -11774,7 +11918,7 @@ namespace Myshipping.Application
if (App.Configuration["RunType"] == CommonConst.RUN_TYPE_DJY)
{
//推送订舱数据到客户订舱系统
CustomerBookingSyncHelper.SendCustomerBookingSync(bookingId, "ALL");
CustomerBookingSyncHelper.SendCustomerBookingSync(bookingId);
}
}
/// <summary>
@ -11992,6 +12136,8 @@ namespace Myshipping.Application
x.VOYNO = input.VOYNO;
x.ETD = input.ETD;
x.UpdatedTime = DateTime.Now;
x.UpdatedUserId = UserManager.UserId;
x.UpdatedUserName = UserManager.Name;
});
var changeNum = await _rep.Context.Updateable(list).UpdateColumns(x => new
@ -12004,13 +12150,35 @@ namespace Myshipping.Application
x.VOYNO,
x.ETD,
x.UpdatedTime,
x.UpdatedUserId,
x.UpdatedUserName
}).ExecuteCommandAsync();
foreach (var item in list)
{
// 保存日志
var oldOrder = oldOrderList.FirstOrDefault(x => x.Id == item.Id);
await SaveLog(item, oldOrder, "接收BC后更新订舱");
if (input.Files != null)
{
// 保存文件
foreach (var fileItem in input.Files)
{
var insFile = new BookingFile()
{
BookingId = item.Id,
FileName = fileItem.FileName,
FilePath = fileItem.FilePath,
TypeCode = fileItem.FileType,
TypeName = fileItem.FileType switch { "BC" => "BC", _ => "未定义" },
TenantId = item.TenantId,
TenantName = item.TenantName
};
await _bookingfile.InsertAsync(insFile);
}
}
// 客户订舱:运营端发送订舱数据给客户端
if (App.Configuration["RunType"] == CommonConst.RUN_TYPE_DJY)

@ -0,0 +1,46 @@
using System.Collections.Generic;
namespace Myshipping.Application.Service.BookingOrder.Dto.MSKAPI
{
public class MSKAPISendVgmResultDto
{
public int code { get; set; }
public string msg { get; set; }
public List<VGMInfoByCtn> data { get; set; }
public class VGMInfoByCtn
{
/// <summary>
/// 单号
/// </summary>
public string shipmentNumber { get; set; }
/// <summary>
/// 箱号
/// </summary>
public string containerNumber { get; set; }
/// <summary>
/// 提交状态
/// </summary>
public bool status { get; set; }
public SuccessResult success_result { get; set; }
/// <summary>
/// 提交失败的提示文本
/// </summary>
public string error_msg { get; set; }
}
public class SuccessResult
{
/// <summary>
/// 操作的结果
/// </summary>
public string vgmAcknowledgmentMessage { get; set; }
/// <summary>
/// 操作完成的时间戳
/// </summary>
public string vgmTimestamp { get; set; }
}
}
}

@ -17,6 +17,7 @@ namespace Myshipping.Application.Service.BookingOrder.Dto
public class DownloadFile
{
public long Id { get; set; }
public string FileName { get; set; }
public string FileType { get; set; }
public string FilePath { get; set; }

@ -41,6 +41,7 @@ using Myshipping.Core.Service.Dict.Dto;
using Furion.JsonSerialization;
using Microsoft.AspNetCore.SignalR;
using Furion.EventBus;
using Myshipping.Core.Const;
namespace Myshipping.Application
{
@ -2512,22 +2513,38 @@ namespace Myshipping.Application
#endregion
#endregion
#region ATD MDGETA MDGATA
#region 船舶动态ATD ETD ATA ETA MDGETA MDGATA
if (item.Status == "ATD" || item.Status == "ETD" || item.Status == "ATA" || item.Status == "ETA" || item.Status == "MDGETA" || item.Status == "MDGATA")
{
var enableStatusToSailingDate = _cache.GetAllTenantParam().Result
.FirstOrDefault(x => x.TenantId == UserManager.TENANT_ID
&& x.ParaCode == TenantParamCode.ENABLE_STATUS_TO_SAILING_DATE)?.ItemCode;
if (enableStatusToSailingDate == "YES")
{
if (item.Status == "ATD")
{
//2023-8-31排查单号为177GZHZHQ5711V的数据原来录入的船已开船运踪港前不再查询而因订阅港后数据会继续回推数据所以导致ATD被改
//因此暂时取消运踪回推时写入ATD还是以船期表查询为准
////变更ATD
//var o = _rep.AsQueryable().Filter(null, true).Where(x => x.Id == all[0].BookingId && x.IsDeleted == false).First();
//var oldorder = o;
//var oldatd = o == null ? null : o.ATD;
//if (oldatd != item.OpTime && item.OpTime != null)
//{
// o.ATD = item.OpTime;
// await _rep.UpdateAsync(o);
// flag = true;
// await _bookingorderservice.SaveLog(o, oldorder);
//}
// 2024-4-8 因为港捷需要,重新开启,并通过租户参数判断
//变更ATD
var oldOrder = await _rep.AsQueryable().Filter(null, true).Where(x => x.Id == item.BookingId && x.IsDeleted == false).FirstAsync();
if (oldOrder != null && item.OpTime != null && oldOrder.ATD != item.OpTime)
{
var newOrder = oldOrder.Adapt<BookingOrder>();
newOrder.ATD = item.OpTime;
newOrder.UpdatedUserId = UserManager.UserId;
newOrder.UpdatedUserName = UserManager.Name;
await _rep.AsUpdateable(newOrder).UpdateColumns(x => new
{
x.ATD,
x.UpdatedTime,
x.UpdatedUserId,
x.UpdatedUserName
}).ExecuteCommandAsync();
flag = true;
await _bookingorderservice.SaveLog(newOrder, oldOrder, "运踪更新船期");
}
/*
* 2023824ATD
@ -2553,20 +2570,86 @@ namespace Myshipping.Application
// }
//}
}
if (item.Status == "MDGETA")
else if (item.Status == "ETD")
{
var oldOrder = await _rep.AsQueryable().Filter(null, true).Where(x => x.Id == item.BookingId && x.IsDeleted == false).FirstAsync();
if (oldOrder != null && item.OpTime != null && oldOrder.YgtETD != item.OpTime)
{
var newOrder = oldOrder.Adapt<BookingOrder>();
newOrder.YgtETD = item.OpTime;
newOrder.UpdatedUserId = UserManager.UserId;
newOrder.UpdatedUserName = UserManager.Name;
await _rep.AsUpdateable(newOrder).UpdateColumns(x => new
{
var o = _rep.AsQueryable().Filter(null, true).Where(x => x.Id == all[0].BookingId && x.IsDeleted == false).First();
var oldorder = o.Adapt<BookingOrder>();
var oldeta = o == null ? null : o.ETA;
if (oldeta != item.OpTime && item.OpTime != null)
x.YgtETD,
x.UpdatedTime,
x.UpdatedUserId,
x.UpdatedUserName
}).ExecuteCommandAsync();
flag = true;
await _bookingorderservice.SaveLog(newOrder, oldOrder, "运踪更新船期");
}
}
else if (item.Status == "ATA")
{
var oldOrder = await _rep.AsQueryable().Filter(null, true).Where(x => x.Id == item.BookingId && x.IsDeleted == false).FirstAsync();
if (oldOrder != null && item.OpTime != null && oldOrder.StartATA != item.OpTime)
{
var newOrder = oldOrder.Adapt<BookingOrder>();
newOrder.StartATA = item.OpTime;
newOrder.UpdatedUserId = UserManager.UserId;
newOrder.UpdatedUserName = UserManager.Name;
await _rep.AsUpdateable(newOrder).UpdateColumns(x => new
{
o.ETA = item.OpTime;
await _rep.UpdateAsync(o);
x.StartATA,
x.UpdatedTime,
x.UpdatedUserId,
x.UpdatedUserName
}).ExecuteCommandAsync();
flag = true;
await _bookingorderservice.SaveLog(o, oldorder, "运踪回推");
await _bookingorderservice.SaveLog(newOrder, oldOrder, "运踪更新船期");
}
}
else if (item.Status == "ETA")
{
var oldOrder = await _rep.AsQueryable().Filter(null, true).Where(x => x.Id == item.BookingId && x.IsDeleted == false).FirstAsync();
if (oldOrder != null && item.OpTime != null && oldOrder.StartETA != item.OpTime)
{
var newOrder = oldOrder.Adapt<BookingOrder>();
newOrder.StartETA = item.OpTime;
newOrder.UpdatedUserId = UserManager.UserId;
newOrder.UpdatedUserName = UserManager.Name;
await _rep.AsUpdateable(newOrder).UpdateColumns(x => new
{
x.StartETA,
x.UpdatedTime,
x.UpdatedUserId,
x.UpdatedUserName
}).ExecuteCommandAsync();
flag = true;
await _bookingorderservice.SaveLog(newOrder, oldOrder, "运踪更新船期");
}
}
else if (item.Status == "MDGETA")
{
var oldOrder = await _rep.AsQueryable().Filter(null, true).Where(x => x.Id == item.BookingId && x.IsDeleted == false).FirstAsync();
if (oldOrder != null && item.OpTime != null && oldOrder.ETA != item.OpTime)
{
var newOrder = oldOrder.Adapt<BookingOrder>();
newOrder.ETA = item.OpTime;
newOrder.UpdatedUserId = UserManager.UserId;
newOrder.UpdatedUserName = UserManager.Name;
await _rep.AsUpdateable(newOrder).UpdateColumns(x => new
{
x.ETA,
x.UpdatedTime,
x.UpdatedUserId,
x.UpdatedUserName
}).ExecuteCommandAsync();
flag = true;
await _bookingorderservice.SaveLog(newOrder, oldOrder, "运踪更新船期");
}
//if (!string.IsNullOrEmpty(o.VESSEL) && !string.IsNullOrEmpty(o.VOYNO) && !string.IsNullOrEmpty(o.CARRIERID))
//{
// var order = await _rep.AsQueryable().Filter(null, true).Where(x => x.VOYNO == o.VOYNO && x.VESSEL == o.VESSEL && x.CARRIERID == o.CARRIERID && x.TenantId == o.TenantId && x.IsDeleted == false && x.Id != item.BookingId).ToListAsync();
@ -2584,21 +2667,26 @@ namespace Myshipping.Application
// }
//}
}
if (item.Status == "MDGATA")
else if (item.Status == "MDGATA")
{
var o = _rep.AsQueryable().Filter(null, true).Where(x => x.Id == all[0].BookingId && x.IsDeleted == false).First();
var oldorder = o.Adapt<BookingOrder>();
var oldata = o == null ? null : o.ATA;
if (oldata != item.OpTime && item.OpTime != null)
var oldOrder = await _rep.AsQueryable().Filter(null, true).Where(x => x.Id == item.BookingId && x.IsDeleted == false).FirstAsync();
if (oldOrder != null && item.OpTime != null && oldOrder.ATA != item.OpTime)
{
o.ATA = item.OpTime;
await _rep.UpdateAsync(o);
var newOrder = oldOrder.Adapt<BookingOrder>();
newOrder.ATA = item.OpTime;
newOrder.UpdatedUserId = UserManager.UserId;
newOrder.UpdatedUserName = UserManager.Name;
await _rep.AsUpdateable(newOrder).UpdateColumns(x => new
{
x.ATA,
x.UpdatedTime,
x.UpdatedUserId,
x.UpdatedUserName
}).ExecuteCommandAsync();
flag = true;
await _bookingorderservice.SaveLog(o, oldorder, "运踪回推");
await _bookingorderservice.SaveLog(newOrder, oldOrder, "运踪更新船期");
}
//if (!string.IsNullOrEmpty(o.VESSEL) && !string.IsNullOrEmpty(o.VOYNO) && !string.IsNullOrEmpty(o.CARRIERID))
//{
// var order = await _rep.AsQueryable().Filter(null, true).Where(x => x.VOYNO == o.VOYNO && x.VESSEL == o.VESSEL && x.CARRIERID == o.CARRIERID && x.TenantId == o.TenantId && x.IsDeleted == false && x.Id != item.BookingId).ToListAsync();
@ -2616,6 +2704,8 @@ namespace Myshipping.Application
// }
//}
}
}
}
#endregion

@ -12,7 +12,7 @@ namespace Myshipping.Application.Service.DataSync.Dto
public class SyncBookingOrderDto
{
/// <summary>
/// 字段同步类型 空:更新全部字段 BC只更新BC相关字段
/// 字段同步类型(用于客户订舱,彩虹+东胜7独立版本所有字段都不同步 BC只同步BC+文件相关字段 FILE只同步文件相关字段
/// </summary>
public string SyncType { get; set; }

@ -19,5 +19,10 @@
/// 是否必须使用船期表录入船期参数
/// </summary>
public const string VESSEL_FROM_CONFIG_ONLY = "VESSEL_FROM_CONFIG_ONLY";
/// <summary>
/// 通过运踪更新船舶动态开关
/// </summary>
public const string ENABLE_STATUS_TO_SAILING_DATE = "EnableStatusToSailingDate";
}
}

@ -1,16 +1,16 @@
namespace Myshipping.Core;
/// <summary>
/// 订舱记录同步类型
/// 字段同步类型(用于客户订舱,彩虹+东胜7独立版本
/// </summary>
public enum BookingOrderSyncTypeEnum
{
/// <summary>
/// 同步全部字段(未指定时,默认为同步全部)
/// </summary>
ALL = 0,
/// <summary>
/// 只同步BC相关字段
/// 只同步BC+文件相关字段
/// </summary>
BC = 1,
///// <summary>
///// 只同步文件相关字段
///// </summary>
//FILE = 2,
}

@ -174,6 +174,7 @@ namespace Myshipping.Core
374126362341445,
142307070910563,
142307000914633,
533697384435781 //复制项配置
};
foreach (var menuId in initMenu)

@ -867,6 +867,11 @@
是否必须使用船期表录入船期参数
</summary>
</member>
<member name="F:Myshipping.Core.Const.TenantParamCode.ENABLE_STATUS_TO_SAILING_DATE">
<summary>
通过运踪更新船舶动态开关
</summary>
</member>
<member name="P:Myshipping.Core.Entity.CodeCarrier.Code">
<summary>
代码
@ -4462,17 +4467,12 @@
</member>
<member name="T:Myshipping.Core.BookingOrderSyncTypeEnum">
<summary>
订舱记录同步类型
</summary>
</member>
<member name="F:Myshipping.Core.BookingOrderSyncTypeEnum.ALL">
<summary>
同步全部字段(未指定时,默认为同步全部)
字段同步类型(用于客户订舱,彩虹+东胜7独立版本
</summary>
</member>
<member name="F:Myshipping.Core.BookingOrderSyncTypeEnum.BC">
<summary>
只同步BC相关字段
只同步BC+文件相关字段
</summary>
</member>
<member name="T:Myshipping.Core.CacheType">

Loading…
Cancel
Save