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

1

Browse Source
optimize
wet 2 years ago
parent 7cd22c5cff
commit a68d7e2027
3 changed files with 25 additions and 53 deletions
Show Stats Download Patch File Download Diff File

44
Myshipping.Application/Service/DataSync/DataSyncService.cs
Unescape Escape View File

@ -1461,7 +1461,7 @@ namespace Myshipping.Application
var model = _vesselinfo.AsQueryable().Filter(null, true).Where(x => x.Vessel == item.Vessel && x.Voyno == item.Voyno && x.TenantId == UserManager.TENANT_ID).First();
model.ETA = item.ETA;
model.ETD = item.ETD;
//model.ETD = item.ETD;
model.ATD = item.ATD;
await _vesselinfo.AsUpdateable(model).IgnoreColumns().ExecuteCommandAsync();
var order = await _rep.AsQueryable().Filter(null, true).Where(x => x.VESSEL == item.Vessel && x.VOYNO == item.Voyno && x.TenantId == UserManager.TENANT_ID).ToListAsync();
@ -1491,27 +1491,27 @@ namespace Myshipping.Application
});
it.ETA = item.ETA;
}
if (it.ETD != item.ETD)
{
////添加booking日志
var bid = await _bookinglog.InsertReturnSnowflakeIdAsync(new BookingLog
{
Type = "Edit",
BookingId = it.Id,
TenantId = Convert.ToInt64(UserManager.TENANT_ID),
CreatedTime = DateTime.Now,
CreatedUserId = UserManager.UserId,
CreatedUserName = UserManager.Name
});
await _bookinglogdetail.InsertReturnSnowflakeIdAsync(new BookingLogDetail
{
PId = bid,
Field = "ETD",
OldValue = it.ETD == null ? "" : it.ETD.ToString(),
NewValue = item.ETD == null ? "" : item.ETD.ToString(),
});
it.ETD = item.ETD;
}
//if (it.ETD != item.ETD)
//{
// ////添加booking日志
// var bid = await _bookinglog.InsertReturnSnowflakeIdAsync(new BookingLog
// {
// Type = "Edit",
// BookingId = it.Id,
// TenantId = Convert.ToInt64(UserManager.TENANT_ID),
// CreatedTime = DateTime.Now,
// CreatedUserId = UserManager.UserId,
// CreatedUserName = UserManager.Name
// });
// await _bookinglogdetail.InsertReturnSnowflakeIdAsync(new BookingLogDetail
// {
// PId = bid,
// Field = "ETD",
// OldValue = it.ETD == null ? "" : it.ETD.ToString(),
// NewValue = item.ETD == null ? "" : item.ETD.ToString(),
// });
// it.ETD = item.ETD;
//}
if (it.ATD != item.ATD)
{
////添加booking日志

19
Myshipping.Core/Entity/DJY/DjyVesselInfo.cs
Unescape Escape View File

@ -9,12 +9,9 @@ namespace Myshipping.Application.Entity
/// </summary>
[SugarTable("djy_vesselinfo")]
[Description("船期信息")]
public class DjyVesselInfo : PrimaryKeyEntity
public class DjyVesselInfo : DBEntityTenant
{
/// <summary>
/// 租户Id
/// </summary>
public long? TenantId { get; set; }
/// <summary>
/// 船名
/// </summary>
@ -92,17 +89,7 @@ namespace Myshipping.Application.Entity
public string BSNO { get; set; }
/// <summary>
/// 创建人名称
/// </summary>
public string CreatedUserName { get; set; }
/// <summary>
/// 创建者Id
/// </summary>
//[SugarColumn(ColumnDescription = "创建者Id")]
public long? CreatedUserId { get; set; }
}

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

@ -17663,11 +17663,6 @@
船期信息
</summary>
</member>
<member name="P:Myshipping.Application.Entity.DjyVesselInfo.TenantId">
<summary>
租户Id
</summary>
</member>
<member name="P:Myshipping.Application.Entity.DjyVesselInfo.Vessel">
<summary>
船名
@ -17758,16 +17753,6 @@
东胜id
</summary>
</member>
<member name="P:Myshipping.Application.Entity.DjyVesselInfo.CreatedUserName">
<summary>
创建人名称
</summary>
</member>
<member name="P:Myshipping.Application.Entity.DjyVesselInfo.CreatedUserId">
<summary>
创建者Id
</summary>
</member>
<member name="P:Myshipping.Application.Entity.DjyVesselInfoDto.BSNO">
<summary>
东胜id

Write Preview
Loading…
Cancel
Save