|
|
@ -873,10 +873,10 @@ namespace Myshipping.Application
|
|
|
|
{
|
|
|
|
{
|
|
|
|
SystemCode = "djy_hechuan",
|
|
|
|
SystemCode = "djy_hechuan",
|
|
|
|
CarrierCode = order.CARRIERID,
|
|
|
|
CarrierCode = order.CARRIERID,
|
|
|
|
billOrderId = order.Id,
|
|
|
|
billOrderId = order.Id.ToString(),
|
|
|
|
sendOrderCode = order.MBLNO,
|
|
|
|
sendOrderCode = order.MBLNO,
|
|
|
|
userId = UserManager.DjyUserId,
|
|
|
|
userId = UserManager.DjyUserId,
|
|
|
|
customerId = order.CUSTOMERID,
|
|
|
|
customerId = order.CUSTOMERID.ToString(),
|
|
|
|
// userName = currUser.CODENAME,
|
|
|
|
// userName = currUser.CODENAME,
|
|
|
|
//userPassword = currUser.PASSWORD,
|
|
|
|
//userPassword = currUser.PASSWORD,
|
|
|
|
operatorName = UserManager.Name,
|
|
|
|
operatorName = UserManager.Name,
|
|
|
@ -891,7 +891,7 @@ namespace Myshipping.Application
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return new
|
|
|
|
return new
|
|
|
|
{
|
|
|
|
{
|
|
|
|
boxType = ctnMapping.First(x => x.Code == c.CTNCODE),
|
|
|
|
boxType = ctnMapping.First(x => x.Code == c.CTNCODE).MapCode,
|
|
|
|
boxCount = c.CTNNUM.Value
|
|
|
|
boxCount = c.CTNNUM.Value
|
|
|
|
};
|
|
|
|
};
|
|
|
|
}),
|
|
|
|
}),
|
|
|
|