From 3595edfd887786365ccaf0b9eeac7fcc67df63c8 Mon Sep 17 00:00:00 2001 From: ddlucky Date: Wed, 15 Mar 2023 16:28:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=B3=E8=B4=B8=E4=BA=91=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E5=8D=95=E4=B8=80=E7=AA=97=E5=8F=A3=E5=95=86=E5=93=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E4=B8=A4=E4=B8=AA=E5=9B=BD=E5=AE=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs b/DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs index 00af11e1..0064e97d 100644 --- a/DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs +++ b/DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs @@ -919,7 +919,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 +986,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;//货号 From 8d3670e09af92f9f43b9f034b2889df816c7a5b6 Mon Sep 17 00:00:00 2001 From: ddlucky Date: Wed, 15 Mar 2023 16:34:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8B=BC=E7=AE=B1=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E5=92=8C=E5=95=86=E5=93=81=E9=A1=B9=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs b/DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs index 0064e97d..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; @@ -1015,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; }