whm
/
BookingHeChuan
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1

Browse Source
optimize
wet 1 year ago
parent 5358e73b4f
commit f4efe7f312
3 changed files with 89 additions and 65 deletions
Show Stats Download Patch File Download Diff File

21
Myshipping.Application/Entity/BookingOrder.cs
Unescape Escape View File

@ -24,7 +24,7 @@ namespace Myshipping.Application.Entity
/// <summary> /// <summary>
/// 业务状态名称 /// 业务状态名称
/// </summary> /// </summary>
//[Description("业务状态名称")] //[Description("业务状态")]
public string BSSTATUSNAME { get; set; } public string BSSTATUSNAME { get; set; }
/// <summary> /// <summary>
/// 业务日期 /// 业务日期
@ -154,7 +154,7 @@ namespace Myshipping.Application.Entity
/// <summary> /// <summary>
/// 起运港 /// 起运港
/// </summary> /// </summary>
[Description("起运港")] [Description("装货港")]
public string PORTLOAD { get; set; } public string PORTLOAD { get; set; }
/// <summary> /// <summary>
/// 卸货港代码 /// 卸货港代码
@ -266,7 +266,7 @@ namespace Myshipping.Application.Entity
/// <summary> /// <summary>
/// 毛重 /// 毛重
/// </summary> /// </summary>
[Description("毛重")] [Description("重量")]
public decimal? KGS { get; set; } public decimal? KGS { get; set; }
/// <summary> /// <summary>
/// 尺码 /// 尺码
@ -279,9 +279,9 @@ namespace Myshipping.Application.Entity
[Description("件数大写")] [Description("件数大写")]
public string TOTALNO { get; set; } public string TOTALNO { get; set; }
/// <summary> /// <summary>
/// 集装箱 /// 箱型箱量
/// </summary> /// </summary>
[Description("集装箱")] [Description("箱型箱量")]
public string CNTRTOTAL { get; set; } public string CNTRTOTAL { get; set; }
/// <summary> /// <summary>
/// 船公司代号 /// 船公司代号
@ -584,9 +584,9 @@ namespace Myshipping.Application.Entity
[Description("客服")] [Description("客服")]
public string CUSTSERVICE { get; set; } public string CUSTSERVICE { get; set; }
/// <summary> /// <summary>
/// 客户 /// 委托单位
/// </summary> /// </summary>
[Description("客户")] [Description("委托单位")]
public string CUSTOMERNAME { get; set; } public string CUSTOMERNAME { get; set; }
/// <summary> /// <summary>
/// 订舱代理 /// 订舱代理
@ -726,7 +726,7 @@ namespace Myshipping.Application.Entity
/// <summary> /// <summary>
/// 航线名称（船公司） /// 航线名称（船公司）
/// </summary> /// </summary>
[Description("航线名称")] [Description("船司航线")]
public string LANENAME { get; set; } public string LANENAME { get; set; }
/// <summary> /// <summary>
/// 付款方 /// 付款方
@ -856,6 +856,7 @@ namespace Myshipping.Application.Entity
/// <summary> /// <summary>
/// 最后下货纸比对状态 NO_DIFF-无异常;DIFF-有差异;NO_YARD-无场站数据;EXPT-异常 /// 最后下货纸比对状态 NO_DIFF-无异常;DIFF-有差异;NO_YARD-无场站数据;EXPT-异常
/// </summary> /// </summary>
[Description("下货纸比对")]
public string LstShipOrderCompareRlt { get; set; } public string LstShipOrderCompareRlt { get; set; }
/// <summary> /// <summary>
@ -880,6 +881,7 @@ namespace Myshipping.Application.Entity
/// <summary> /// <summary>
/// 是否占舱 /// 是否占舱
/// </summary> /// </summary>
[Description("是否占舱")]
public string ZhanCangFlag { get; set; } public string ZhanCangFlag { get; set; }
/// <summary> /// <summary>
@ -911,7 +913,7 @@ namespace Myshipping.Application.Entity
/// <summary> /// <summary>
/// 预计到港日期（目的港） /// 预计到港日期（目的港）
/// </summary> /// </summary>
[Description("预计到港日期")] [Description("目的港ETA")]
public DateTime? ETA { get; set; } public DateTime? ETA { get; set; }
@ -963,6 +965,7 @@ namespace Myshipping.Application.Entity
/// <summary> /// <summary>
/// 申请箱使 /// 申请箱使
/// </summary> /// </summary>
[Description("申请箱使")]
public string ShenQingXiangShi { get; set; } public string ShenQingXiangShi { get; set; }
/// <summary> /// <summary>

119
Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
Unescape Escape View File

@ -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 临时测试使用

14
Myshipping.Core/Myshipping.Core.xml
Unescape Escape View File

@ -5501,6 +5501,20 @@
<param name="d"></param> <param name="d"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Myshipping.Core.Extension.SharpZipLib.Compress(System.String)">
<summary>
数据压缩
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Extension.SharpZipLib.Decompress(System.String)">
<summary>
数据解压缩
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="T:Myshipping.Core.PagedQueryableExtensions"> <member name="T:Myshipping.Core.PagedQueryableExtensions">
<summary> <summary>
分页拓展类 分页拓展类

Write Preview
Loading…
Cancel
Save