|
|
|
@ -537,7 +537,7 @@ namespace Myshipping.Application
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//构建数据并发送
|
|
|
|
|
var orderList = _rep.AsQueryable().Where(x => ids.Contains(x.Id)).ToList();
|
|
|
|
|
var orderList = _rep.AsQueryable().Filter(null, true).Where(x => ids.Contains(x.Id)).ToList();
|
|
|
|
|
|
|
|
|
|
//2023-9-1,衣国豪:点击发送订舱时,最少得填写船公司,船期,目的地,品名,箱型,箱量,重量,如果以上信息没填,允许保存,但是发送订舱时给出提示: XXX不能为空,请补充后重新发送
|
|
|
|
|
var emptyCarrList = orderList.Where(x => string.IsNullOrEmpty(x.CARRIERID)).Select(x => x.BOOKINGNO).ToList();
|
|
|
|
@ -680,7 +680,7 @@ namespace Myshipping.Application
|
|
|
|
|
var succ = item.GetBooleanValue("success");
|
|
|
|
|
if (succ)
|
|
|
|
|
{
|
|
|
|
|
var model = _rep.AsQueryable().First(x => x.Id == id);
|
|
|
|
|
var model = _rep.AsQueryable().Filter(null, true).First(x => x.Id == id);
|
|
|
|
|
model.BSSTATUS = "已提交";
|
|
|
|
|
await _rep.UpdateAsync(model);
|
|
|
|
|
|
|
|
|
@ -979,7 +979,7 @@ namespace Myshipping.Application
|
|
|
|
|
model.BSNO,
|
|
|
|
|
BSSTATUS = recModel.Accept ? "已审核" : "已驳回",
|
|
|
|
|
BookingOrderId = recModel.Accept ? (long?)model.BookingId : null,
|
|
|
|
|
COMMENT = recModel.Accept ? null: recModel.Comment
|
|
|
|
|
COMMENT = recModel.Accept ? null : recModel.Comment
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
var json = body.ToJsonString();
|
|
|
|
@ -1802,7 +1802,7 @@ namespace Myshipping.Application
|
|
|
|
|
throw Oops.Bah("HSCODE不能为空");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(input.CtnList==null||input.CtnList.Count==0)
|
|
|
|
|
if (input.CtnList == null || input.CtnList.Count == 0)
|
|
|
|
|
{
|
|
|
|
|
throw Oops.Bah("箱型箱量不能为空");
|
|
|
|
|
}
|
|
|
|
|