From 4e9a4998d1c9c561db71a44e6d94e1bc8e205f14 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Tue, 6 Aug 2024 18:47:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9INTTRA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ds-wms-service/DS.WMS.Core/Op/EDI/InttraEdiHelper.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/Op/EDI/InttraEdiHelper.cs b/ds-wms-service/DS.WMS.Core/Op/EDI/InttraEdiHelper.cs index dd798d0d..3bfdea8d 100644 --- a/ds-wms-service/DS.WMS.Core/Op/EDI/InttraEdiHelper.cs +++ b/ds-wms-service/DS.WMS.Core/Op/EDI/InttraEdiHelper.cs @@ -392,7 +392,7 @@ namespace DS.WMS.Core.Op.EDI } else { - if (headData.EDIREMARK.IndexOf("PLEASE BOOK OCEAN CARRIER") > -1 || headData.EDIREMARK.ToString().Trim() == "") + if (!string.IsNullOrWhiteSpace(headData.EDIREMARK) && (headData.EDIREMARK.IndexOf("PLEASE BOOK OCEAN CARRIER") > -1 || headData.EDIREMARK.ToString().Trim() == "")) { if (headData.CARRIEREDICODE == "COSU") { @@ -406,7 +406,7 @@ namespace DS.WMS.Core.Op.EDI } else { - if (StringIsChinese(headData.EDIREMARK)) + if (!string.IsNullOrWhiteSpace(headData.EDIREMARK) && StringIsChinese(headData.EDIREMARK)) { error = error + "
提单号:" + headData.MBLNO + " EDI备注中含有中文或双字节字符"; }