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

1

Browse Source
optimize
wet 1 year ago
parent 80d406f729
commit de8c45c69b
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File

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

@ -1274,9 +1274,9 @@ namespace Myshipping.Application
Remark = null,
Sort = config.Sort
}).ToList();
if (!string.IsNullOrEmpty(entity.MBLNO))
if (!string.IsNullOrEmpty(entity.MBLNO)&& config!=null)
{
var ConfigId = config.Where(x => x.SystemCode == "YSDBC").Select(x => x.ConfigId).First();
var ConfigId = config.Where(x => x.SystemCode == "YSDBC").Select(x => x.ConfigId).FirstOrDefault();
var Status = _goodsStatus.FirstOrDefault(x => x.bookingId == Id && x.ConfigId == ConfigId);
if (Status == null)
{
@ -1293,9 +1293,9 @@ namespace Myshipping.Application
}
}
if (!string.IsNullOrEmpty(entity.CUSTNO))
if (!string.IsNullOrEmpty(entity.CUSTNO) && config != null)
{
var ConfigId = config.Where(x => x.SystemCode == "YDC").Select(x => x.ConfigId).First();
var ConfigId = config.Where(x => x.SystemCode == "YDC").Select(x => x.ConfigId).FirstOrDefault();
var Status = _goodsStatus.FirstOrDefault(x => x.bookingId == Id && x.ConfigId == ConfigId);
if (Status == null)
{
@ -1317,7 +1317,8 @@ namespace Myshipping.Application
{
if (!string.IsNullOrEmpty(entity.MBLNO))
{
var ConfigId = config.Where(x => x.SystemCode == "YSDBC").Select(x => x.ConfigId).First();
_logger.LogInformation("ConfigId" + config.ToJsonString());
var ConfigId = config.Where(x => x.SystemCode == "YSDBC").Select(x => x.ConfigId).FirstOrDefault();
var Status = _goodsStatus.FirstOrDefault(x => x.bookingId == Id && x.ConfigId == ConfigId);
if (Status == null)
{
@ -1336,7 +1337,7 @@ namespace Myshipping.Application
}
if (!string.IsNullOrEmpty(entity.CUSTNO))
{
var ConfigId = config.Where(x => x.SystemCode == "YDC").Select(x => x.ConfigId).First();
var ConfigId = config.Where(x => x.SystemCode == "YDC").Select(x => x.ConfigId).FirstOrDefault();
var Status = _goodsStatus.FirstOrDefault(x => x.bookingId == Id && x.ConfigId == ConfigId);
if (Status == null)
{
@ -2647,7 +2648,7 @@ namespace Myshipping.Application
{
var o = _rep.AsQueryable().Filter(null, true).Where(x => x.Id == item.BookingId).First();
var oldatd = o == null ? null : o.ATD;
if (oldatd != item.OpTime)
if (oldatd != item.OpTime&& item.OpTime!=null)
{
o.ATD = item.OpTime;
await _rep.UpdateAsync(o);
@ -8107,7 +8108,7 @@ namespace Myshipping.Application
/// </summary>
/// <returns></returns>
[HttpGet("/BookingOrder/GetFieldName")]
public async Task<dynamic> GetFieldName()
public Task<dynamic> GetFieldName()
{
BookingOrder order = new BookingOrder();
BookingCtn ctn = new BookingCtn();

Write Preview
Loading…
Cancel
Save