Merge branch 'master' of https://gitee.com/zxyabc/COMONE

Controller/SCP_PLAN_CONTROLLER.cs

@@ -877,8 +877,8 @@ namespace CK.SCP.Controller
                                     }
                                 }
                                 if (column.ColumnName == "计划天数")
-                                {
+                                {                                  
-                                    if (dr["计划天数"] != null)
+                                  if (dr["计划天数"] != null)                                
                                     {
                                         _dayList.Add(dr["计划天数"].ToString().Trim());
                                     }
@@ -922,6 +922,10 @@ namespace CK.SCP.Controller
                     {
                         _ret.MessageList.Add("版本号、计划天数、零件编码、订单编号、行号、供应商编码、域、单位为必填列");
                     }
+                    if (string.IsNullOrEmpty(_dayList.FirstOrDefault().ToString()))
+                    {
+                        _ret.MessageList.Add("计划天数不能为空!");
+                    }
                     #endregion
                     if (_ret.MessageList.Count == 0)
                     {
@@ -1023,6 +1027,8 @@ namespace CK.SCP.Controller
                         {
                             if (_dayList.Count > 0)
                             {
+
+
                                 var _askday = int.Parse(_dayList.FirstOrDefault());
                                 var _planDayList = _ls.Select(p => p.EndTime).Distinct();
                                 if (_askday > _planDayList.Count())