|
|
|
|
@ -68,7 +68,7 @@ namespace DS.WMS.Core.TaskPlat.Method
|
|
|
|
|
|
|
|
|
|
//自动转发是否默认抄送操作
|
|
|
|
|
const string CONST_AUTO_TRANS_EMAIL_OP_CCTO = "AUTO_TRANS_EMAIL_OP_CCTO";
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public TaskManageBCService(IUser user,
|
|
|
|
|
ILogger<TaskManageBCService> logger,
|
|
|
|
|
@ -192,6 +192,7 @@ namespace DS.WMS.Core.TaskPlat.Method
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
//推送订舱订单
|
|
|
|
|
model.SlotId = bookingSlot.Id;
|
|
|
|
|
var bookingOrderId = await bookingSlotService.Value.GenerateBookingOrder(bookingSlot, slotFileList, model, null);
|
|
|
|
|
|
|
|
|
|
logger.LogInformation($"生成订舱订单完成，bookingOrderId={bookingOrderId} taskid={bcOrder.TASK_ID}");
|
|
|
|
|
@ -256,59 +257,7 @@ namespace DS.WMS.Core.TaskPlat.Method
|
|
|
|
|
throw new Exception($"未获取有效任务记录，更新失败");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#region 更新任务
|
|
|
|
|
//如果是公共任务，需要变成个人任务 RealUserId = 当前操作人
|
|
|
|
|
if (taskEntity.IS_PUBLIC == 1)
|
|
|
|
|
{
|
|
|
|
|
taskEntity.IS_PUBLIC = 0;
|
|
|
|
|
taskEntity.RealUserId = long.Parse(user.UserId);
|
|
|
|
|
taskEntity.RealUserName = user.UserName;
|
|
|
|
|
taskEntity.UpdateTime = DateTime.Now;
|
|
|
|
|
taskEntity.UpdateBy = taskEntity.RealUserId ?? 0;
|
|
|
|
|
taskEntity.UpdateUserName = user.UserName;
|
|
|
|
|
taskEntity.IS_COMPLETE = 1;
|
|
|
|
|
taskEntity.COMPLETE_DATE = DateTime.Now;
|
|
|
|
|
taskEntity.COMPLETE_DEAL = "MANUAL";
|
|
|
|
|
taskEntity.COMPLETE_DEAL = "手工";
|
|
|
|
|
|
|
|
|
|
await tenantDb.Updateable(taskEntity).UpdateColumns(it => new
|
|
|
|
|
{
|
|
|
|
|
it.IS_PUBLIC,
|
|
|
|
|
it.UpdateTime,
|
|
|
|
|
it.UpdateBy,
|
|
|
|
|
it.UpdateUserName,
|
|
|
|
|
it.RealUserId,
|
|
|
|
|
it.RealUserName,
|
|
|
|
|
it.IS_COMPLETE,
|
|
|
|
|
it.COMPLETE_DATE,
|
|
|
|
|
it.COMPLETE_DEAL,
|
|
|
|
|
it.COMPLETE_DEAL_NAME
|
|
|
|
|
|
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
taskEntity.UpdateTime = DateTime.Now;
|
|
|
|
|
taskEntity.UpdateBy = long.Parse(user.UserId);
|
|
|
|
|
taskEntity.UpdateUserName = user.UserName;
|
|
|
|
|
taskEntity.IS_COMPLETE = 1;
|
|
|
|
|
taskEntity.COMPLETE_DATE = DateTime.Now;
|
|
|
|
|
taskEntity.COMPLETE_DEAL = "MANUAL";
|
|
|
|
|
taskEntity.COMPLETE_DEAL = "手工";
|
|
|
|
|
|
|
|
|
|
await tenantDb.Updateable(taskEntity).UpdateColumns(it => new
|
|
|
|
|
{
|
|
|
|
|
it.UpdateTime,
|
|
|
|
|
it.UpdateBy,
|
|
|
|
|
it.UpdateUserName,
|
|
|
|
|
it.IS_COMPLETE,
|
|
|
|
|
it.COMPLETE_DATE,
|
|
|
|
|
it.COMPLETE_DEAL,
|
|
|
|
|
it.COMPLETE_DEAL_NAME
|
|
|
|
|
|
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
|
}
|
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//var currBCOrder = await tenantDb.Queryable<TaskBaseInfo>().Where(a => a.Id == bcEntity.Id).FirstAsync();
|
|
|
|
|
//if (currBCOrder != null && model.IsDirectSend)
|
|
|
|
|
@ -357,6 +306,7 @@ namespace DS.WMS.Core.TaskPlat.Method
|
|
|
|
|
//{
|
|
|
|
|
// bookingSlotService = serviceProvider.GetRequiredService<IBookingSlotService>();
|
|
|
|
|
//}
|
|
|
|
|
model.SlotId = bookingSlot.Id;
|
|
|
|
|
var bookingOrderId = await bookingSlotService.Value.GenerateBookingOrder(bookingSlot, slotFileList, model, null);
|
|
|
|
|
|
|
|
|
|
logger.LogInformation($"生成订舱订单完成，bookingOrderId={bookingOrderId} taskid={bcOrder.TASK_ID}");
|
|
|
|
|
@ -421,60 +371,6 @@ namespace DS.WMS.Core.TaskPlat.Method
|
|
|
|
|
throw new Exception($"未获取有效任务记录，更新失败");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#region 更新任务
|
|
|
|
|
//如果是公共任务，需要变成个人任务 RealUserId = 当前操作人
|
|
|
|
|
if (taskEntity.IS_PUBLIC == 1)
|
|
|
|
|
{
|
|
|
|
|
taskEntity.IS_PUBLIC = 0;
|
|
|
|
|
taskEntity.RealUserId = long.Parse(user.UserId);
|
|
|
|
|
taskEntity.RealUserName = user.UserName;
|
|
|
|
|
taskEntity.UpdateTime = DateTime.Now;
|
|
|
|
|
taskEntity.UpdateBy = taskEntity.RealUserId ?? 0;
|
|
|
|
|
taskEntity.UpdateUserName = user.UserName;
|
|
|
|
|
taskEntity.IS_COMPLETE = 1;
|
|
|
|
|
taskEntity.COMPLETE_DATE = DateTime.Now;
|
|
|
|
|
taskEntity.COMPLETE_DEAL = "MANUAL";
|
|
|
|
|
taskEntity.COMPLETE_DEAL = "手工";
|
|
|
|
|
|
|
|
|
|
await tenantDb.Updateable(taskEntity).UpdateColumns(it => new
|
|
|
|
|
{
|
|
|
|
|
it.IS_PUBLIC,
|
|
|
|
|
it.UpdateTime,
|
|
|
|
|
it.UpdateBy,
|
|
|
|
|
it.UpdateUserName,
|
|
|
|
|
it.RealUserId,
|
|
|
|
|
it.RealUserName,
|
|
|
|
|
it.IS_COMPLETE,
|
|
|
|
|
it.COMPLETE_DATE,
|
|
|
|
|
it.COMPLETE_DEAL,
|
|
|
|
|
it.COMPLETE_DEAL_NAME
|
|
|
|
|
|
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
taskEntity.UpdateTime = DateTime.Now;
|
|
|
|
|
taskEntity.UpdateBy = long.Parse(user.UserId);
|
|
|
|
|
taskEntity.UpdateUserName = user.UserName;
|
|
|
|
|
taskEntity.IS_COMPLETE = 1;
|
|
|
|
|
taskEntity.COMPLETE_DATE = DateTime.Now;
|
|
|
|
|
taskEntity.COMPLETE_DEAL = "MANUAL";
|
|
|
|
|
taskEntity.COMPLETE_DEAL = "手工";
|
|
|
|
|
|
|
|
|
|
await tenantDb.Updateable(taskEntity).UpdateColumns(it => new
|
|
|
|
|
{
|
|
|
|
|
it.UpdateTime,
|
|
|
|
|
it.UpdateBy,
|
|
|
|
|
it.UpdateUserName,
|
|
|
|
|
it.IS_COMPLETE,
|
|
|
|
|
it.COMPLETE_DATE,
|
|
|
|
|
it.COMPLETE_DEAL,
|
|
|
|
|
it.COMPLETE_DEAL_NAME
|
|
|
|
|
|
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
|
}
|
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
|
//var currBCOrder = _taskBCInfoRepository.AsQueryable().First(a => a.PK_ID == bcEntity.PK_ID);
|
|
|
|
|
|
|
|
|
|
//if (currBCOrder != null && model.IsDirectSend)
|
|
|
|
|
@ -530,51 +426,6 @@ namespace DS.WMS.Core.TaskPlat.Method
|
|
|
|
|
|
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
|
|
|
|
|
|
var taskEntity = await tenantDb.Queryable<TaskBaseInfo>().FirstAsync(u => u.Id == bcEntity.TASK_ID);
|
|
|
|
|
|
|
|
|
|
if (taskEntity == null)
|
|
|
|
|
{
|
|
|
|
|
throw new Exception($"未获取有效任务记录，更新失败");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#region 更新任务
|
|
|
|
|
//如果是公共任务，需要变成个人任务 RealUserId = 当前操作人
|
|
|
|
|
if (taskEntity.IS_PUBLIC == 1)
|
|
|
|
|
{
|
|
|
|
|
taskEntity.IS_PUBLIC = 0;
|
|
|
|
|
taskEntity.RealUserId = long.Parse(user.UserId);
|
|
|
|
|
taskEntity.RealUserName = user.UserName;
|
|
|
|
|
taskEntity.UpdateTime = DateTime.Now;
|
|
|
|
|
taskEntity.UpdateBy = taskEntity.RealUserId ?? 0;
|
|
|
|
|
taskEntity.UpdateUserName = user.UserName;
|
|
|
|
|
|
|
|
|
|
await tenantDb.Updateable(taskEntity).UpdateColumns(it => new
|
|
|
|
|
{
|
|
|
|
|
it.IS_PUBLIC,
|
|
|
|
|
it.UpdateTime,
|
|
|
|
|
it.UpdateBy,
|
|
|
|
|
it.UpdateUserName,
|
|
|
|
|
it.RealUserId,
|
|
|
|
|
it.RealUserName,
|
|
|
|
|
|
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
taskEntity.UpdateTime = DateTime.Now;
|
|
|
|
|
taskEntity.UpdateBy = long.Parse(user.UserId);
|
|
|
|
|
taskEntity.UpdateUserName = user.UserName;
|
|
|
|
|
|
|
|
|
|
await tenantDb.Updateable(taskEntity).UpdateColumns(it => new
|
|
|
|
|
{
|
|
|
|
|
it.UpdateTime,
|
|
|
|
|
it.UpdateBy,
|
|
|
|
|
it.UpdateUserName,
|
|
|
|
|
|
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
|
}
|
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
|
#endregion
|
|
|
|
|
}
|
|
|
|
|
else if (model.GenerateMethod == "UPD_BOOKING")
|
|
|
|
|
@ -611,59 +462,6 @@ namespace DS.WMS.Core.TaskPlat.Method
|
|
|
|
|
throw new Exception($"未获取有效任务记录，更新失败");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#region 更新任务
|
|
|
|
|
//如果是公共任务，需要变成个人任务 RealUserId = 当前操作人
|
|
|
|
|
if (taskEntity.IS_PUBLIC == 1)
|
|
|
|
|
{
|
|
|
|
|
taskEntity.IS_PUBLIC = 0;
|
|
|
|
|
taskEntity.RealUserId = long.Parse(user.UserId);
|
|
|
|
|
taskEntity.RealUserName = user.UserName;
|
|
|
|
|
taskEntity.UpdateTime = DateTime.Now;
|
|
|
|
|
taskEntity.UpdateBy = taskEntity.RealUserId ?? 0;
|
|
|
|
|
taskEntity.UpdateUserName = user.UserName;
|
|
|
|
|
taskEntity.IS_COMPLETE = 1;
|
|
|
|
|
taskEntity.COMPLETE_DATE = DateTime.Now;
|
|
|
|
|
taskEntity.COMPLETE_DEAL = "MANUAL";
|
|
|
|
|
taskEntity.COMPLETE_DEAL = "手工";
|
|
|
|
|
|
|
|
|
|
await tenantDb.Updateable(taskEntity).UpdateColumns(it => new
|
|
|
|
|
{
|
|
|
|
|
it.IS_PUBLIC,
|
|
|
|
|
it.UpdateTime,
|
|
|
|
|
it.UpdateBy,
|
|
|
|
|
it.UpdateUserName,
|
|
|
|
|
it.RealUserId,
|
|
|
|
|
it.RealUserName,
|
|
|
|
|
it.IS_COMPLETE,
|
|
|
|
|
it.COMPLETE_DATE,
|
|
|
|
|
it.COMPLETE_DEAL,
|
|
|
|
|
it.COMPLETE_DEAL_NAME
|
|
|
|
|
|
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
taskEntity.UpdateTime = DateTime.Now;
|
|
|
|
|
taskEntity.UpdateBy = long.Parse(user.UserId);
|
|
|
|
|
taskEntity.UpdateUserName = user.UserName;
|
|
|
|
|
taskEntity.IS_COMPLETE = 1;
|
|
|
|
|
taskEntity.COMPLETE_DATE = DateTime.Now;
|
|
|
|
|
taskEntity.COMPLETE_DEAL = "MANUAL";
|
|
|
|
|
taskEntity.COMPLETE_DEAL = "手工";
|
|
|
|
|
|
|
|
|
|
await tenantDb.Updateable(taskEntity).UpdateColumns(it => new
|
|
|
|
|
{
|
|
|
|
|
it.UpdateTime,
|
|
|
|
|
it.UpdateBy,
|
|
|
|
|
it.UpdateUserName,
|
|
|
|
|
it.IS_COMPLETE,
|
|
|
|
|
it.COMPLETE_DATE,
|
|
|
|
|
it.COMPLETE_DEAL,
|
|
|
|
|
it.COMPLETE_DEAL_NAME
|
|
|
|
|
|
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
|
}
|
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
|
//var currBCOrder = await tenantDb.Queryable<TaskBaseInfo>().Where(a => a.Id == bcEntity.Id).FirstAsync();
|
|
|
|
|
//if (currBCOrder != null && model.IsDirectSend)
|
|
|
|
|
@ -679,6 +477,64 @@ namespace DS.WMS.Core.TaskPlat.Method
|
|
|
|
|
#endregion
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#region 更新任务
|
|
|
|
|
//var taskEntity = await tenantDb.Queryable<TaskBaseInfo>().FirstAsync(u => u.Id == bcEntity.TASK_ID);
|
|
|
|
|
//if (taskEntity == null)
|
|
|
|
|
//{
|
|
|
|
|
// throw new Exception($"未获取有效任务记录，更新失败");
|
|
|
|
|
//}
|
|
|
|
|
////如果是公共任务，需要变成个人任务 RealUserId = 当前操作人
|
|
|
|
|
//if (taskEntity.IS_PUBLIC == 1)
|
|
|
|
|
//{
|
|
|
|
|
// taskEntity.IS_PUBLIC = 0;
|
|
|
|
|
// taskEntity.RealUserId = long.Parse(user.UserId);
|
|
|
|
|
// taskEntity.RealUserName = user.UserName;
|
|
|
|
|
// taskEntity.UpdateTime = DateTime.Now;
|
|
|
|
|
// taskEntity.UpdateBy = taskEntity.RealUserId ?? 0;
|
|
|
|
|
// taskEntity.UpdateUserName = user.UserName;
|
|
|
|
|
// taskEntity.IS_COMPLETE = 1;
|
|
|
|
|
// taskEntity.COMPLETE_DATE = DateTime.Now;
|
|
|
|
|
// taskEntity.COMPLETE_DEAL = "MANUAL";
|
|
|
|
|
// taskEntity.COMPLETE_DEAL = "手工";
|
|
|
|
|
|
|
|
|
|
// await tenantDb.Updateable(taskEntity).UpdateColumns(it => new
|
|
|
|
|
// {
|
|
|
|
|
// it.IS_PUBLIC,
|
|
|
|
|
// it.UpdateTime,
|
|
|
|
|
// it.UpdateBy,
|
|
|
|
|
// it.UpdateUserName,
|
|
|
|
|
// it.RealUserId,
|
|
|
|
|
// it.RealUserName,
|
|
|
|
|
// it.IS_COMPLETE,
|
|
|
|
|
// it.COMPLETE_DATE,
|
|
|
|
|
// it.COMPLETE_DEAL,
|
|
|
|
|
// it.COMPLETE_DEAL_NAME
|
|
|
|
|
|
|
|
|
|
// }).ExecuteCommandAsync();
|
|
|
|
|
//}
|
|
|
|
|
//else
|
|
|
|
|
//{
|
|
|
|
|
// taskEntity.UpdateTime = DateTime.Now;
|
|
|
|
|
// taskEntity.UpdateBy = long.Parse(user.UserId);
|
|
|
|
|
// taskEntity.UpdateUserName = user.UserName;
|
|
|
|
|
// taskEntity.IS_COMPLETE = 1;
|
|
|
|
|
// taskEntity.COMPLETE_DATE = DateTime.Now;
|
|
|
|
|
// taskEntity.COMPLETE_DEAL = "MANUAL";
|
|
|
|
|
// taskEntity.COMPLETE_DEAL = "手工";
|
|
|
|
|
|
|
|
|
|
// await tenantDb.Updateable(taskEntity).UpdateColumns(it => new
|
|
|
|
|
// {
|
|
|
|
|
// it.UpdateTime,
|
|
|
|
|
// it.UpdateBy,
|
|
|
|
|
// it.UpdateUserName,
|
|
|
|
|
// it.IS_COMPLETE,
|
|
|
|
|
// it.COMPLETE_DATE,
|
|
|
|
|
// it.COMPLETE_DEAL,
|
|
|
|
|
// it.COMPLETE_DEAL_NAME
|
|
|
|
|
|
|
|
|
|
// }).ExecuteCommandAsync();
|
|
|
|
|
//}
|
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
|
result.succ = true;
|
|
|
|
|
result.msg = "成功";
|
|
|
|
|
@ -1021,7 +877,7 @@ namespace DS.WMS.Core.TaskPlat.Method
|
|
|
|
|
BookingOrSlotGenerateDto generateModel,
|
|
|
|
|
SqlSugarScopeProvider? tenantDb = null)
|
|
|
|
|
{
|
|
|
|
|
long id = 0;
|
|
|
|
|
//long id = 0;
|
|
|
|
|
|
|
|
|
|
if (tenantDb == null)
|
|
|
|
|
{
|
|
|
|
|
@ -1110,7 +966,10 @@ namespace DS.WMS.Core.TaskPlat.Method
|
|
|
|
|
|
|
|
|
|
var bkRlt = await seaExportService.Value.EditSeaExport(bkModel);
|
|
|
|
|
|
|
|
|
|
id = long.Parse(bkRlt.Data.ToString());
|
|
|
|
|
if (!bkRlt.Succeeded)
|
|
|
|
|
{
|
|
|
|
|
throw new Exception(MultiLanguageConst.GetDescription(MultiLanguageConst.DataUpdateFailed) + "，" + bkRlt.Message);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
string batchNo = Guid.NewGuid().ToString();
|
|
|
|
|
|
|
|
|
|
@ -1133,7 +992,7 @@ namespace DS.WMS.Core.TaskPlat.Method
|
|
|
|
|
if (generateModel.CustomerContactList != null && generateModel.CustomerContactList.Count > 0)
|
|
|
|
|
{
|
|
|
|
|
var bookingContactList = await tenantDb.Queryable<BusinessOrderContact>()
|
|
|
|
|
.Where(a => a.BusinessId == id && a.Deleted == false).ToListAsync();
|
|
|
|
|
.Where(a => a.BusinessId == bookingOrderId && a.Deleted == false).ToListAsync();
|
|
|
|
|
|
|
|
|
|
var djyCustomerInfo = clientInfoService.GetClientInfoWithContact(new Info.Dtos.QueryClientInfo { ClientId = generateModel.CustomerId.Value, IsController = true })
|
|
|
|
|
.GetAwaiter().GetResult().Data;
|
|
|
|
|
@ -1157,8 +1016,8 @@ namespace DS.WMS.Core.TaskPlat.Method
|
|
|
|
|
{
|
|
|
|
|
bookingContact = new BusinessOrderContact
|
|
|
|
|
{
|
|
|
|
|
Name = djyCustomerContactMan.ShortName,
|
|
|
|
|
BusinessId = id,
|
|
|
|
|
Name = djyCustomerContactMan.Name,
|
|
|
|
|
BusinessId = bookingOrderId,
|
|
|
|
|
Email = djyCustomerContactMan.Email,
|
|
|
|
|
Note = djyCustomerContactMan.Note,
|
|
|
|
|
CreateTime = DateTime.Now,
|
|
|
|
|
@ -1171,7 +1030,7 @@ namespace DS.WMS.Core.TaskPlat.Method
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
bookingContact.Name = djyCustomerContactMan.ShortName;
|
|
|
|
|
bookingContact.Name = djyCustomerContactMan.Name;
|
|
|
|
|
bookingContact.Email = djyCustomerContactMan.Email;
|
|
|
|
|
bookingContact.Note = djyCustomerContactMan.Note;
|
|
|
|
|
bookingContact.UpdateTime = DateTime.Now;
|
|
|
|
|
@ -1198,14 +1057,14 @@ namespace DS.WMS.Core.TaskPlat.Method
|
|
|
|
|
//写入服务项目
|
|
|
|
|
var prjRlt = djyServiceStatusService.Value.SaveServiceProject(new EmbedServiceProjectDto
|
|
|
|
|
{
|
|
|
|
|
BusinessId = id.ToString(),
|
|
|
|
|
BusinessId = bookingOrderId.ToString(),
|
|
|
|
|
ProjectCodes = generateModel.ProjectList.Distinct().ToArray(),
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
logger.LogInformation($"推送订舱的服务项目完成 id={id} rlt={JsonConvert.SerializeObject(prjRlt)}");
|
|
|
|
|
logger.LogInformation($"推送订舱的服务项目完成 id={bookingOrderId} rlt={JsonConvert.SerializeObject(prjRlt)}");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
logger.LogInformation($"任务BC MBLNO:{bookingSlotBase.SlotBookingNo} 生成订舱成功 id={id}");
|
|
|
|
|
logger.LogInformation($"任务BC MBLNO:{bookingSlotBase.SlotBookingNo} 生成订舱成功 id={bookingOrderId}");
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
catch (Exception ex)
|
|
|
|
|
@ -1214,7 +1073,7 @@ namespace DS.WMS.Core.TaskPlat.Method
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return id;
|
|
|
|
|
return bookingOrderId;
|
|
|
|
|
}
|
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
|
@ -1303,7 +1162,7 @@ namespace DS.WMS.Core.TaskPlat.Method
|
|
|
|
|
throw new Exception($"订舱的委托客户不能为空");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var djyCustomerInfo = clientInfoService.GetClientInfoWithContact(new Info.Dtos.QueryClientInfo { ClientId = bookingOrderEntity.CustomerId})
|
|
|
|
|
var djyCustomerInfo = clientInfoService.GetClientInfoWithContact(new Info.Dtos.QueryClientInfo { ClientId = bookingOrderEntity.CustomerId })
|
|
|
|
|
.GetAwaiter().GetResult().Data;
|
|
|
|
|
|
|
|
|
|
if (djyCustomerInfo == null)
|
|
|
|
|
@ -1350,7 +1209,7 @@ namespace DS.WMS.Core.TaskPlat.Method
|
|
|
|
|
if (usePersonalEmailSend)
|
|
|
|
|
{
|
|
|
|
|
publicMailAccount = _userEmailService.GetEmailSettings().GetAwaiter().GetResult().Data;
|
|
|
|
|
//&& x.SmtpPort > 0 && x.SmtpServer != null && x.SmtpServer != "");
|
|
|
|
|
//&& x.SmtpPort > 0 && x.SmtpServer != null && x.SmtpServer != "");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
@ -1490,7 +1349,7 @@ namespace DS.WMS.Core.TaskPlat.Method
|
|
|
|
|
//new EmailNoticeHelper().SendEmailNotice($"MBLNO={taskBCInfo.MBL_NO} 转发通知邮件失败", $"MBLNO={taskBCInfo.MBL_NO} 转发通知邮件失败，原因：{ex.Message}", App.Configuration["EmailNoticeDefaultUser"].GetUserEmailList());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(!result)
|
|
|
|
|
if (!result)
|
|
|
|
|
return DataResult.Failed(msg);
|
|
|
|
|
|
|
|
|
|
return DataResult.Successed(msg);
|
|
|
|
|
@ -2094,7 +1953,7 @@ namespace DS.WMS.Core.TaskPlat.Method
|
|
|
|
|
{
|
|
|
|
|
//更新订舱相关内容
|
|
|
|
|
|
|
|
|
|
if(paramConfig.Equals("ENABLE", StringComparison.OrdinalIgnoreCase))
|
|
|
|
|
if (paramConfig.Equals("ENABLE", StringComparison.OrdinalIgnoreCase))
|
|
|
|
|
{
|
|
|
|
|
await GenerateSendEmail(taskBcInfo, taskBaseInfo, orderInfo);
|
|
|
|
|
}
|
|
|
|
|
@ -2105,7 +1964,7 @@ namespace DS.WMS.Core.TaskPlat.Method
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
catch (Exception ex)
|
|
|
|
|
{
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return DataResult.Successed("");
|
|
|
|
|
|
jianghaiqing
4 months ago