diff --git a/SGGL/BLL/ProjectData/UnitWorkService.cs b/SGGL/BLL/ProjectData/UnitWorkService.cs index 16e48681..524d22ad 100644 --- a/SGGL/BLL/ProjectData/UnitWorkService.cs +++ b/SGGL/BLL/ProjectData/UnitWorkService.cs @@ -290,6 +290,16 @@ namespace BLL } return item; } + public static ListItem[] GetUnitWork2(string projectId) + { + List q = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && x.SuperUnitWork == null orderby x.UnitWorkCode select x).ToList(); + ListItem[] item = new ListItem[q.Count()]; + for (int i = 0; i < q.Count(); i++) + { + item[i] = new ListItem(q[i].UnitWorkName, q[i].UnitWorkId.ToString()); + } + return item; + } /// /// 获取单位名称 /// @@ -355,6 +365,23 @@ namespace BLL Funs.FineUIPleaseSelect(dropName); } } + + /// + /// 单位工程表下拉框 + /// + /// 下拉框名字 + /// 是否显示请选择 + public static void InitUnitWorkList2(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease) + { + dropName.DataValueField = "Text"; + dropName.DataTextField = "Text"; + dropName.DataSource = GetUnitWork2(projectId); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } /// /// 根据项目id 获取单位工程 /// diff --git a/SGGL/BLL/WebService/MCSWebService.cs b/SGGL/BLL/WebService/MCSWebService.cs index 1924b0d4..eeb74157 100644 --- a/SGGL/BLL/WebService/MCSWebService.cs +++ b/SGGL/BLL/WebService/MCSWebService.cs @@ -32,161 +32,169 @@ AutoReset = true }; messageTimer.Elapsed += new ElapsedEventHandler(GetCLData); - messageTimer.Interval = 1000 * 60 * 60 * 12;// 60分钟 60000 * adTimeJ; + messageTimer.Interval = 1000 * 60 * 60 * 3;// 60分钟 60000 * adTimeJ; messageTimer.Start(); } #endregion public static void GetCLData(object sender, ElapsedEventArgs e) { - getPojectInfo(); - getVendor(); - var projects = from x in Funs.DB.Base_Project where x.CLProjectCode != null select x; - foreach (var project in projects) + try { - getShelvesNo(project.CLProjectCode ?? 0); - getSubcontractor(project.CLProjectCode ?? 0); - getPipelineMaterialSumListInfo(project.CLProjectCode ?? 0); - getContractListInfo(project.CLProjectCode ?? 0); - using (var db = new Model.SGGLDB(Funs.ConnString)) + getPojectInfo(); + getVendor(); + var projects = from x in Funs.DB.Base_Project where x.CLProjectCode != null select x; + foreach (var project in projects) { - Model.Sys_Log syslog = new Model.Sys_Log + getShelvesNo(project.CLProjectCode ?? 0); + getSubcontractor(project.CLProjectCode ?? 0); + getPipelineMaterialSumListInfo(project.CLProjectCode ?? 0); + getContractListInfo(project.CLProjectCode ?? 0); + using (var db = new Model.SGGLDB(Funs.ConnString)) { - LogId = SQLHelper.GetNewID(), - HostName = "本地4", - OperationTime = DateTime.Now, - UserId = BLL.Const.sysglyId, - MenuId = BLL.Const.sysglyId, - OperationName = "材料软件定时", - DataId = "材料软件定时", - LogSource = 1, - }; - db.Sys_Log.InsertOnSubmit(syslog); - db.SubmitChanges(); + Model.Sys_Log syslog = new Model.Sys_Log + { + LogId = SQLHelper.GetNewID(), + HostName = "本地4", + OperationTime = DateTime.Now, + UserId = BLL.Const.sysglyId, + MenuId = BLL.Const.sysglyId, + OperationName = "材料软件定时", + DataId = "材料软件定时", + LogSource = 1, + }; + db.Sys_Log.InsertOnSubmit(syslog); + db.SubmitChanges(); + } + getContractListSumInfo(project.CLProjectCode ?? 0); + using (var db = new Model.SGGLDB(Funs.ConnString)) + { + Model.Sys_Log syslog = new Model.Sys_Log + { + LogId = SQLHelper.GetNewID(), + HostName = "本地5", + OperationTime = DateTime.Now, + UserId = BLL.Const.sysglyId, + MenuId = BLL.Const.sysglyId, + OperationName = "材料软件定时", + DataId = "材料软件定时", + LogSource = 1, + }; + db.Sys_Log.InsertOnSubmit(syslog); + db.SubmitChanges(); + } } - getContractListSumInfo(project.CLProjectCode ?? 0); - using (var db = new Model.SGGLDB(Funs.ConnString)) + foreach (var project in projects) { - Model.Sys_Log syslog = new Model.Sys_Log + getPipelineMaterialListInfo(project.CLProjectCode ?? 0); + using (var db = new Model.SGGLDB(Funs.ConnString)) { - LogId = SQLHelper.GetNewID(), - HostName = "本地5", - OperationTime = DateTime.Now, - UserId = BLL.Const.sysglyId, - MenuId = BLL.Const.sysglyId, - OperationName = "材料软件定时", - DataId = "材料软件定时", - LogSource = 1, - }; - db.Sys_Log.InsertOnSubmit(syslog); - db.SubmitChanges(); + Model.Sys_Log syslog = new Model.Sys_Log + { + LogId = SQLHelper.GetNewID(), + HostName = "本地6", + OperationTime = DateTime.Now, + UserId = BLL.Const.sysglyId, + MenuId = BLL.Const.sysglyId, + OperationName = "材料软件定时", + DataId = "材料软件定时", + LogSource = 1, + }; + db.Sys_Log.InsertOnSubmit(syslog); + db.SubmitChanges(); + } + getPipelineMaterialCodeListInfo(project.CLProjectCode ?? 0); + using (var db = new Model.SGGLDB(Funs.ConnString)) + { + Model.Sys_Log syslog = new Model.Sys_Log + { + LogId = SQLHelper.GetNewID(), + HostName = "本地7", + OperationTime = DateTime.Now, + UserId = BLL.Const.sysglyId, + MenuId = BLL.Const.sysglyId, + OperationName = "材料软件定时", + DataId = "材料软件定时", + LogSource = 1, + }; + db.Sys_Log.InsertOnSubmit(syslog); + db.SubmitChanges(); + } + getPipelineSupplierListInfo(project.CLProjectCode ?? 0); + using (var db = new Model.SGGLDB(Funs.ConnString)) + { + Model.Sys_Log syslog = new Model.Sys_Log + { + LogId = SQLHelper.GetNewID(), + HostName = "本地8", + OperationTime = DateTime.Now, + UserId = BLL.Const.sysglyId, + MenuId = BLL.Const.sysglyId, + OperationName = "材料软件定时", + DataId = "材料软件定时", + LogSource = 1, + }; + db.Sys_Log.InsertOnSubmit(syslog); + db.SubmitChanges(); + } + getArrivalDetailListInfo(project.CLProjectCode ?? 0); + using (var db = new Model.SGGLDB(Funs.ConnString)) + { + Model.Sys_Log syslog = new Model.Sys_Log + { + LogId = SQLHelper.GetNewID(), + HostName = "本地9", + OperationTime = DateTime.Now, + UserId = BLL.Const.sysglyId, + MenuId = BLL.Const.sysglyId, + OperationName = "材料软件定时", + DataId = "材料软件定时", + LogSource = 1, + }; + db.Sys_Log.InsertOnSubmit(syslog); + db.SubmitChanges(); + } + getCheckOutDetailListInfo(project.CLProjectCode ?? 0); + using (var db = new Model.SGGLDB(Funs.ConnString)) + { + Model.Sys_Log syslog = new Model.Sys_Log + { + LogId = SQLHelper.GetNewID(), + HostName = "本地10", + OperationTime = DateTime.Now, + UserId = BLL.Const.sysglyId, + MenuId = BLL.Const.sysglyId, + OperationName = "材料软件定时", + DataId = "材料软件定时", + LogSource = 1, + }; + db.Sys_Log.InsertOnSubmit(syslog); + db.SubmitChanges(); + } + getRequestDetailListInfo(project.CLProjectCode ?? 0); + getMTODetailInfo(project.CLProjectCode ?? 0); + using (var db = new Model.SGGLDB(Funs.ConnString)) + { + Model.Sys_Log syslog = new Model.Sys_Log + { + LogId = SQLHelper.GetNewID(), + HostName = "本地3", + OperationTime = DateTime.Now, + UserId = BLL.Const.sysglyId, + MenuId = BLL.Const.sysglyId, + OperationName = "材料软件定时", + DataId = "材料软件定时", + LogSource = 1, + }; + db.Sys_Log.InsertOnSubmit(syslog); + db.SubmitChanges(); + } } } - foreach (var project in projects) + catch (Exception ex) { - getPipelineMaterialListInfo(project.CLProjectCode ?? 0); - using (var db = new Model.SGGLDB(Funs.ConnString)) - { - Model.Sys_Log syslog = new Model.Sys_Log - { - LogId = SQLHelper.GetNewID(), - HostName = "本地6", - OperationTime = DateTime.Now, - UserId = BLL.Const.sysglyId, - MenuId = BLL.Const.sysglyId, - OperationName = "材料软件定时", - DataId = "材料软件定时", - LogSource = 1, - }; - db.Sys_Log.InsertOnSubmit(syslog); - db.SubmitChanges(); - } - getPipelineMaterialCodeListInfo(project.CLProjectCode ?? 0); - using (var db = new Model.SGGLDB(Funs.ConnString)) - { - Model.Sys_Log syslog = new Model.Sys_Log - { - LogId = SQLHelper.GetNewID(), - HostName = "本地7", - OperationTime = DateTime.Now, - UserId = BLL.Const.sysglyId, - MenuId = BLL.Const.sysglyId, - OperationName = "材料软件定时", - DataId = "材料软件定时", - LogSource = 1, - }; - db.Sys_Log.InsertOnSubmit(syslog); - db.SubmitChanges(); - } - getPipelineSupplierListInfo(project.CLProjectCode ?? 0); - using (var db = new Model.SGGLDB(Funs.ConnString)) - { - Model.Sys_Log syslog = new Model.Sys_Log - { - LogId = SQLHelper.GetNewID(), - HostName = "本地8", - OperationTime = DateTime.Now, - UserId = BLL.Const.sysglyId, - MenuId = BLL.Const.sysglyId, - OperationName = "材料软件定时", - DataId = "材料软件定时", - LogSource = 1, - }; - db.Sys_Log.InsertOnSubmit(syslog); - db.SubmitChanges(); - } - getArrivalDetailListInfo(project.CLProjectCode ?? 0); - using (var db = new Model.SGGLDB(Funs.ConnString)) - { - Model.Sys_Log syslog = new Model.Sys_Log - { - LogId = SQLHelper.GetNewID(), - HostName = "本地9", - OperationTime = DateTime.Now, - UserId = BLL.Const.sysglyId, - MenuId = BLL.Const.sysglyId, - OperationName = "材料软件定时", - DataId = "材料软件定时", - LogSource = 1, - }; - db.Sys_Log.InsertOnSubmit(syslog); - db.SubmitChanges(); - } - getCheckOutDetailListInfo(project.CLProjectCode ?? 0); - using (var db = new Model.SGGLDB(Funs.ConnString)) - { - Model.Sys_Log syslog = new Model.Sys_Log - { - LogId = SQLHelper.GetNewID(), - HostName = "本地10", - OperationTime = DateTime.Now, - UserId = BLL.Const.sysglyId, - MenuId = BLL.Const.sysglyId, - OperationName = "材料软件定时", - DataId = "材料软件定时", - LogSource = 1, - }; - db.Sys_Log.InsertOnSubmit(syslog); - db.SubmitChanges(); - } - getRequestDetailListInfo(project.CLProjectCode ?? 0); - getMTODetailInfo(project.CLProjectCode ?? 0); - using (var db = new Model.SGGLDB(Funs.ConnString)) - { - Model.Sys_Log syslog = new Model.Sys_Log - { - LogId = SQLHelper.GetNewID(), - HostName = "本地3", - OperationTime = DateTime.Now, - UserId = BLL.Const.sysglyId, - MenuId = BLL.Const.sysglyId, - OperationName = "材料软件定时", - DataId = "材料软件定时", - LogSource = 1, - }; - db.Sys_Log.InsertOnSubmit(syslog); - db.SubmitChanges(); - } + StartMonitor(); + ErrLogInfo.WriteLog("材料软件定时器启动失败!", ex); } } diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index dacec2ee..5faf6545 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1404,6 +1404,7 @@ + @@ -13931,6 +13932,13 @@ WeekPlan.aspx + + WeekPlanEdit.aspx + ASPXCodeBehind + + + WeekPlanEdit.aspx + WeekPlanIn.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user index 63ca13cc..9e91deff 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true false diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanEdit.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanEdit.aspx.cs index e9d081c9..dd7c7192 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanEdit.aspx.cs @@ -83,6 +83,7 @@ namespace FineUIPro.Web.JDGL.Check if (string.IsNullOrEmpty(this.txtMonth.Text)) { ShowNotify("请选择月份！", MessageBoxIcon.Warning); + return; } SaveData(true); } diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanEdit.aspx.designer.cs index 92339b8d..ae4d043d 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanEdit.aspx.designer.cs @@ -111,6 +111,15 @@ namespace FineUIPro.Web.JDGL.Check { /// protected global::System.Web.UI.WebControls.Label Label1; + /// + /// DropDownList1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList DropDownList1; + /// /// drpUnitId 控件。 /// diff --git a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx index 3d59cd90..f1387b45 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx +++ b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx @@ -23,9 +23,13 @@ - - + + + + + @@ -91,7 +95,7 @@ diff --git a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx.cs index 2484cb80..9a1fca1c 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx.cs @@ -19,7 +19,25 @@ namespace FineUIPro.Web.JDGL.Check { GetButtonPower(); btnNew.OnClientClick = Window1.GetShowReference("WeekPlanEdit.aspx") + "return false;"; - this.txtWeeks.Text = string.Format("{0:yyyy-MM}", DateTime.Now); + this.drpWeekNo.DataTextField = "Text"; + this.drpWeekNo.DataValueField = "Value"; + var weekPlans = (from x in Funs.DB.JDGL_WeekPlan where x.ProjectId == this.CurrUser.LoginProjectId orderby x.StartDate descending select x.WeekNo).Distinct().OrderByDescending(x => x).ToList(); + if (weekPlans.Count() > 0) + { + ListItem[] list = new ListItem[weekPlans.Count()]; + for (int i = 0; i < weekPlans.Count(); i++) + { + list[i] = new ListItem(weekPlans[i], weekPlans[i]); + } + this.drpWeekNo.DataSource = list; + this.drpWeekNo.DataBind(); + this.drpWeekNo.SelectedValue = list[0].Value; + } + else + { + this.drpWeekNo.DataSource = null; + this.drpWeekNo.DataBind(); + } BindGrid(); } } @@ -52,7 +70,7 @@ namespace FineUIPro.Web.JDGL.Check protected void btnModify_Click(object sender, EventArgs e) { Window1.Title = "录入"; - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WeekPlanEdit.aspx?Weeks={0}", this.txtWeeks.Text, "编辑 - "))); + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WeekPlanEdit.aspx?WeekNo={0}", this.drpWeekNo.SelectedValue, "编辑 - "))); } /// @@ -60,6 +78,23 @@ namespace FineUIPro.Web.JDGL.Check /// private void BindGrid() { + var weekPlan = Funs.DB.JDGL_WeekPlan.FirstOrDefault(x => x.WeekNo == this.drpWeekNo.SelectedValue); + if (weekPlan != null) + { + if (weekPlan.StartDate != null) + { + this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", weekPlan.StartDate); + } + if (weekPlan.EndDate != null) + { + this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", weekPlan.EndDate); + } + } + else + { + this.txtStartDate.Text = string.Empty; + this.txtEndDate.Text = string.Empty; + } string strSql = @"select mp.*,u.UnitName,us.UserName as DutyPersonName,uw.UnitWorkName,cn.ProfessionalName,case mp.IsOK when 1 then '已完成' when 0 then '未完成' else '' end as IsOKStr from [dbo].[JDGL_WeekPlan] mp left join Base_Unit u on u.UnitId=mp.UnitId left join Sys_User us on us.UserId=mp.DutyPerson @@ -68,7 +103,12 @@ left join Base_CNProfessional cn on cn.CNProfessionalId=mp.Major where mp.ProjectId=@ProjectId and mp.WeekNo=@WeekNo order by mp.SortIndex"; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); - listStr.Add(new SqlParameter("@WeekNo", string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(this.txtWeeks.Text.Trim() + "-01")))); + string weekNo = string.Empty; + if (!string.IsNullOrEmpty(this.drpWeekNo.SelectedValue)) + { + weekNo = this.drpWeekNo.SelectedValue; + } + listStr.Add(new SqlParameter("@WeekNo", weekNo)); SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); Grid1.RecordCount = tb.Rows.Count; @@ -132,7 +172,23 @@ where mp.ProjectId=@ProjectId and mp.WeekNo=@WeekNo order by mp.SortIndex"; string rowID = Grid1.DataKeys[rowIndex][0].ToString(); BLL.WeekPlanService.DeleteWeekPlanByWeekPlanId(rowID); } - + var weekPlans = (from x in Funs.DB.JDGL_WeekPlan where x.ProjectId == this.CurrUser.LoginProjectId orderby x.StartDate descending select x.WeekNo).Distinct().OrderByDescending(x => x).ToList(); + if (weekPlans.Count() > 0) + { + ListItem[] list = new ListItem[weekPlans.Count()]; + for (int i = 0; i < weekPlans.Count(); i++) + { + list[i] = new ListItem(weekPlans[i], weekPlans[i]); + } + this.drpWeekNo.DataSource = list; + this.drpWeekNo.DataBind(); + this.drpWeekNo.SelectedValue = list[0].Value; + } + else + { + this.drpWeekNo.DataSource = null; + this.drpWeekNo.DataBind(); + } BindGrid(); ShowNotify("删除数据成功!", MessageBoxIcon.Success); } @@ -157,6 +213,23 @@ where mp.ProjectId=@ProjectId and mp.WeekNo=@WeekNo order by mp.SortIndex"; /// protected void Window1_Close(object sender, WindowCloseEventArgs e) { + var weekPlans = (from x in Funs.DB.JDGL_WeekPlan where x.ProjectId == this.CurrUser.LoginProjectId orderby x.StartDate descending select x.WeekNo).Distinct().OrderByDescending(x => x).ToList(); + if (weekPlans.Count() > 0) + { + ListItem[] list = new ListItem[weekPlans.Count()]; + for (int i = 0; i < weekPlans.Count(); i++) + { + list[i] = new ListItem(weekPlans[i], weekPlans[i]); + } + this.drpWeekNo.DataSource = list; + this.drpWeekNo.DataBind(); + this.drpWeekNo.SelectedValue = list[0].Value; + } + else + { + this.drpWeekNo.DataSource = null; + this.drpWeekNo.DataBind(); + } BindGrid(); } #endregion @@ -173,5 +246,10 @@ where mp.ProjectId=@ProjectId and mp.WeekNo=@WeekNo order by mp.SortIndex"; PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WeekPlanStatisc.aspx", "统计 - "))); } #endregion + + protected void drpWeekNo_SelectedIndexChanged(object sender, EventArgs e) + { + BindGrid(); + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx.designer.cs index 3e7ac331..d2ac62ae 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx.designer.cs @@ -58,13 +58,31 @@ namespace FineUIPro.Web.JDGL.Check { protected global::FineUIPro.Toolbar Toolbar1; /// - /// txtWeeks 控件。 + /// drpWeekNo 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DatePicker txtWeeks; + protected global::FineUIPro.DropDownList drpWeekNo; + + /// + /// txtStartDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartDate; + + /// + /// txtEndDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndDate; /// /// btnSave 控件。 diff --git a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanEdit.aspx b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanEdit.aspx new file mode 100644 index 00000000..0551e975 --- /dev/null +++ b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanEdit.aspx @@ -0,0 +1,190 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeekPlanEdit.aspx.cs" Inherits="FineUIPro.Web.JDGL.Check.WeekPlanEdit" %> + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanEdit.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanEdit.aspx.cs new file mode 100644 index 00000000..a1564936 --- /dev/null +++ b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanEdit.aspx.cs @@ -0,0 +1,334 @@ +using BLL; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.JDGL.Check +{ + public partial class WeekPlanEdit : PageBase + { + /// + /// 项目id + /// + public string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + string weekNo = string.Empty; + if (!string.IsNullOrEmpty(Request.Params["WeekNo"])) + { + weekNo = Request.Params["WeekNo"]; + } + UnitWorkService.InitUnitWorkList2(drpUnitWork, this.CurrUser.LoginProjectId, false); + CNProfessionalService.InitCNProfessional(drpMajor, false); + BLL.ProjectUnitService.InitUnitDropDownList2(drpUnitId, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false); + UserService.Init(drpDutyPerson, CurrUser.LoginProjectId, false); + this.txtWeekNo.Text = weekNo; + var weekPlan = Funs.DB.JDGL_WeekPlan.FirstOrDefault(x => x.WeekNo == this.txtWeekNo.Text); + if (weekPlan != null) + { + if (weekPlan.StartDate != null) + { + this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", weekPlan.StartDate); + } + if (weekPlan.EndDate != null) + { + this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", weekPlan.EndDate); + } + } + else + { + this.txtStartDate.Text = string.Empty; + this.txtEndDate.Text = string.Empty; + var lastWeekPlan = (from x in Funs.DB.JDGL_WeekPlan where x.ProjectId == this.CurrUser.LoginProjectId orderby x.StartDate descending select x).FirstOrDefault(); + if (lastWeekPlan != null) + { + BindGrid2(lastWeekPlan.WeekNo); + } + } + BindGrid(); + } + } + + /// + /// 加载Grid + /// + private void BindGrid() + { + string weekNo = this.txtWeekNo.Text.Trim(); + Model.SGGLDB db = Funs.DB; + Grid1.DataSource = from x in db.JDGL_WeekPlan + where x.ProjectId == this.CurrUser.LoginProjectId && x.WeekNo == weekNo + orderby x.SortIndex + select new + { + x.WeekPlanId, + x.ProjectId, + x.WeekNo, + x.StartDate, + x.EndDate, + UnitWork = (from y in db.WBS_UnitWork where y.UnitWorkId == x.UnitWork select y.UnitWorkName).First(), + Major = (from y in db.Base_CNProfessional where y.CNProfessionalId == x.Major select y.ProfessionalName).First(), + UnitId = (from y in db.Base_Unit where y.UnitId == x.UnitId select y.UnitName).First(), + x.WorkContent, + x.PlanDate, + DutyPerson = (from y in db.Sys_User where y.UserId == x.DutyPerson select y.UserName).First(), + IsOK = ConvertIsOK(x.IsOK), + x.Remark, + }; + Grid1.DataBind(); + } + + private void BindGrid2(string weekNo) + { + Model.SGGLDB db = Funs.DB; + Grid2.DataSource = from x in db.JDGL_WeekPlan + where x.ProjectId == this.CurrUser.LoginProjectId && x.WeekNo == weekNo + orderby x.SortIndex + select new + { + x.WeekPlanId, + x.ProjectId, + x.WeekNo, + x.StartDate, + x.EndDate, + UnitWork = (from y in db.WBS_UnitWork where y.UnitWorkId == x.UnitWork select y.UnitWorkName).First(), + Major = (from y in db.Base_CNProfessional where y.CNProfessionalId == x.Major select y.ProfessionalName).First(), + UnitId = (from y in db.Base_Unit where y.UnitId == x.UnitId select y.UnitName).First(), + x.WorkContent, + x.PlanDate, + DutyPerson = (from y in db.Sys_User where y.UserId == x.DutyPerson select y.UserName).First(), + IsOK = ConvertIsOK(x.IsOK), + x.Remark, + }; + Grid2.DataBind(); + } + + private string ConvertIsOK(bool? isOK) + { + string str = string.Empty; + if (isOK != null) + { + if (isOK == true) + { + str = "已完成"; + } + else + { + str = "未完成"; + } + } + return str; + } + + #region 月份选择事件 + /// + /// 月份选择事件 + /// + /// + /// + protected void txtMonths_TextChanged(object sender, EventArgs e) + { + BindGrid(); + } + #endregion + + protected void btnSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.txtWeekNo.Text)) + { + ShowNotify("请输入周号！", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrEmpty(this.txtStartDate.Text)) + { + ShowNotify("请选择开始日期！", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrEmpty(this.txtEndDate.Text)) + { + ShowNotify("请选择结束日期！", MessageBoxIcon.Warning); + return; + } + SaveData(true); + } + + private void SaveData(bool bl) + { + string weekNo = this.txtWeekNo.Text.Trim(); + DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); + DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + var list = GetDetails(); + Model.SGGLDB db = Funs.DB; + var unitWorks = from x in db.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId select x; + var cns = from x in db.Base_CNProfessional select x; + var units = from x in db.Base_Unit select x; + var users = from x in db.Sys_User select x; + BLL.WeekPlanService.DeleteAllWeekPlan(this.CurrUser.LoginProjectId, weekNo); + int i = 1; + foreach (var item in list) + { + Model.JDGL_WeekPlan WeekPlan = new Model.JDGL_WeekPlan(); + WeekPlan.WeekPlanId = SQLHelper.GetNewID(typeof(Model.JDGL_WeekPlan)); + WeekPlan.ProjectId = this.CurrUser.LoginProjectId; + WeekPlan.WeekNo = weekNo; + WeekPlan.StartDate = startDate; + WeekPlan.EndDate = endDate; + if (unitWorks.FirstOrDefault(x => x.UnitWorkName == item.UnitWork) != null) + { + WeekPlan.UnitWork = unitWorks.FirstOrDefault(x => x.UnitWorkName == item.UnitWork).UnitWorkId; + } + if (cns.FirstOrDefault(x => x.ProfessionalName == item.Major) != null) + { + WeekPlan.Major = cns.FirstOrDefault(x => x.ProfessionalName == item.Major).CNProfessionalId; + } + var unit = units.FirstOrDefault(x => x.UnitName == item.UnitId); + if (unit != null) + { + WeekPlan.UnitId = unit.UnitId; + } + WeekPlan.WorkContent = item.WorkContent; + WeekPlan.PlanDate = item.PlanDate; + var user = users.FirstOrDefault(x => x.UserName == item.DutyPerson); + if (user != null) + { + WeekPlan.DutyPerson = user.UserId; + } + WeekPlan.IsOK = item.IsOK; + WeekPlan.Remark = item.Remark; + WeekPlan.CompileMan = this.CurrUser.UserId; + WeekPlan.CompileDate = DateTime.Now; + WeekPlan.SortIndex = i; + BLL.WeekPlanService.AddWeekPlan(WeekPlan); + i++; + } + foreach (JObject mergedRow in Grid2.GetMergedData()) + { + JObject values = mergedRow.Value("values"); + int a= mergedRow.Value("index"); + Model.JDGL_WeekPlan ql = BLL.WeekPlanService.GetWeekPlanById(Grid2.Rows[a].RowID); + if (!string.IsNullOrEmpty(values.Value("IsOK"))) + { + ql.IsOK = values.Value("IsOK") == "已完成" ? true : false; + } + ql.Remark = values.Value("Remark"); + BLL.WeekPlanService.UpdateWeekPlan(ql); + } + ShowNotify("保存成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + #region 增加按钮事件 + /// + /// 增加按钮事件 + /// + /// + /// + protected void btnNew_Click(object sender, EventArgs e) + { + var list = GetDetails(); + Model.JDGL_WeekPlan ql = new Model.JDGL_WeekPlan(); + ql.WeekPlanId = SQLHelper.GetNewID(); + list.Add(ql); + Model.SGGLDB db = Funs.DB; + Grid1.DataSource = from x in list + select new + { + x.WeekPlanId, + x.ProjectId, + x.WeekNo, + x.StartDate, + x.EndDate, + x.UnitWork, + x.Major, + x.UnitId, + x.WorkContent, + x.PlanDate, + x.DutyPerson, + IsOK = ConvertIsOK(x.IsOK), + x.Remark, + }; + Grid1.DataBind(); + } + private List GetDetails() + { + List list = new List(); + foreach (JObject mergedRow in Grid1.GetMergedData()) + { + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + Model.JDGL_WeekPlan ql = new Model.JDGL_WeekPlan(); + ql.WeekPlanId = Grid1.Rows[i].RowID; + ql.UnitWork = values.Value("UnitWork"); + ql.Major = values.Value("Major"); + ql.UnitId = values.Value("UnitId"); + ql.WorkContent = values.Value("WorkContent"); + ql.PlanDate = Funs.GetNewDateTime(values.Value("PlanDate")); + ql.DutyPerson = values.Value("DutyPerson"); + if (!string.IsNullOrEmpty(values.Value("IsOK"))) + { + ql.IsOK = values.Value("IsOK") == "已完成" ? true : false; + } + ql.Remark = values.Value("Remark"); + list.Add(ql); + } + return list; + } + #endregion + + #region 行点击事件 + /// + /// Grid行点击事件 + /// + /// + /// + protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) + { + string WeekPlanId = Grid1.DataKeys[e.RowIndex][0].ToString(); + var list = GetDetails(); + if (e.CommandName == "del")//删除 + { + var Report = list.FirstOrDefault(x => x.WeekPlanId == WeekPlanId); + if (Report != null) + { + list.Remove(Report); + } + Model.SGGLDB db = Funs.DB; + Grid1.DataSource = from x in list + select new + { + x.WeekPlanId, + x.ProjectId, + x.WeekNo, + x.StartDate, + x.EndDate, + x.UnitWork, + x.Major, + x.UnitId, + x.WorkContent, + x.PlanDate, + x.DutyPerson, + IsOK = ConvertIsOK(x.IsOK), + x.Remark, + }; + this.Grid1.DataBind(); + } + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanEdit.aspx.designer.cs new file mode 100644 index 00000000..084a4775 --- /dev/null +++ b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanEdit.aspx.designer.cs @@ -0,0 +1,267 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.JDGL.Check { + + + public partial class WeekPlanEdit { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel17 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel17; + + /// + /// Toolbar5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar5; + + /// + /// txtWeekNo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWeekNo; + + /// + /// txtStartDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartDate; + + /// + /// txtEndDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndDate; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// Form15 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form15; + + /// + /// TabStrip1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TabStrip TabStrip1; + + /// + /// Tab1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tab Tab1; + + /// + /// Grid2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid2; + + /// + /// Label2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label2; + + /// + /// DropDownList5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList DropDownList5; + + /// + /// TextBox2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox2; + + /// + /// Tab2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tab Tab2; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar3; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label1; + + /// + /// drpUnitWork 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnitWork; + + /// + /// drpMajor 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpMajor; + + /// + /// txtWorkContent 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWorkContent; + + /// + /// drpUnitId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnitId; + + /// + /// drpDutyPerson 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpDutyPerson; + + /// + /// txtPlanDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtPlanDate; + + /// + /// drpIsOK 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpIsOK; + + /// + /// txtRemark 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtRemark; + } +} diff --git a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanIn.aspx b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanIn.aspx index d13ca509..c31fd95e 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanIn.aspx +++ b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanIn.aspx @@ -86,7 +86,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml index 68f5e44c..b9a6ffda 100644 --- a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml +++ b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml @@ -69,7 +69,6 @@ - @@ -121,8 +120,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml index 4d3b9e97..d3859428 100644 --- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml +++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml @@ -13,8 +13,8 @@ - - + + diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index b38a96c2..ec7fc370 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -50833,7 +50833,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartName", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartName", DbType="NVarChar(200)")] public string DepartName { get @@ -50873,7 +50873,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartShortName", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartShortName", DbType="NVarChar(200)")] public string DepartShortName { get @@ -124950,8 +124950,6 @@ namespace Model private EntityRef _Base_Project; - private EntitySet _Driver_MeetingItem; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -124981,7 +124979,6 @@ namespace Model public Driver_Meeting() { this._Base_Project = default(EntityRef); - this._Driver_MeetingItem = new EntitySet(new Action(this.attach_Driver_MeetingItem), new Action(this.detach_Driver_MeetingItem)); OnCreated(); } @@ -125223,19 +125220,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Driver_MeetingItem_Driver_Meeting", Storage="_Driver_MeetingItem", ThisKey="MeetingId", OtherKey="MeetingId", DeleteRule="NO ACTION")] - public EntitySet Driver_MeetingItem - { - get - { - return this._Driver_MeetingItem; - } - set - { - this._Driver_MeetingItem.Assign(value); - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -125255,18 +125239,6 @@ namespace Model this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); } } - - private void attach_Driver_MeetingItem(Driver_MeetingItem entity) - { - this.SendPropertyChanging(); - entity.Driver_Meeting = this; - } - - private void detach_Driver_MeetingItem(Driver_MeetingItem entity) - { - this.SendPropertyChanging(); - entity.Driver_Meeting = null; - } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Driver_MeetingItem")] @@ -125285,8 +125257,6 @@ namespace Model private string _Feedback; - private EntityRef _Driver_Meeting; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -125305,7 +125275,6 @@ namespace Model public Driver_MeetingItem() { - this._Driver_Meeting = default(EntityRef); OnCreated(); } @@ -125340,10 +125309,6 @@ namespace Model { if ((this._MeetingId != value)) { - if (this._Driver_Meeting.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnMeetingIdChanging(value); this.SendPropertyChanging(); this._MeetingId = value; @@ -125413,40 +125378,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Driver_MeetingItem_Driver_Meeting", Storage="_Driver_Meeting", ThisKey="MeetingId", OtherKey="MeetingId", IsForeignKey=true)] - public Driver_Meeting Driver_Meeting - { - get - { - return this._Driver_Meeting.Entity; - } - set - { - Driver_Meeting previousValue = this._Driver_Meeting.Entity; - if (((previousValue != value) - || (this._Driver_Meeting.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Driver_Meeting.Entity = null; - previousValue.Driver_MeetingItem.Remove(this); - } - this._Driver_Meeting.Entity = value; - if ((value != null)) - { - value.Driver_MeetingItem.Add(this); - this._MeetingId = value.MeetingId; - } - else - { - this._MeetingId = default(string); - } - this.SendPropertyChanged("Driver_Meeting"); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -274540,8 +274471,6 @@ namespace Model private System.Nullable _ProblemType; - private string _SubInspectId; - private string _TermItemId; private string _WorkPackId; @@ -274554,18 +274483,20 @@ namespace Model private string _InspectUser; - private string _HandleUser; - private string _ApproveUser; - private System.Nullable _AdjustCompleteTime; - private System.Nullable _ApproveState; private string _AddUser; private System.Nullable _AddTime; + private string _SubInspectId; + + private string _HandleUser; + + private System.Nullable _AdjustCompleteTime; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -274582,8 +274513,6 @@ namespace Model partial void OnConstructionUnitChanged(); partial void OnProblemTypeChanging(System.Nullable value); partial void OnProblemTypeChanged(); - partial void OnSubInspectIdChanging(string value); - partial void OnSubInspectIdChanged(); partial void OnTermItemIdChanging(string value); partial void OnTermItemIdChanged(); partial void OnWorkPackIdChanging(string value); @@ -274596,18 +274525,20 @@ namespace Model partial void OnRectifyTimeChanged(); partial void OnInspectUserChanging(string value); partial void OnInspectUserChanged(); - partial void OnHandleUserChanging(string value); - partial void OnHandleUserChanged(); partial void OnApproveUserChanging(string value); partial void OnApproveUserChanged(); - partial void OnAdjustCompleteTimeChanging(System.Nullable value); - partial void OnAdjustCompleteTimeChanged(); partial void OnApproveStateChanging(System.Nullable value); partial void OnApproveStateChanged(); partial void OnAddUserChanging(string value); partial void OnAddUserChanged(); partial void OnAddTimeChanging(System.Nullable value); partial void OnAddTimeChanged(); + partial void OnSubInspectIdChanging(string value); + partial void OnSubInspectIdChanged(); + partial void OnHandleUserChanging(string value); + partial void OnHandleUserChanged(); + partial void OnAdjustCompleteTimeChanging(System.Nullable value); + partial void OnAdjustCompleteTimeChanged(); #endregion public PreRun_InspectTailTerm() @@ -274735,26 +274666,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="VarChar(50)")] - public string SubInspectId - { - get - { - return this._SubInspectId; - } - set - { - if ((this._SubInspectId != value)) - { - this.OnSubInspectIdChanging(value); - this.SendPropertyChanging(); - this._SubInspectId = value; - this.SendPropertyChanged("SubInspectId"); - this.OnSubInspectIdChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TermItemId", DbType="VarChar(50)")] public string TermItemId { @@ -274875,26 +274786,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")] - public string HandleUser - { - get - { - return this._HandleUser; - } - set - { - if ((this._HandleUser != value)) - { - this.OnHandleUserChanging(value); - this.SendPropertyChanging(); - this._HandleUser = value; - this.SendPropertyChanged("HandleUser"); - this.OnHandleUserChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveUser", DbType="VarChar(50)")] public string ApproveUser { @@ -274915,26 +274806,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")] - public System.Nullable AdjustCompleteTime - { - get - { - return this._AdjustCompleteTime; - } - set - { - if ((this._AdjustCompleteTime != value)) - { - this.OnAdjustCompleteTimeChanging(value); - this.SendPropertyChanging(); - this._AdjustCompleteTime = value; - this.SendPropertyChanged("AdjustCompleteTime"); - this.OnAdjustCompleteTimeChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] public System.Nullable ApproveState { @@ -274995,6 +274866,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="VarChar(50)")] + public string SubInspectId + { + get + { + return this._SubInspectId; + } + set + { + if ((this._SubInspectId != value)) + { + this.OnSubInspectIdChanging(value); + this.SendPropertyChanging(); + this._SubInspectId = value; + this.SendPropertyChanged("SubInspectId"); + this.OnSubInspectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")] + public string HandleUser + { + get + { + return this._HandleUser; + } + set + { + if ((this._HandleUser != value)) + { + this.OnHandleUserChanging(value); + this.SendPropertyChanging(); + this._HandleUser = value; + this.SendPropertyChanged("HandleUser"); + this.OnHandleUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")] + public System.Nullable AdjustCompleteTime + { + get + { + return this._AdjustCompleteTime; + } + set + { + if ((this._AdjustCompleteTime != value)) + { + this.OnAdjustCompleteTimeChanging(value); + this.SendPropertyChanging(); + this._AdjustCompleteTime = value; + this.SendPropertyChanged("AdjustCompleteTime"); + this.OnAdjustCompleteTimeChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -275036,14 +274967,14 @@ namespace Model private string _ApproveUser; - private System.Nullable _ApproveType; - private System.Nullable _ApproveState; private string _AddUser; private System.Nullable _AddTime; + private System.Nullable _ApproveType; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -275062,14 +274993,14 @@ namespace Model partial void OnApproveTimeChanged(); partial void OnApproveUserChanging(string value); partial void OnApproveUserChanged(); - partial void OnApproveTypeChanging(System.Nullable value); - partial void OnApproveTypeChanged(); partial void OnApproveStateChanging(System.Nullable value); partial void OnApproveStateChanged(); partial void OnAddUserChanging(string value); partial void OnAddUserChanged(); partial void OnAddTimeChanging(System.Nullable value); partial void OnAddTimeChanged(); + partial void OnApproveTypeChanging(System.Nullable value); + partial void OnApproveTypeChanged(); #endregion public PreRun_InspectTermApproveRecords() @@ -275217,26 +275148,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")] - public System.Nullable ApproveType - { - get - { - return this._ApproveType; - } - set - { - if ((this._ApproveType != value)) - { - this.OnApproveTypeChanging(value); - this.SendPropertyChanging(); - this._ApproveType = value; - this.SendPropertyChanged("ApproveType"); - this.OnApproveTypeChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] public System.Nullable ApproveState { @@ -275297,6 +275208,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")] + public System.Nullable ApproveType + { + get + { + return this._ApproveType; + } + set + { + if ((this._ApproveType != value)) + { + this.OnApproveTypeChanging(value); + this.SendPropertyChanging(); + this._ApproveType = value; + this.SendPropertyChanged("ApproveType"); + this.OnApproveTypeChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -276229,7 +276160,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string Remark { get @@ -276352,6 +276283,12 @@ namespace Model private string _InspectResult; + private System.Nullable _InspectTime; + + private string _AddUser; + + private System.Nullable _AddTime; + private string _Subcontractor; private string _Contractor; @@ -276360,6 +276297,10 @@ namespace Model private string _Owner; + private System.Nullable _WorkPackType; + + private string _PropertyTechnologyId; + private System.Nullable _InspectionIsAllPass; private System.Nullable _SubcontractorIsAllPass; @@ -276370,10 +276311,6 @@ namespace Model private System.Nullable _OwnerIsAllPass; - private System.Nullable _WorkPackType; - - private string _PropertyTechnologyId; - private System.Nullable _SubcontractorAllPassData; private System.Nullable _ContractorAllPassData; @@ -276406,12 +276343,6 @@ namespace Model private string _UnifyWanderAboutOpinion; - private System.Nullable _InspectTime; - - private string _AddUser; - - private System.Nullable _AddTime; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -276432,6 +276363,12 @@ namespace Model partial void OnWorkPackIdChanged(); partial void OnInspectResultChanging(string value); partial void OnInspectResultChanged(); + partial void OnInspectTimeChanging(System.Nullable value); + partial void OnInspectTimeChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); partial void OnSubcontractorChanging(string value); partial void OnSubcontractorChanged(); partial void OnContractorChanging(string value); @@ -276440,6 +276377,10 @@ namespace Model partial void OnSupervisionChanged(); partial void OnOwnerChanging(string value); partial void OnOwnerChanged(); + partial void OnWorkPackTypeChanging(System.Nullable value); + partial void OnWorkPackTypeChanged(); + partial void OnPropertyTechnologyIdChanging(string value); + partial void OnPropertyTechnologyIdChanged(); partial void OnInspectionIsAllPassChanging(System.Nullable value); partial void OnInspectionIsAllPassChanged(); partial void OnSubcontractorIsAllPassChanging(System.Nullable value); @@ -276450,10 +276391,6 @@ namespace Model partial void OnSupervisionIsAllPassChanged(); partial void OnOwnerIsAllPassChanging(System.Nullable value); partial void OnOwnerIsAllPassChanged(); - partial void OnWorkPackTypeChanging(System.Nullable value); - partial void OnWorkPackTypeChanged(); - partial void OnPropertyTechnologyIdChanging(string value); - partial void OnPropertyTechnologyIdChanged(); partial void OnSubcontractorAllPassDataChanging(System.Nullable value); partial void OnSubcontractorAllPassDataChanged(); partial void OnContractorAllPassDataChanging(System.Nullable value); @@ -276486,12 +276423,6 @@ namespace Model partial void OnUnifyWanderAboutDataChanged(); partial void OnUnifyWanderAboutOpinionChanging(string value); partial void OnUnifyWanderAboutOpinionChanged(); - partial void OnInspectTimeChanging(System.Nullable value); - partial void OnInspectTimeChanged(); - partial void OnAddUserChanging(string value); - partial void OnAddUserChanged(); - partial void OnAddTimeChanging(System.Nullable value); - partial void OnAddTimeChanged(); #endregion public PreRun_SubInspectTerm() @@ -276659,6 +276590,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")] + public System.Nullable InspectTime + { + get + { + return this._InspectTime; + } + set + { + if ((this._InspectTime != value)) + { + this.OnInspectTimeChanging(value); + this.SendPropertyChanging(); + this._InspectTime = value; + this.SendPropertyChanged("InspectTime"); + this.OnInspectTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] + public string AddUser + { + get + { + return this._AddUser; + } + set + { + if ((this._AddUser != value)) + { + this.OnAddUserChanging(value); + this.SendPropertyChanging(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] + public System.Nullable AddTime + { + get + { + return this._AddTime; + } + set + { + if ((this._AddTime != value)) + { + this.OnAddTimeChanging(value); + this.SendPropertyChanging(); + this._AddTime = value; + this.SendPropertyChanged("AddTime"); + this.OnAddTimeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Subcontractor", DbType="VarChar(50)")] public string Subcontractor { @@ -276739,6 +276730,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] + public System.Nullable WorkPackType + { + get + { + return this._WorkPackType; + } + set + { + if ((this._WorkPackType != value)) + { + this.OnWorkPackTypeChanging(value); + this.SendPropertyChanging(); + this._WorkPackType = value; + this.SendPropertyChanged("WorkPackType"); + this.OnWorkPackTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string PropertyTechnologyId + { + get + { + return this._PropertyTechnologyId; + } + set + { + if ((this._PropertyTechnologyId != value)) + { + this.OnPropertyTechnologyIdChanging(value); + this.SendPropertyChanging(); + this._PropertyTechnologyId = value; + this.SendPropertyChanged("PropertyTechnologyId"); + this.OnPropertyTechnologyIdChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionIsAllPass", DbType="Int")] public System.Nullable InspectionIsAllPass { @@ -276839,46 +276870,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] - public System.Nullable WorkPackType - { - get - { - return this._WorkPackType; - } - set - { - if ((this._WorkPackType != value)) - { - this.OnWorkPackTypeChanging(value); - this.SendPropertyChanging(); - this._WorkPackType = value; - this.SendPropertyChanged("WorkPackType"); - this.OnWorkPackTypeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] - public string PropertyTechnologyId - { - get - { - return this._PropertyTechnologyId; - } - set - { - if ((this._PropertyTechnologyId != value)) - { - this.OnPropertyTechnologyIdChanging(value); - this.SendPropertyChanging(); - this._PropertyTechnologyId = value; - this.SendPropertyChanged("PropertyTechnologyId"); - this.OnPropertyTechnologyIdChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorAllPassData", DbType="DateTime")] public System.Nullable SubcontractorAllPassData { @@ -277199,66 +277190,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")] - public System.Nullable InspectTime - { - get - { - return this._InspectTime; - } - set - { - if ((this._InspectTime != value)) - { - this.OnInspectTimeChanging(value); - this.SendPropertyChanging(); - this._InspectTime = value; - this.SendPropertyChanged("InspectTime"); - this.OnInspectTimeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] - public string AddUser - { - get - { - return this._AddUser; - } - set - { - if ((this._AddUser != value)) - { - this.OnAddUserChanging(value); - this.SendPropertyChanging(); - this._AddUser = value; - this.SendPropertyChanged("AddUser"); - this.OnAddUserChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] - public System.Nullable AddTime - { - get - { - return this._AddTime; - } - set - { - if ((this._AddTime != value)) - { - this.OnAddTimeChanging(value); - this.SendPropertyChanging(); - this._AddTime = value; - this.SendPropertyChanged("AddTime"); - this.OnAddTimeChanged(); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -277322,6 +277253,18 @@ namespace Model private string _Owner; + private System.Nullable _WorkPackType; + + private string _PropertyTechnologyId; + + private string _Remark; + + private string _AddUser; + + private System.Nullable _AddTime; + + private System.Nullable _Sort; + private System.Nullable _SubcontractorIsPass; private System.Nullable _ContractorIsPass; @@ -277338,18 +277281,6 @@ namespace Model private string _OwnerRemark; - private System.Nullable _WorkPackType; - - private string _PropertyTechnologyId; - - private string _Remark; - - private string _AddUser; - - private System.Nullable _AddTime; - - private System.Nullable _Sort; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -277390,6 +277321,18 @@ namespace Model partial void OnSupervisionChanged(); partial void OnOwnerChanging(string value); partial void OnOwnerChanged(); + partial void OnWorkPackTypeChanging(System.Nullable value); + partial void OnWorkPackTypeChanged(); + partial void OnPropertyTechnologyIdChanging(string value); + partial void OnPropertyTechnologyIdChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); + partial void OnSortChanging(System.Nullable value); + partial void OnSortChanged(); partial void OnSubcontractorIsPassChanging(System.Nullable value); partial void OnSubcontractorIsPassChanged(); partial void OnContractorIsPassChanging(System.Nullable value); @@ -277406,18 +277349,6 @@ namespace Model partial void OnSupervisionRemarkChanged(); partial void OnOwnerRemarkChanging(string value); partial void OnOwnerRemarkChanged(); - partial void OnWorkPackTypeChanging(System.Nullable value); - partial void OnWorkPackTypeChanged(); - partial void OnPropertyTechnologyIdChanging(string value); - partial void OnPropertyTechnologyIdChanged(); - partial void OnRemarkChanging(string value); - partial void OnRemarkChanged(); - partial void OnAddUserChanging(string value); - partial void OnAddUserChanged(); - partial void OnAddTimeChanging(System.Nullable value); - partial void OnAddTimeChanged(); - partial void OnSortChanging(System.Nullable value); - partial void OnSortChanged(); #endregion public PreRun_SubInspectTermItem() @@ -277785,6 +277716,126 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] + public System.Nullable WorkPackType + { + get + { + return this._WorkPackType; + } + set + { + if ((this._WorkPackType != value)) + { + this.OnWorkPackTypeChanging(value); + this.SendPropertyChanging(); + this._WorkPackType = value; + this.SendPropertyChanged("WorkPackType"); + this.OnWorkPackTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string PropertyTechnologyId + { + get + { + return this._PropertyTechnologyId; + } + set + { + if ((this._PropertyTechnologyId != value)) + { + this.OnPropertyTechnologyIdChanging(value); + this.SendPropertyChanging(); + this._PropertyTechnologyId = value; + this.SendPropertyChanged("PropertyTechnologyId"); + this.OnPropertyTechnologyIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(200)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] + public string AddUser + { + get + { + return this._AddUser; + } + set + { + if ((this._AddUser != value)) + { + this.OnAddUserChanging(value); + this.SendPropertyChanging(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] + public System.Nullable AddTime + { + get + { + return this._AddTime; + } + set + { + if ((this._AddTime != value)) + { + this.OnAddTimeChanging(value); + this.SendPropertyChanging(); + this._AddTime = value; + this.SendPropertyChanged("AddTime"); + this.OnAddTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort", DbType="Int")] + public System.Nullable Sort + { + get + { + return this._Sort; + } + set + { + if ((this._Sort != value)) + { + this.OnSortChanging(value); + this.SendPropertyChanging(); + this._Sort = value; + this.SendPropertyChanged("Sort"); + this.OnSortChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorIsPass", DbType="Int")] public System.Nullable SubcontractorIsPass { @@ -277945,126 +277996,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] - public System.Nullable WorkPackType - { - get - { - return this._WorkPackType; - } - set - { - if ((this._WorkPackType != value)) - { - this.OnWorkPackTypeChanging(value); - this.SendPropertyChanging(); - this._WorkPackType = value; - this.SendPropertyChanged("WorkPackType"); - this.OnWorkPackTypeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] - public string PropertyTechnologyId - { - get - { - return this._PropertyTechnologyId; - } - set - { - if ((this._PropertyTechnologyId != value)) - { - this.OnPropertyTechnologyIdChanging(value); - this.SendPropertyChanging(); - this._PropertyTechnologyId = value; - this.SendPropertyChanged("PropertyTechnologyId"); - this.OnPropertyTechnologyIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(200)")] - public string Remark - { - get - { - return this._Remark; - } - set - { - if ((this._Remark != value)) - { - this.OnRemarkChanging(value); - this.SendPropertyChanging(); - this._Remark = value; - this.SendPropertyChanged("Remark"); - this.OnRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] - public string AddUser - { - get - { - return this._AddUser; - } - set - { - if ((this._AddUser != value)) - { - this.OnAddUserChanging(value); - this.SendPropertyChanging(); - this._AddUser = value; - this.SendPropertyChanged("AddUser"); - this.OnAddUserChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] - public System.Nullable AddTime - { - get - { - return this._AddTime; - } - set - { - if ((this._AddTime != value)) - { - this.OnAddTimeChanging(value); - this.SendPropertyChanging(); - this._AddTime = value; - this.SendPropertyChanged("AddTime"); - this.OnAddTimeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort", DbType="Int")] - public System.Nullable Sort - { - get - { - return this._Sort; - } - set - { - if ((this._Sort != value)) - { - this.OnSortChanging(value); - this.SendPropertyChanging(); - this._Sort = value; - this.SendPropertyChanged("Sort"); - this.OnSortChanged(); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -279066,8 +278997,6 @@ namespace Model private string _RestrictCondition; - private System.Nullable _ResponsibilityProposeSatate; - private System.Nullable _ResponsibilityConfirm; private System.Nullable _ProposeConfirm; @@ -279078,11 +279007,9 @@ namespace Model private System.Nullable _OwnerConfirm; - private System.Nullable _ProposeConfirmData; - private System.Nullable _ResponsibilityConfirmData; - private System.Nullable _ProposeHandleData; + private System.Nullable _ProposeConfirmData; private System.Nullable _GeneraConfirmData; @@ -279098,6 +279025,10 @@ namespace Model private System.Nullable _Sort; + private System.Nullable _ResponsibilityProposeSatate; + + private System.Nullable _ProposeHandleData; + private string _FourDecisionCode; #region 可扩展性方法定义 @@ -279134,8 +279065,6 @@ namespace Model partial void OnRealityDestructionTimeChanged(); partial void OnRestrictConditionChanging(string value); partial void OnRestrictConditionChanged(); - partial void OnResponsibilityProposeSatateChanging(System.Nullable value); - partial void OnResponsibilityProposeSatateChanged(); partial void OnResponsibilityConfirmChanging(System.Nullable value); partial void OnResponsibilityConfirmChanged(); partial void OnProposeConfirmChanging(System.Nullable value); @@ -279146,12 +279075,10 @@ namespace Model partial void OnSupervisionConfirmChanged(); partial void OnOwnerConfirmChanging(System.Nullable value); partial void OnOwnerConfirmChanged(); - partial void OnProposeConfirmDataChanging(System.Nullable value); - partial void OnProposeConfirmDataChanged(); partial void OnResponsibilityConfirmDataChanging(System.Nullable value); partial void OnResponsibilityConfirmDataChanged(); - partial void OnProposeHandleDataChanging(System.Nullable value); - partial void OnProposeHandleDataChanged(); + partial void OnProposeConfirmDataChanging(System.Nullable value); + partial void OnProposeConfirmDataChanged(); partial void OnGeneraConfirmDataChanging(System.Nullable value); partial void OnGeneraConfirmDataChanged(); partial void OnSupervisionConfirmDataChanging(System.Nullable value); @@ -279166,6 +279093,10 @@ namespace Model partial void OnAddTimeChanged(); partial void OnSortChanging(System.Nullable value); partial void OnSortChanged(); + partial void OnResponsibilityProposeSatateChanging(System.Nullable value); + partial void OnResponsibilityProposeSatateChanged(); + partial void OnProposeHandleDataChanging(System.Nullable value); + partial void OnProposeHandleDataChanged(); partial void OnFourDecisionCodeChanging(string value); partial void OnFourDecisionCodeChanged(); #endregion @@ -279475,26 +279406,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")] - public System.Nullable ResponsibilityProposeSatate - { - get - { - return this._ResponsibilityProposeSatate; - } - set - { - if ((this._ResponsibilityProposeSatate != value)) - { - this.OnResponsibilityProposeSatateChanging(value); - this.SendPropertyChanging(); - this._ResponsibilityProposeSatate = value; - this.SendPropertyChanged("ResponsibilityProposeSatate"); - this.OnResponsibilityProposeSatateChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirm", DbType="Int")] public System.Nullable ResponsibilityConfirm { @@ -279595,26 +279506,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")] - public System.Nullable ProposeConfirmData - { - get - { - return this._ProposeConfirmData; - } - set - { - if ((this._ProposeConfirmData != value)) - { - this.OnProposeConfirmDataChanging(value); - this.SendPropertyChanging(); - this._ProposeConfirmData = value; - this.SendPropertyChanged("ProposeConfirmData"); - this.OnProposeConfirmDataChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirmData", DbType="DateTime")] public System.Nullable ResponsibilityConfirmData { @@ -279635,22 +279526,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")] - public System.Nullable ProposeHandleData + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")] + public System.Nullable ProposeConfirmData { get { - return this._ProposeHandleData; + return this._ProposeConfirmData; } set { - if ((this._ProposeHandleData != value)) + if ((this._ProposeConfirmData != value)) { - this.OnProposeHandleDataChanging(value); + this.OnProposeConfirmDataChanging(value); this.SendPropertyChanging(); - this._ProposeHandleData = value; - this.SendPropertyChanged("ProposeHandleData"); - this.OnProposeHandleDataChanged(); + this._ProposeConfirmData = value; + this.SendPropertyChanged("ProposeConfirmData"); + this.OnProposeConfirmDataChanged(); } } } @@ -279795,6 +279686,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")] + public System.Nullable ResponsibilityProposeSatate + { + get + { + return this._ResponsibilityProposeSatate; + } + set + { + if ((this._ResponsibilityProposeSatate != value)) + { + this.OnResponsibilityProposeSatateChanging(value); + this.SendPropertyChanging(); + this._ResponsibilityProposeSatate = value; + this.SendPropertyChanged("ResponsibilityProposeSatate"); + this.OnResponsibilityProposeSatateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")] + public System.Nullable ProposeHandleData + { + get + { + return this._ProposeHandleData; + } + set + { + if ((this._ProposeHandleData != value)) + { + this.OnProposeHandleDataChanging(value); + this.SendPropertyChanging(); + this._ProposeHandleData = value; + this.SendPropertyChanged("ProposeHandleData"); + this.OnProposeHandleDataChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FourDecisionCode", DbType="VarChar(20)")] public string FourDecisionCode { @@ -280507,7 +280438,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string Remark { get diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index bd497c6b..5fe155da 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true