diff --git a/DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs b/DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs index 00af11e1..5bccfe1f 100644 --- a/DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs +++ b/DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs @@ -19,6 +19,7 @@ using com.sun.tools.apt.util; using DSWeb.Areas.CommMng.Models; using DSWeb.Areas.Import.DAL.ReceiptDoc; using DSWeb.Areas.MvcShipping.Helper; +using DSWeb.Areas.MvcShipping.Models.Message.VGM; using DSWeb.Common.DB; using DSWeb.EntityDA; using DSWeb.MvcShipping.DAL.MsChFeeDAL; @@ -919,7 +920,6 @@ namespace DSWeb.Areas.CommMng.DAL dh.TradeCountry = head.COUNTRY_CODE_EN;//---"COUNTRY_CODE_EN": "启运国、运抵国",目前已写入 报关业务编辑页:货源国别 计划同时写入 单一窗口编辑页:运抵国(启运国) dh.TradeCountry_Text = GetCodeAndTextByCode(emlistQuery, "国别地区", dh.TradeCountry); - dh.DistinatePort = head.DEST_PORT_CODE_EN;//---"DEST_PORT_CODE_EN": "装货港、指运港",目前未处理 改为写入 单一窗口编辑页:抵运港(启运港) dh.DistinatePort_Text = cdc.sys_b_Port.FirstOrDefault(x => x.Value == head.DEST_PORT_CODE_EN).Name; @@ -987,11 +987,13 @@ namespace DSWeb.Areas.CommMng.DAL result.DeclTotal = BasicDataRefDAL.String2Decimal(DECL_GOODS.AMOUNT);//---"AMOUNT": "成交总价",目前写入 报关业务编辑页-商品明细:总价;计划增加写入 单一窗口编辑页-商品明细:总价 //result.DestinationCountry = DECL_GOODS.DESTINATION_CODE;//目的国 result.DestinationCountry = GetTextByCode(emlistQuery, "国别地区代码", DECL_GOODS.DESTINATION_CODE); + result.DestinationCountry_Text = result.DestinationCountry; result.DutyMode = DECL_GOODS.TAX_TYPE;//---"TAX_TYPE": "征免方式代码",目前未处理 改为写入 单一窗口编辑页-商品明细:征免方式 result.DutyMode_Text = GetTextByCode(emlistQuery, "征免方式", result.DutyMode); //result.OriginCountry = DECL_GOODS.COUNTRY_OF_ORIGIN_CODE;//---"COUNTRY_OF_ORIGIN_CODE_EN": "消费国/原产国",目前未处理 改为写入 单一窗口编辑页-商品明细:原产国(地区) result.OriginCountry = GetTextByCode(emlistQuery, "国别地区代码", DECL_GOODS.COUNTRY_OF_ORIGIN_CODE); + result.OriginCountry_Text = result.OriginCountry; result.ExgNo = DECL_GOODS.GOODS_NO;//货号 @@ -1014,8 +1016,9 @@ namespace DSWeb.Areas.CommMng.DAL result.ContainerMd = DECL_CONTA.CUS_CONTA_TYPE;// ---"CUS_CONTA_TYPE": "集装箱规格",目前未处理 不做处理 改为记入【集装箱规格】 result.ContainerMd_Text= GetTextByCode(emlistQuery, "集装箱规格", result.ContainerMd); result.ContainerWt = BasicDataRefDAL.String2Decimal(DECL_CONTA.CONTA_GROSS_WEIGHT);//---"CONTA_GROSS_WEIGHT": "集装箱自重", 目前未处理 改为写入 单一窗口编辑页-集装箱明细:自重(KG) - result.LclFlag = ""; + result.LclFlag = DECL_CONTA.LCL_FLAG;//拼箱标识 + result.GoodsNo = DECL_CONTA.GOODS_NO;//关联商品项号 return result; }