解决一个壹沓科技OCR时ETD为空引发的问题；解决MsCodeOpStatusDetail查询条件为空时的报错

DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs

@@ -519,7 +519,7 @@ namespace DSWeb.Areas.CommMng.DAL
                 /// <summary>
                 /// 
                 /// </summary>
-                public DateTime ETD { get; set; }
+                public DateTime? ETD { get; set; }
                 /// <summary>
                 /// 海运托书
                 /// </summary>
@@ -620,6 +620,9 @@ namespace DSWeb.Areas.CommMng.DAL
                 { //将识别数据与现有数据合并
                     //如识别数据有内容 则用其代替现有字段内容
 
+                    if (data != null && data.commitResult != null)
+                    {
+
                         var _result = data.commitResult;
 
                         if (!string.IsNullOrWhiteSpace(_result.发货人))
@@ -705,8 +708,9 @@ namespace DSWeb.Areas.CommMng.DAL
                                 headdata.CUSTOMERNAME = _tempinfoclient.SHORTNAME;
                             }
                         }
-                }
 
+                    }
+                }
                 private Dictionary<string, string> PropNameList { get; set; } = new Dictionary<string, string>();
 
 

DSWeb/Areas/MvcShipping/DAL/MsCodeOpStatus/MsCodeOpStatusDAL.cs

@@ -83,7 +83,7 @@ namespace DSWeb.MvcShipping.DAL.MsCodeOpStatusDAL
             strSql.Append("SELECT ");
             strSql.Append("GID,SerialNo,OPTYPE,OPSTATUS,STTYPE,CORPID,REMARKS,COLOR");
             strSql.Append(" from code_op_status_detail  ");
-            if (strCondition.Trim() != String.Empty)
+            if (!string.IsNullOrWhiteSpace(strCondition))
             {
                 strSql.Append(" where " + strCondition);
             }