|
|
|
@ -509,7 +509,10 @@ namespace Myshipping.Application
|
|
|
|
|
if(yardInfo != null)
|
|
|
|
|
{
|
|
|
|
|
if (string.IsNullOrWhiteSpace(model.YARDCONTRACT))
|
|
|
|
|
{
|
|
|
|
|
model.YARDCONTRACT = yardInfo.Chief?.Trim();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (string.IsNullOrWhiteSpace(model.YARDCONTRACTTEL))
|
|
|
|
|
model.YARDCONTRACTTEL = yardInfo.Tel?.Trim();
|
|
|
|
@ -517,8 +520,8 @@ namespace Myshipping.Application
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
model.InYardContact = orderInfo.YARDCONTRACT;
|
|
|
|
|
model.InYardContractTel = orderInfo.YARDCONTRACTTEL;
|
|
|
|
|
model.InYardContact = model.YARDCONTRACT;
|
|
|
|
|
model.InYardContractTel = model.YARDCONTRACTTEL;
|
|
|
|
|
|
|
|
|
|
if (orderInfo.KGS.HasValue)
|
|
|
|
|
{
|
|
|
|
|