|
|
@ -711,17 +711,17 @@ namespace Myshipping.Application
|
|
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrWhiteSpace(lane))
|
|
|
|
if (!string.IsNullOrWhiteSpace(lane))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
query = query.Where(t => !string.IsNullOrWhiteSpace(t.LANE_CODE) && t.LANE_CODE.Contains(lane));
|
|
|
|
query = query.Where(t => string.IsNullOrWhiteSpace(t.LANE_CODE) || t.LANE_CODE.Contains(lane));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrWhiteSpace(lanecname))
|
|
|
|
if (!string.IsNullOrWhiteSpace(lanecname))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
query = query.Where(t => !string.IsNullOrWhiteSpace(t.LANE_CNAME) && t.LANE_CNAME.Contains(lanecname));
|
|
|
|
query = query.Where(t => string.IsNullOrWhiteSpace(t.LANE_CNAME) || t.LANE_CNAME.Contains(lanecname));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrWhiteSpace(pod))
|
|
|
|
if (!string.IsNullOrWhiteSpace(pod))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
query = query.Where(t => !string.IsNullOrWhiteSpace(t.POD_CODE) && t.POD_CODE.Contains(pod));
|
|
|
|
query = query.Where(t => string.IsNullOrWhiteSpace(t.POD_CODE) || t.POD_CODE.Contains(pod));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
query = query.OrderBy("CONTRACT_NO asc");
|
|
|
|
query = query.OrderBy("CONTRACT_NO asc");
|
|
|
|