From 92bcb997a37c07753123852065f0528057d055bd Mon Sep 17 00:00:00 2001 From: ddlucky Date: Mon, 15 May 2023 14:09:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=8D=E7=A6=81=E7=94=A8=EF=BC=9A=E8=AF=BB?= =?UTF-8?q?=E5=8F=96=E5=8D=95=E4=B8=80=E7=AA=97=E5=8F=A3=E5=90=8E=E5=90=91?= =?UTF-8?q?=E6=8A=A5=E5=85=B3=E4=B8=9A=E5=8A=A1=E5=86=99=E5=85=A5=E9=9B=86?= =?UTF-8?q?=E8=A3=85=E7=AE=B1=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DSWeb/Areas/SoftMng/Controllers/ExportController.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/DSWeb/Areas/SoftMng/Controllers/ExportController.cs b/DSWeb/Areas/SoftMng/Controllers/ExportController.cs index f05a0a29..d760db54 100644 --- a/DSWeb/Areas/SoftMng/Controllers/ExportController.cs +++ b/DSWeb/Areas/SoftMng/Controllers/ExportController.cs @@ -3237,7 +3237,8 @@ string swcn = "2020030084935", string swpw = "8a5889ea8e53b257e2a3ba053979ee64" //20210628 增加报关业务的箱信息 //20210630 客户又取消此逻辑 部分原因是读入的箱信息的箱型无法对应 - + //20230515 修改后仍然禁用 + /* CommonDataContext cdc = new CommonDataContext(); //WEIGHKGS称重重量=ContainerWt @@ -3257,7 +3258,8 @@ string swcn = "2020030084935", string swpw = "8a5889ea8e53b257e2a3ba053979ee64" if (op_ctnList.Exists(x => x.CNTRNO == item.containerNo)) { var upditem = op_ctnList.First(x => x.CNTRNO == item.containerNo); - upditem.WEIGHKGS = decimal.Parse(item.containerWt); + if(item.containerWt!=null) + upditem.WEIGHKGS = decimal.Parse(item.containerWt); needinsert_ctn = false; } } @@ -3308,7 +3310,7 @@ string swcn = "2020030084935", string swpw = "8a5889ea8e53b257e2a3ba053979ee64" } cdc.SaveChangesAsync(); - + */ } containerlist = cbll.GetModelList("PID='" + DecHead_Local.GID + "'");