|
|
@ -829,55 +829,7 @@ namespace Myshipping.Application
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
await SaveLog(entity, mlist);
|
|
|
|
|
|
|
|
|
|
|
|
bool flag = true;
|
|
|
|
|
|
|
|
long bid = 0;
|
|
|
|
|
|
|
|
foreach (PropertyDescriptor descriptor in TypeDescriptor.GetProperties(entity))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
string name = descriptor.Name;
|
|
|
|
|
|
|
|
if (name == "TenantId" || name == "CreatedTime" || name == "UpdatedTime" || name == "CreatedUserId" || name == "CreatedUserName")
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
object value = descriptor.GetValue(entity);
|
|
|
|
|
|
|
|
var oldvalue = mlist.GetType().GetProperty(name).GetValue(mlist, null);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (name == "KGS" || name == "CBM")
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if (Convert.ToDecimal(value) == Convert.ToDecimal(oldvalue))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
string _oldvalue = oldvalue != null ? oldvalue.ToString() : "";
|
|
|
|
|
|
|
|
string _value = value != null ? value.ToString() : "";
|
|
|
|
|
|
|
|
if (_oldvalue != _value && !string.IsNullOrWhiteSpace(descriptor.Description))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if (flag)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
////添加booking日志
|
|
|
|
|
|
|
|
bid = await _bookinglog.InsertReturnSnowflakeIdAsync(new BookingLog
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
Type = "Edit",
|
|
|
|
|
|
|
|
BookingId = entity.Id,
|
|
|
|
|
|
|
|
TenantId = Convert.ToInt64(UserManager.TENANT_ID),
|
|
|
|
|
|
|
|
CreatedTime = DateTime.Now,
|
|
|
|
|
|
|
|
CreatedUserId = UserManager.UserId,
|
|
|
|
|
|
|
|
CreatedUserName = UserManager.Name
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
flag = false;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
await _bookinglogdetail.InsertReturnSnowflakeIdAsync(new BookingLogDetail
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
PId = bid,
|
|
|
|
|
|
|
|
Field = descriptor.Description,
|
|
|
|
|
|
|
|
OldValue = _oldvalue,
|
|
|
|
|
|
|
|
NewValue = _value,
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var Id = entity.Id;
|
|
|
|
var Id = entity.Id;
|
|
|
@ -991,11 +943,11 @@ namespace Myshipping.Application
|
|
|
|
await SendBookingOrder(new long[] { main.ParentId == 0 ? Id : (long)main.ParentId });
|
|
|
|
await SendBookingOrder(new long[] { main.ParentId == 0 ? Id : (long)main.ParentId });
|
|
|
|
//推送订舱数据到客户订舱系统
|
|
|
|
//推送订舱数据到客户订舱系统
|
|
|
|
CustomerBookingSyncHelper.SendCustomerBookingSync(Id);
|
|
|
|
CustomerBookingSyncHelper.SendCustomerBookingSync(Id);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return ordOut;
|
|
|
|
return ordOut;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// <summary>
|
|
|
|
/// 在订舱台账保存单证备注、操作备注等功能
|
|
|
|
/// 在订舱台账保存单证备注、操作备注等功能
|
|
|
|
/// </summary>
|
|
|
|
/// </summary>
|
|
|
@ -7580,7 +7532,6 @@ namespace Myshipping.Application
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// <summary>
|
|
|
|
/// 下拉获取字段名称
|
|
|
|
/// 下拉获取字段名称
|
|
|
|
/// </summary>
|
|
|
|
/// </summary>
|
|
|
@ -7657,8 +7608,6 @@ namespace Myshipping.Application
|
|
|
|
return dynamic;
|
|
|
|
return dynamic;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// <summary>
|
|
|
|
/// 获取订舱数据接口 备注 、 文件 、日志、服务项目、状态日志
|
|
|
|
/// 获取订舱数据接口 备注 、 文件 、日志、服务项目、状态日志
|
|
|
|
/// </summary>
|
|
|
|
/// </summary>
|
|
|
@ -7932,7 +7881,7 @@ namespace Myshipping.Application
|
|
|
|
}
|
|
|
|
}
|
|
|
|
var json = dto.ToJsonString();
|
|
|
|
var json = dto.ToJsonString();
|
|
|
|
_logger.LogInformation("订舱数据回推:" + json);
|
|
|
|
_logger.LogInformation("订舱数据回推:" + json);
|
|
|
|
|
|
|
|
_logger.LogInformation("订舱数据回推地址:" + _cache.GetAllDictData().Result.Where(x => x.Code == "BookingOrderMQUri").Select(x => x.Value).FirstOrDefault());
|
|
|
|
try
|
|
|
|
try
|
|
|
|
{
|
|
|
|
{
|
|
|
|
const string MqActionExchangeName = "djy.output.dingcang.ds6";
|
|
|
|
const string MqActionExchangeName = "djy.output.dingcang.ds6";
|
|
|
@ -7945,7 +7894,7 @@ namespace Myshipping.Application
|
|
|
|
IModel mqModel = conn.CreateModel();
|
|
|
|
IModel mqModel = conn.CreateModel();
|
|
|
|
mqModel.ExchangeDeclare(MqActionExchangeName, ExchangeType.Direct);
|
|
|
|
mqModel.ExchangeDeclare(MqActionExchangeName, ExchangeType.Direct);
|
|
|
|
var queueName = $"{MqActionQueueName}.{UserManager.TENANT_ID}";
|
|
|
|
var queueName = $"{MqActionQueueName}.{UserManager.TENANT_ID}";
|
|
|
|
mqModel.QueueDeclare(queueName, false, false, false, null);
|
|
|
|
mqModel.QueueDeclare(queueName, true, false, false, null);
|
|
|
|
mqModel.QueueBind(queueName, MqActionExchangeName, queueName, null);
|
|
|
|
mqModel.QueueBind(queueName, MqActionExchangeName, queueName, null);
|
|
|
|
byte[] messageBodyBytes = Encoding.UTF8.GetBytes(SharpZipLib.Compress(json));
|
|
|
|
byte[] messageBodyBytes = Encoding.UTF8.GetBytes(SharpZipLib.Compress(json));
|
|
|
|
IBasicProperties props = mqModel.CreateBasicProperties();
|
|
|
|
IBasicProperties props = mqModel.CreateBasicProperties();
|
|
|
@ -8171,6 +8120,64 @@ namespace Myshipping.Application
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
|
|
/// 记录日志
|
|
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
|
|
|
[NonAction]
|
|
|
|
|
|
|
|
public async Task SaveLog(BookingOrder newOrder, BookingOrder oldOrder)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bool flag = true;
|
|
|
|
|
|
|
|
long bid = 0;
|
|
|
|
|
|
|
|
foreach (PropertyDescriptor descriptor in TypeDescriptor.GetProperties(newOrder))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
string name = descriptor.Name;
|
|
|
|
|
|
|
|
if (name == "TenantId" || name == "CreatedTime" || name == "UpdatedTime" || name == "CreatedUserId" || name == "CreatedUserName")
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
object value = descriptor.GetValue(newOrder);
|
|
|
|
|
|
|
|
var oldvalue = oldOrder.GetType().GetProperty(name).GetValue(oldOrder, null);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (name == "KGS" || name == "CBM")
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if (Convert.ToDecimal(value) == Convert.ToDecimal(oldvalue))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
string _oldvalue = oldvalue != null ? oldvalue.ToString() : "";
|
|
|
|
|
|
|
|
string _value = value != null ? value.ToString() : "";
|
|
|
|
|
|
|
|
if (_oldvalue != _value && !string.IsNullOrWhiteSpace(descriptor.Description))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if (flag)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
////添加booking日志
|
|
|
|
|
|
|
|
bid = await _bookinglog.InsertReturnSnowflakeIdAsync(new BookingLog
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
Type = "Edit",
|
|
|
|
|
|
|
|
BookingId = newOrder.Id,
|
|
|
|
|
|
|
|
TenantId = Convert.ToInt64(UserManager.TENANT_ID),
|
|
|
|
|
|
|
|
CreatedTime = DateTime.Now,
|
|
|
|
|
|
|
|
CreatedUserId = UserManager.UserId,
|
|
|
|
|
|
|
|
CreatedUserName = UserManager.Name
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
flag = false;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
await _bookinglogdetail.InsertReturnSnowflakeIdAsync(new BookingLogDetail
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
PId = bid,
|
|
|
|
|
|
|
|
Field = descriptor.Description,
|
|
|
|
|
|
|
|
OldValue = _oldvalue,
|
|
|
|
|
|
|
|
NewValue = _value,
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#endregion
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
|
|
|
#region 临时测试使用
|
|
|
|
#region 临时测试使用
|
|
|
|