解决月销售利润无法导入明细的问题

Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs

@@ -5979,27 +5979,28 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                         var amount = row["金额"].ToString();
                         var note_one = row["备注1"].ToString();
                         var note_two = row["备注2"].ToString();
-                        
-
-
-                        list.Add(new dc_month_sale_profit_details {
-                            type = type,
-                            amount = decimal.Parse(amount),
-                            note_one = note_one,
-                            note_two = note_two,
-
-                            month = month,
-                            colval = col,
-                            colname = colname
-                        });
 
+                        if (type != "" && amount != "")
+                        {
+                            list.Add(new dc_month_sale_profit_details
+                            {
+                                type = type,
+                                amount = decimal.Parse(amount),
+                                note_one = note_one,
+                                note_two = note_two,
+
+                                month = month,
+                                colval = col,
+                                colname = colname
+                            });
+                        }
                     }
                     catch (Exception ex)
                     {
                         return Json(new
                         {
                             success = false,
-                            msg = "导入失败，异常信息：" + ex.Message
+                            msg = "导入失败，第"+(i+1)+"行报错，异常信息：" + ex.Message
                         });
                     }
                 }