|
|
|
@ -395,8 +395,8 @@ namespace Myshipping.Application
|
|
|
|
|
TaskBCInfoDto bcTargetDto = dto.DataObj.Adapt<TaskBCInfoDto>();
|
|
|
|
|
|
|
|
|
|
//提取箱信息
|
|
|
|
|
var ctnList = _repCtn.AsQueryable()
|
|
|
|
|
.Where(x => x.IsDeleted == false && x.TenantId == UserManager.TENANT_ID
|
|
|
|
|
var ctnList = _repCtn.AsQueryable().Filter(null, true)
|
|
|
|
|
.Where(x => x.IsDeleted == false && x.TenantId.Value == UserManager.TENANT_ID
|
|
|
|
|
&& x.SLOT_ID == model.Id).ToList();
|
|
|
|
|
|
|
|
|
|
if (ctnList != null)
|
|
|
|
@ -1210,6 +1210,7 @@ namespace Myshipping.Application
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <param name="model">生成订舱订单请求</param>
|
|
|
|
|
/// <returns>返回回执</returns>
|
|
|
|
|
[HttpGet("/BookingSlot/CreateBookingOrder")]
|
|
|
|
|
public async Task<TaskManageOrderResultDto> CreateBookingOrder(BookingGenerateDto model)
|
|
|
|
|
{
|
|
|
|
|
TaskManageOrderResultDto result = new TaskManageOrderResultDto();
|
|
|
|
@ -1476,7 +1477,7 @@ namespace Myshipping.Application
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <param name="id"></param>
|
|
|
|
|
/// <returns>返回回执</returns>
|
|
|
|
|
|
|
|
|
|
[HttpGet("/BookingSlot/SearchBookingSlotWithOrderById")]
|
|
|
|
|
public async Task<BookingSlotWithOrderDto> SearchBookingSlotWithOrderById(long id)
|
|
|
|
|
{
|
|
|
|
|
BookingSlotWithOrderDto dto = null;
|
|
|
|
@ -1513,7 +1514,7 @@ namespace Myshipping.Application
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <param name="slotBookingNo">订舱编号</param>
|
|
|
|
|
/// <returns>返回回执</returns>
|
|
|
|
|
|
|
|
|
|
[HttpGet("/BookingSlot/SearchBookingSlotWithOrderByNo")]
|
|
|
|
|
public async Task<BookingSlotWithOrderDto> SearchBookingSlotWithOrderByNo(string slotBookingNo)
|
|
|
|
|
{
|
|
|
|
|
BookingSlotWithOrderDto dto = null;
|
|
|
|
|