Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev

DSWeb/Areas/MvcShipping/DAL/RptWmsSettle/RptWmsSettleDAL.cs

@@ -65,9 +65,11 @@ namespace DSWeb.MvcShipping.DAL.RptWmsSettleDAL
                     data.MAKEOUTUSER = Convert.ToString(reader["MAKEOUTUSER_NAME"]);//重新生成人
                     if (reader["MAKEOUTTIME"] != DBNull.Value)
                         data.MAKEOUTTIME = Convert.ToDateTime(reader["MAKEOUTTIME"]);//重新生成时间
+                    if (reader["YWCOUNT"] != DBNull.Value)
+                        data.YWCOUNT = Convert.ToDecimal(reader["YWCOUNT"]);//
+                    if (reader["AMOUNT"] != DBNull.Value)
+                        data.AMOUNT = Convert.ToDecimal(reader["AMOUNT"]);//
 
-                    data.YWCOUNT = Convert.ToDecimal(reader["YWCOUNT"]);//
-                    data.AMOUNT = Convert.ToDecimal(reader["AMOUNT"]);//
                     data.YWSTR = Convert.ToString(reader["YWSTR"]);//
                     #endregion
                     headList.Add(data);

DSWeb/Areas/TruckMng/DAL/MsWlBs/MsWlPcDAL.cs

@@ -894,6 +894,12 @@ namespace DSWeb.Areas.TruckMng.DAL.MsWlBs
 
             if (!string.IsNullOrEmpty(condition))
             {
+
+                if (condition.Contains(" a.")||condition.Contains(" A.")) {
+                    condition = condition.Replace(" a.", " v.");
+                    condition = condition.Replace(" A.", " v.");
+                }
+
                 strSql.Append(" where " + condition);
 
             }