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备注中含有中文或双字节字符"; }