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

1

Browse Source
optimize
wet 1 year ago
parent 4e356eb907
commit 2a4014d119
2 changed files with 61 additions and 62 deletions
Show Stats Download Patch File Download Diff File

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

@ -973,9 +973,7 @@ namespace Myshipping.Application
var et = await _rep.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false && x.MBLNO == input.MBLNO && x.TenantId == UserManager.TENANT_ID && x.HBLNO == input.HBLNO && x.ParentId == input.ParentId && x.Id != input.Id).FirstAsync();
if (et != null)
{
throw Oops.Bah("当前提单号已存在,请勿重复录入!");
}
}
if (!string.IsNullOrWhiteSpace(input.CUSTNO))
@ -983,9 +981,7 @@ namespace Myshipping.Application
var et = await _rep.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false && x.CUSTNO == input.CUSTNO && x.TenantId == UserManager.TENANT_ID && x.HBLNO == input.HBLNO && x.ParentId == input.ParentId && x.Id != input.Id).FirstAsync();
if (et != null)
{
throw Oops.Bah("当前提单号已存在,请勿重复录入!");
}
}
var entity = input.Adapt<BookingOrder>();
@ -1220,20 +1216,21 @@ namespace Myshipping.Application
FinishUserId = UserManager.UserId,
IsPublic = false
});
}
main.BSSTATUSNAME = Config.StatusName;
main.BSSTATUSNAME = Config.StatusName;
await _rep.AsUpdateable(main).IgnoreColumns(it => new
{
it.ParentId,
it.TenantId,
it.CreatedTime,
it.CreatedUserId,
it.CreatedUserName,
it.TenantName,
it.IsDeleted,
it.BOOKINGNO
}).ExecuteCommandAsync();
await _rep.AsUpdateable(main).IgnoreColumns(it => new
{
it.ParentId,
it.TenantId,
it.CreatedTime,
it.CreatedUserId,
it.CreatedUserName,
it.TenantName,
it.IsDeleted,
it.BOOKINGNO
}).ExecuteCommandAsync();
}
}
}
if (!string.IsNullOrEmpty(entity.CUSTNO))
@ -1255,20 +1252,20 @@ namespace Myshipping.Application
FinishUserId = UserManager.UserId,
IsPublic = false
});
}
main.BSSTATUSNAME = Config.StatusName;
main.BSSTATUSNAME = Config.StatusName;
await _rep.AsUpdateable(main).IgnoreColumns(it => new
{
it.ParentId,
it.TenantId,
it.CreatedTime,
it.CreatedUserId,
it.CreatedUserName,
it.TenantName,
it.IsDeleted,
it.BOOKINGNO
}).ExecuteCommandAsync();
await _rep.AsUpdateable(main).IgnoreColumns(it => new
{
it.ParentId,
it.TenantId,
it.CreatedTime,
it.CreatedUserId,
it.CreatedUserName,
it.TenantName,
it.IsDeleted,
it.BOOKINGNO
}).ExecuteCommandAsync();
}
}
}
}
@ -1293,20 +1290,21 @@ namespace Myshipping.Application
FinishUserId = UserManager.UserId,
IsPublic = false
});
}
main.BSSTATUSNAME = Config.StatusName;
main.BSSTATUSNAME = Config.StatusName;
await _rep.AsUpdateable(main).IgnoreColumns(it => new
{
it.ParentId,
it.TenantId,
it.CreatedTime,
it.CreatedUserId,
it.CreatedUserName,
it.TenantName,
it.IsDeleted,
it.BOOKINGNO
}).ExecuteCommandAsync();
await _rep.AsUpdateable(main).IgnoreColumns(it => new
{
it.ParentId,
it.TenantId,
it.CreatedTime,
it.CreatedUserId,
it.CreatedUserName,
it.TenantName,
it.IsDeleted,
it.BOOKINGNO
}).ExecuteCommandAsync();
}
}
}
if (!string.IsNullOrEmpty(entity.CUSTNO))
@ -1327,21 +1325,22 @@ namespace Myshipping.Application
FinishUserId = UserManager.UserId,
IsPublic = false
});
}
main.BSSTATUSNAME = Config.StatusName;
main.BSSTATUSNAME = Config.StatusName;
await _rep.AsUpdateable(main).IgnoreColumns(it => new
{
it.ParentId,
it.TenantId,
it.CreatedTime,
it.CreatedUserId,
it.CreatedUserName,
it.TenantName,
it.IsDeleted,
it.BOOKINGNO
}).ExecuteCommandAsync();
}
await _rep.AsUpdateable(main).IgnoreColumns(it => new
{
it.ParentId,
it.TenantId,
it.CreatedTime,
it.CreatedUserId,
it.CreatedUserName,
it.TenantName,
it.IsDeleted,
it.BOOKINGNO
}).ExecuteCommandAsync();
}
}
}
@ -1583,7 +1582,7 @@ namespace Myshipping.Application
await _repCtn.UpdateAsync(x => x.BILLID == Id, x => new BookingCtn { IsDeleted = true });
await _ctndetailrep.UpdateAsync(x => ctnlist.Contains((long)x.CTNID), x => new BookingCtnDetail { IsDeleted = true });
await _rep.UpdateAsync(x => x.Id == Id, x => new BookingOrder { IsDeleted = true });
await _bookingEDIExt.UpdateAsync(x => x.BookingId == Id, x => new BookingEDIExt { IsDeleted = true });
await _bookingEDIExt.UpdateAsync(x => x.BookingId == Id&&x.IsDeleted==false, x => new BookingEDIExt { IsDeleted = true });
_logger.LogInformation(Id + "删除成功！");
}
@ -1669,7 +1668,7 @@ namespace Myshipping.Application
await _repCtn.UpdateAsync(x => x.BILLID == Id, x => new BookingCtn { IsDeleted = false });
await _ctndetailrep.UpdateAsync(x => ctnlist.Contains((long)x.CTNID), x => new BookingCtnDetail { IsDeleted = false });
await _rep.UpdateAsync(x => x.Id == Id, x => new BookingOrder { IsDeleted = false });
await _bookingEDIExt.UpdateAsync(x => x.BookingId == Id, x => new BookingEDIExt { IsDeleted = false });
await _bookingEDIExt.UpdateAsync(x => x.BookingId == Id&&x.IsDeleted==true, x => new BookingEDIExt { IsDeleted = false });
List<long> list = new List<long>();
list.Add(Id);
var itemcode = _cache.GetAllTenantParam().Result.Where(x => x.ParaCode == "BOOKING_DATA_PUSH" && x.TenantId == UserManager.TENANT_ID).Select(x => x.ItemCode).FirstOrDefault();

8
Myshipping.Core/Util/JsonUtil.cs
Unescape Escape View File

@ -264,11 +264,11 @@ public static class JsonUtil
return "货描存在中文字符";
}
if (Regex.IsMatch(sourceVal.ToString(), @"[\u4e00-\u9fa5]") && propName.ToUpper() == "CUSTNO")
{
return "订舱编号存在中文字符";
//if (Regex.IsMatch(sourceVal.ToString(), @"[\u4e00-\u9fa5]") && propName.ToUpper() == "CUSTNO")
//{
// return "订舱编号存在中文字符";
}
//}
//if (Regex.IsMatch(sourceVal.ToString(), @"[\u4e00-\u9fa5]") && propName.ToUpper() == "PONO")
//{
// return "PONO存在中文字符";

Write Preview
Loading…
Cancel
Save