diff --git a/HJGL_DS/FineUIPro.Web/File/Excel/领料计划导入模板.xlsx b/HJGL_DS/FineUIPro.Web/File/Excel/领料计划导入模板.xlsx index 7aafce3..e939717 100644 Binary files a/HJGL_DS/FineUIPro.Web/File/Excel/领料计划导入模板.xlsx and b/HJGL_DS/FineUIPro.Web/File/Excel/领料计划导入模板.xlsx differ diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanImport.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanImport.aspx.cs index b4b86cc..5de6f84 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanImport.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanImport.aspx.cs @@ -341,7 +341,25 @@ namespace FineUIPro.Web.WeldMat.UsingPlan } else { - errorInfos += (i + 2) + "行, [数量] 不能为空
"; + errorInfos += (i + 2) + "行, [数量 ] 不能为空
"; + } + + if (ds.Tables[0].Rows[i]["预约日期"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["预约日期"].ToString())) + { + string strTime = ds.Tables[0].Rows[i]["预约日期"].ToString(); + try + { + DateTime d = Convert.ToDateTime(strTime); + usingPlan.OrderDate = d; + } + catch (Exception ex) + { + errorInfos += (i + 2) + "行, [预约日期] 录入不正确
"; + } + } + else + { + errorInfos += (i + 2) + "行, [预约日期] 不能为空
"; } if (ds.Tables[0].Rows[i]["时间段"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["时间段"].ToString())) @@ -407,7 +425,6 @@ namespace FineUIPro.Web.WeldMat.UsingPlan usingPlan.UsingPlanId = SQLHelper.GetNewID(typeof(Model.Weld_UsingPlan)); usingPlan.InPutDate = DateTime.Now; - usingPlan.OrderDate = DateTime.Now.Date; usingPlan.InPutMan = CurrUser.UserId; usingPlan.IsCancel = false; usingPlan.IsSubmit = true; diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/ShowStockIn.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/ShowStockIn.aspx index 5f325cf..96a9b80 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/ShowStockIn.aspx +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/ShowStockIn.aspx @@ -14,7 +14,7 @@