|
|
@ -3831,7 +3831,7 @@ namespace Myshipping.Application
|
|
|
|
{
|
|
|
|
{
|
|
|
|
BookingOrder order = new BookingOrder();
|
|
|
|
BookingOrder order = new BookingOrder();
|
|
|
|
BookingCtn ctn = new BookingCtn();
|
|
|
|
BookingCtn ctn = new BookingCtn();
|
|
|
|
BookingEDIExt ext = new BookingEDIExt();
|
|
|
|
BookingEDIExt edi = new BookingEDIExt();
|
|
|
|
Dictionary<string, string> dic = new Dictionary<string, string>();
|
|
|
|
Dictionary<string, string> dic = new Dictionary<string, string>();
|
|
|
|
foreach (PropertyDescriptor descriptor in TypeDescriptor.GetProperties(order))
|
|
|
|
foreach (PropertyDescriptor descriptor in TypeDescriptor.GetProperties(order))
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -3842,7 +3842,7 @@ namespace Myshipping.Application
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!string.IsNullOrWhiteSpace(descriptor.Description))
|
|
|
|
if (!string.IsNullOrWhiteSpace(descriptor.Description))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
dic.Add(descriptor.Name, descriptor.Description);
|
|
|
|
dic.Add("order."+descriptor.Name, descriptor.Description);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -3858,14 +3858,14 @@ namespace Myshipping.Application
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!string.IsNullOrWhiteSpace(descriptor.Description))
|
|
|
|
if (!string.IsNullOrWhiteSpace(descriptor.Description))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
dic1.Add(descriptor.Name, descriptor.Description);
|
|
|
|
dic1.Add("ctn." + descriptor.Name, descriptor.Description);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Dictionary<string, string> dic2 = new Dictionary<string, string>();
|
|
|
|
Dictionary<string, string> dic2 = new Dictionary<string, string>();
|
|
|
|
foreach (PropertyDescriptor descriptor in TypeDescriptor.GetProperties(ext))
|
|
|
|
foreach (PropertyDescriptor descriptor in TypeDescriptor.GetProperties(edi))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
string name = descriptor.Name;
|
|
|
|
string name = descriptor.Name;
|
|
|
|
if (name == "TenantId" || name == "CreatedTime" || name == "UpdatedTime" || name == "CreatedUserId" || name == "CreatedUserName")
|
|
|
|
if (name == "TenantId" || name == "CreatedTime" || name == "UpdatedTime" || name == "CreatedUserId" || name == "CreatedUserName")
|
|
|
@ -3874,7 +3874,7 @@ namespace Myshipping.Application
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!string.IsNullOrWhiteSpace(descriptor.Description))
|
|
|
|
if (!string.IsNullOrWhiteSpace(descriptor.Description))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
dic2.Add(descriptor.Name, descriptor.Description);
|
|
|
|
dic2.Add("edi." + descriptor.Name, descriptor.Description);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|