|
|
@ -1732,11 +1732,16 @@ namespace Myshipping.Application
|
|
|
|
|
|
|
|
|
|
|
|
primaryModel.KINDPKGS_EDI_CODE = ediPkgs.MapCode?.Trim();
|
|
|
|
primaryModel.KINDPKGS_EDI_CODE = ediPkgs.MapCode?.Trim();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//这里是订舱时,默认取SOREMARK赋值到EDIREMARK
|
|
|
|
|
|
|
|
if (model.sendType == "B")
|
|
|
|
|
|
|
|
primaryModel.EDIREMARK = order.SOREMARK;
|
|
|
|
|
|
|
|
|
|
|
|
//箱信息
|
|
|
|
//箱信息
|
|
|
|
var contaList = _repCtn.AsQueryable().Where(t => t.BILLID == order.Id).ToList();
|
|
|
|
var contaList = _repCtn.AsQueryable().Where(t => t.BILLID == order.Id).ToList();
|
|
|
|
|
|
|
|
|
|
|
|
primaryModel.CTNLIST = new List<MsOpSeaeCtnEDIBaseModel>();
|
|
|
|
primaryModel.CTNLIST = new List<MsOpSeaeCtnEDIBaseModel>();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//集装箱
|
|
|
|
//集装箱
|
|
|
|
foreach (var conta in contaList)
|
|
|
|
foreach (var conta in contaList)
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -1782,6 +1787,8 @@ namespace Myshipping.Application
|
|
|
|
primaryModel.CTNGOODSLIST.Add(cargoModel);
|
|
|
|
primaryModel.CTNGOODSLIST.Add(cargoModel);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//这里临时赋值,等明确对应的扩展表字段后赋值
|
|
|
|
//这里临时赋值,等明确对应的扩展表字段后赋值
|
|
|
|
|
|
|
|
|
|
|
|
#if DEBUG
|
|
|
|
#if DEBUG
|
|
|
@ -1791,7 +1798,7 @@ namespace Myshipping.Application
|
|
|
|
primaryModel.SalesRepCode = "SALE1";
|
|
|
|
primaryModel.SalesRepCode = "SALE1";
|
|
|
|
primaryModel.ACIHBL = String.Empty;
|
|
|
|
primaryModel.ACIHBL = String.Empty;
|
|
|
|
primaryModel.S0CC0C = String.Empty;
|
|
|
|
primaryModel.S0CC0C = String.Empty;
|
|
|
|
primaryModel.EDIREMARK = String.Empty;
|
|
|
|
|
|
|
|
primaryModel.AMSCONSIGNEE = String.Empty;
|
|
|
|
primaryModel.AMSCONSIGNEE = String.Empty;
|
|
|
|
primaryModel.AMSNOTIFYPARTY = String.Empty;
|
|
|
|
primaryModel.AMSNOTIFYPARTY = String.Empty;
|
|
|
|
primaryModel.EDIATTN = "CEE1";
|
|
|
|
primaryModel.EDIATTN = "CEE1";
|
|
|
|