lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

This commit is contained in:
高飞 2024-05-15 09:03:19 +08:00
parent 9d070167c9
commit 4bf0e3ed0a
18 changed files with 1524 additions and 651 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
SGGL/BLL/ProjectData/UnitWorkService.cs
View File

@ -290,6 +290,16 @@ namespace BLL
}
return item;
}
public static ListItem[] GetUnitWork2(string projectId)
{
List<Model.WBS_UnitWork> 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;
}
/// <summary>
/// 获取单位名称
/// </summary>
@ -355,6 +365,23 @@ namespace BLL
Funs.FineUIPleaseSelect(dropName);
}
}
/// <summary>
/// 单位工程表下拉框
/// </summary>
/// <param name="dropName">下拉框名字</param>
/// <param name="isShowPlease">是否显示请选择</param>
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);
}
}
/// <summary>
/// 根据项目id 获取单位工程
/// </summary>

288
SGGL/BLL/WebService/MCSWebService.cs
View File

@ -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);
}
}

8
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -1404,6 +1404,7 @@
<Content Include="JDGL\Check\UndergroundPipeCompletionEdit.aspx" />
<Content Include="JDGL\Check\UndergroundPipeCompletionIn.aspx" />
<Content Include="JDGL\Check\WeekPlan.aspx" />
<Content Include="JDGL\Check\WeekPlanEdit.aspx" />
<Content Include="JDGL\Check\WeekPlanIn.aspx" />
<Content Include="JDGL\CostAnalysis\EarnedValueCurve.aspx" />
<Content Include="JDGL\CostAnalysis\JDReport.aspx" />
@ -13931,6 +13932,13 @@
<Compile Include="JDGL\Check\WeekPlan.aspx.designer.cs">
<DependentUpon>WeekPlan.aspx</DependentUpon>
</Compile>
<Compile Include="JDGL\Check\WeekPlanEdit.aspx.cs">
<DependentUpon>WeekPlanEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="JDGL\Check\WeekPlanEdit.aspx.designer.cs">
<DependentUpon>WeekPlanEdit.aspx</DependentUpon>
</Compile>
<Compile Include="JDGL\Check\WeekPlanIn.aspx.cs">
<DependentUpon>WeekPlanIn.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress>false</Use64BitIISExpress>
<IISExpressSSLPort />

1
SGGL/FineUIPro.Web/JDGL/Check/MonthPlanEdit.aspx.cs
View File

@ -83,6 +83,7 @@ namespace FineUIPro.Web.JDGL.Check
if (string.IsNullOrEmpty(this.txtMonth.Text))
{
ShowNotify("请选择月份！", MessageBoxIcon.Warning);
return;
}
SaveData(true);
}

9
SGGL/FineUIPro.Web/JDGL/Check/MonthPlanEdit.aspx.designer.cs generated
View File

@ -111,6 +111,15 @@ namespace FineUIPro.Web.JDGL.Check {
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// DropDownList1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList1;
/// <summary>
/// drpUnitId 控件。
/// </summary>

12
SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx
View File

@ -23,9 +23,13 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DatePicker runat="server" ID="txtWeeks" DateFormatString="yyyy-MM" AutoPostBack="true"
Label="月份" LabelWidth="50px" Width="150px" OnTextChanged="txtWeeks_TextChanged">
</f:DatePicker>
<f:DropDownList runat="server" ID="drpWeekNo" Label="周号" LabelAlign="Right" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="drpWeekNo_SelectedIndexChanged"></f:DropDownList>
<f:DatePicker ID="txtStartDate" runat="server" Readonly="true" Label="开始日期" LabelAlign="Right"
>
</f:DatePicker>
<f:DatePicker ID="txtEndDate" runat="server" Readonly="true" Label="结束日期" LabelAlign="Right"
>
</f:DatePicker>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" Hidden="true"
OnClick="btnSave_Click">
</f:Button>
@ -91,7 +95,7 @@
</f:Panel>
<f:Window ID="Window1" Title="录入" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="false"
CloseAction="HidePostBack" Width="1200px" Height="700px">
CloseAction="HidePostBack" Width="1400px" Height="700px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<Items>

86
SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx.cs
View File

@ -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, "编辑 - ")));
}
/// <summary>
@ -60,6 +78,23 @@ namespace FineUIPro.Web.JDGL.Check
/// </summary>
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<SqlParameter> listStr = new List<SqlParameter>();
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";
/// <param name="e"></param>
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();
}
}
}

22
SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx.designer.cs generated
View File

@ -58,13 +58,31 @@ namespace FineUIPro.Web.JDGL.Check {
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// txtWeeks 控件。
/// drpWeekNo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtWeeks;
protected global::FineUIPro.DropDownList drpWeekNo;
/// <summary>
/// txtStartDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStartDate;
/// <summary>
/// txtEndDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndDate;
/// <summary>
/// btnSave 控件。

190
SGGL/FineUIPro.Web/JDGL/Check/WeekPlanEdit.aspx Normal file
View File

@ -0,0 +1,190 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeekPlanEdit.aspx.cs" Inherits="FineUIPro.Web.JDGL.Check.WeekPlanEdit" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title></title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" />
<f:Panel ID="Panel17" IsFluid="true" Title="周进度计划" runat="server" EnableCollapse="false"
ShowHeader="true">
<Toolbars>
<f:Toolbar ID="Toolbar5" Position="top" ToolbarAlign="Right" runat="server" CssClass="Toolbar2">
<Items>
<f:TextBox runat="server" ID="txtWeekNo" ShowRedStar="true" Required="true" Label="周号" LabelAlign="Right"></f:TextBox>
<f:DatePicker ID="txtStartDate" ShowRedStar="true" Required="true" runat="server" Label="开始日期" LabelAlign="Right">
</f:DatePicker>
<f:DatePicker ID="txtEndDate" runat="server" ShowRedStar="true" Required="true" Label="结束日期" LabelAlign="Right">
</f:DatePicker>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" OnClick="btnSave_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Form ID="Form15" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="周进度计划">
<Rows>
<f:FormRow>
<Items>
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="520px" ShowBorder="true"
TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
<Tabs>
<f:Tab ID="Tab1" Title="本周计划完成情况" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server"
TitleToolTip="本周计划完成情况">
<Items>
<f:Grid ID="Grid2" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="false"
DataKeyNames="WeekPlanId" DataIDField="WeekPlanId" EnableColumnLines="true" ForceFit="true" AllowCellEditing="true" ClicksToEdit="1">
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="100px" ColumnID="UnitWork" DataField="UnitWork"
FieldType="String" HeaderText="工序/单位工程" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="Major" DataField="Major"
FieldType="String" HeaderText="专业" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="WorkContent" DataField="WorkContent"
FieldType="String" HeaderText="工作项" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="UnitId" DataField="UnitId"
FieldType="String" HeaderText="责任单位" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DutyPerson" DataField="DutyPerson"
FieldType="String" HeaderText="五环责任人" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="95px" ColumnID="PlanDate" DataField="PlanDate" Renderer="Date" RendererArgument="yyyy-MM-dd"
FieldType="Date" HeaderText="计划完成时间" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="IsOK" DataField="IsOK"
FieldType="String" HeaderText="完成状态" TextAlign="Center"
HeaderTextAlign="Center">
<Editor>
<f:DropDownList runat="server" ID="DropDownList5" EnableEdit="true">
<f:ListItem Text="已完成" Value="已完成" />
<f:ListItem Text="未完成" Value="未完成" />
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="Remark" DataField="Remark"
FieldType="String" HeaderText="备注" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox2" runat="server" Text='<%# Bind("Remark") %>'>
</f:TextBox>
</Editor>
</f:RenderField>
</Columns>
</f:Grid>
</Items>
</f:Tab>
<f:Tab ID="Tab2" Title="下周计划" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" TitleToolTip="下周计划"
runat="server">
<Items>
<f:Grid ID="Grid1" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="false" OnRowCommand="Grid1_RowCommand"
DataKeyNames="WeekPlanId" DataIDField="WeekPlanId" EnableColumnLines="true" ForceFit="true" AllowCellEditing="true" ClicksToEdit="1">
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:Button ID="btnNew" ToolTip="新增" Text="" Icon="Add" EnablePostBack="true"
runat="server" OnClick="btnNew_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="100px" ColumnID="UnitWork" DataField="UnitWork"
FieldType="String" HeaderText="工序/单位工程" TextAlign="Center"
HeaderTextAlign="Center">
<Editor>
<f:DropDownList runat="server" ID="drpUnitWork" EnableEdit="true"></f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField Width="80px" ColumnID="Major" DataField="Major"
FieldType="String" HeaderText="专业" TextAlign="Center"
HeaderTextAlign="Center">
<Editor>
<f:DropDownList runat="server" ID="drpMajor" EnableEdit="true"></f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField Width="250px" ColumnID="WorkContent" DataField="WorkContent"
FieldType="String" HeaderText="工作项" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="txtWorkContent" runat="server" Text='<%# Bind("WorkContent") %>'>
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="UnitId" DataField="UnitId"
FieldType="String" HeaderText="责任单位" TextAlign="Center"
HeaderTextAlign="Center">
<Editor>
<f:DropDownList runat="server" ID="drpUnitId" EnableEdit="true"></f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DutyPerson" DataField="DutyPerson"
FieldType="String" HeaderText="五环责任人" TextAlign="Center"
HeaderTextAlign="Center">
<Editor>
<f:DropDownList runat="server" ID="drpDutyPerson" EnableEdit="true"></f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField Width="95px" ColumnID="PlanDate" DataField="PlanDate" Renderer="Date" RendererArgument="yyyy-MM-dd"
FieldType="Date" HeaderText="计划完成时间" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:DatePicker ID="txtPlanDate" runat="server" ShowRedStar="true" Required="true"
EnableEdit="true" DateFormatString="yyyy-MM-dd">
</f:DatePicker>
</Editor>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="IsOK" DataField="IsOK"
FieldType="String" HeaderText="完成状态" TextAlign="Center"
HeaderTextAlign="Center">
<Editor>
<f:DropDownList runat="server" ID="drpIsOK" EnableEdit="true">
<f:ListItem Text="已完成" Value="已完成" />
<f:ListItem Text="未完成" Value="未完成" />
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="Remark" DataField="Remark"
FieldType="String" HeaderText="备注" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="txtRemark" runat="server" Text='<%# Bind("Remark") %>'>
</f:TextBox>
</Editor>
</f:RenderField>
<f:LinkButtonField Width="40px" TextAlign="Center" HeaderText="删除" ToolTip="删除" CommandName="del"
Icon="Delete" />
</Columns>
</f:Grid>
</Items>
</f:Tab>
</Tabs>
</f:TabStrip>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:Panel>
</form>
</body>
</html>

334
SGGL/FineUIPro.Web/JDGL/Check/WeekPlanEdit.aspx.cs Normal file
View File

@ -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
{
/// <summary>
/// 项目id
/// </summary>
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();
}
}
/// <summary>
/// 加载Grid
/// </summary>
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 月份选择事件
/// <summary>
/// 月份选择事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
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<JObject>("values");
int a= mergedRow.Value<int>("index");
Model.JDGL_WeekPlan ql = BLL.WeekPlanService.GetWeekPlanById(Grid2.Rows[a].RowID);
if (!string.IsNullOrEmpty(values.Value<string>("IsOK")))
{
ql.IsOK = values.Value<string>("IsOK") == "已完成" ? true : false;
}
ql.Remark = values.Value<string>("Remark");
BLL.WeekPlanService.UpdateWeekPlan(ql);
}
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
#region 增加按钮事件
/// <summary>
/// 增加按钮事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
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<Model.JDGL_WeekPlan> GetDetails()
{
List<Model.JDGL_WeekPlan> list = new List<Model.JDGL_WeekPlan>();
foreach (JObject mergedRow in Grid1.GetMergedData())
{
JObject values = mergedRow.Value<JObject>("values");
int i = mergedRow.Value<int>("index");
Model.JDGL_WeekPlan ql = new Model.JDGL_WeekPlan();
ql.WeekPlanId = Grid1.Rows[i].RowID;
ql.UnitWork = values.Value<string>("UnitWork");
ql.Major = values.Value<string>("Major");
ql.UnitId = values.Value<string>("UnitId");
ql.WorkContent = values.Value<string>("WorkContent");
ql.PlanDate = Funs.GetNewDateTime(values.Value<string>("PlanDate"));
ql.DutyPerson = values.Value<string>("DutyPerson");
if (!string.IsNullOrEmpty(values.Value<string>("IsOK")))
{
ql.IsOK = values.Value<string>("IsOK") == "已完成" ? true : false;
}
ql.Remark = values.Value<string>("Remark");
list.Add(ql);
}
return list;
}
#endregion
#region 行点击事件
/// <summary>
/// Grid行点击事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
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
}
}

267
SGGL/FineUIPro.Web/JDGL/Check/WeekPlanEdit.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,267 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.JDGL.Check {
public partial class WeekPlanEdit {
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel17 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel17;
/// <summary>
/// Toolbar5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar5;
/// <summary>
/// txtWeekNo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWeekNo;
/// <summary>
/// txtStartDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStartDate;
/// <summary>
/// txtEndDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndDate;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// Form15 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form15;
/// <summary>
/// TabStrip1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TabStrip TabStrip1;
/// <summary>
/// Tab1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tab Tab1;
/// <summary>
/// Grid2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid2;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// DropDownList5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList5;
/// <summary>
/// TextBox2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox TextBox2;
/// <summary>
/// Tab2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tab Tab2;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// btnNew 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// drpUnitWork 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitWork;
/// <summary>
/// drpMajor 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpMajor;
/// <summary>
/// txtWorkContent 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWorkContent;
/// <summary>
/// drpUnitId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitId;
/// <summary>
/// drpDutyPerson 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpDutyPerson;
/// <summary>
/// txtPlanDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtPlanDate;
/// <summary>
/// drpIsOK 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpIsOK;
/// <summary>
/// txtRemark 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtRemark;
}
}

2
SGGL/FineUIPro.Web/JDGL/Check/WeekPlanIn.aspx
View File

@ -86,7 +86,7 @@
<asp:Label ID="Label1" runat="server" Text='<%# ConvertDutyPersonName(Eval("DutyPerson")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="95px" ColumnID="PlanDate" DataField="PlanDate" SortField="PlanDate"
<f:RenderField Width="95px" ColumnID="PlanDate" DataField="PlanDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="计划完成时间" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="IsOK" Width="100px" HeaderText="完成状态" HeaderTextAlign="Center"

2
SGGL/FineUIPro.Web/Web.config
View File

@ -77,7 +77,7 @@
<add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
</httpHandlers>
<compilation debug="false" targetFramework="4.6.1"/>
<compilation debug="true" targetFramework="4.6.1"/>
<httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
<authentication mode="Forms">
<forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>

4
SGGL/FineUIPro.Web/common/Menu_TestRun.xml
View File

@ -69,7 +69,6 @@
<TreeNode id="0217CE50-3ABB-44F8-A38A-C9792C436639" Text="试车管理" NavigateUrl=""><TreeNode id="E3E38073-1DF4-4C02-AFC0-5C93EE7C23A8" Text="系统划分" NavigateUrl="TestRun/TestRunManage/DeviceRun.aspx"></TreeNode>
<TreeNode id="4B964B32-D5CC-48A2-8750-48BC4460C264" Text="工作包设置" NavigateUrl="TestRun/TestRunManage/SetWorkPackage.aspx"></TreeNode>
<TreeNode id="B6EE8E3B-77E2-416E-8985-3C78A2169B89" Text="工作包裁剪" NavigateUrl="TestRun/TestRunManage/SubSysWorkPackage.aspx"></TreeNode>
<TreeNode id="AF2B0CAD-DE15-4F15-A5EE-C8FB558D00C8" Text="检查项分组信息" NavigateUrl="TestRun/TestRunManage/TemplateItemGroup.aspx"></TreeNode>
<TreeNode id="545AACE6-34BE-4BAA-A495-B73198F1BDE2" Text="检查表模板" NavigateUrl="TestRun/TestRunManage/InspectTemplate.aspx"></TreeNode>
<TreeNode id="086DBD12-5649-4330-807A-44ABB257495F" Text="联动试车管理" NavigateUrl="TestRun/TestRunManage/SubInspectTerm.aspx"></TreeNode>
<TreeNode id="4041089F-5CC2-4070-9556-7DAB83CF6292" Text="检查表尾项管理" NavigateUrl="TestRun/TestRunManage/InspectTailTermList.aspx"></TreeNode>
@ -121,8 +120,7 @@
<TreeNode id="EC4B11B4-AF9B-44E9-8CD4-364A5633CB76" Text="性能考核报告" NavigateUrl="TestRun/DriverReport/PropertyReport.aspx"></TreeNode>
<TreeNode id="0D5C3347-0484-4455-AD32-D558BCFF0D0B" Text="开车完工报告" NavigateUrl="TestRun/DriverReport/DriverRunComplete.aspx"></TreeNode>
</TreeNode>
<TreeNode id="ECDC614F-6239-44D2-9523-6A25D42C6A45" Text="项目开车总结" NavigateUrl=""><TreeNode id="9B32C4BF-62E9-4561-8632-97AC0F581701" Text="月技术总结" NavigateUrl="TestRun/DriverSummary/MonthSummary.aspx"></TreeNode>
<TreeNode id="D215165B-95BA-4298-9736-B7A20F27B5D1" Text="专项总结" NavigateUrl="TestRun/DriverSummary/SpecialSummary.aspx"></TreeNode>
<TreeNode id="ECDC614F-6239-44D2-9523-6A25D42C6A45" Text="项目开车总结" NavigateUrl=""><TreeNode id="D215165B-95BA-4298-9736-B7A20F27B5D1" Text="专项总结" NavigateUrl="TestRun/DriverSummary/SpecialSummary.aspx"></TreeNode>
<TreeNode id="9EBA628D-E725-4A0B-B765-171F405D0821" Text="完工后个人总结" NavigateUrl="TestRun/DriverSummary/PersonalSummary.aspx"></TreeNode>
<TreeNode id="AA88BD56-E0B4-4B9C-9238-3F48EA59C50A" Text="开车完工报告" NavigateUrl="TestRun/DriverSummary/CompleteSummary.aspx"></TreeNode>
</TreeNode>

4
SGGL/FineUIPro.Web/common/Menu_Transfer.xml
View File

@ -13,8 +13,8 @@
<TreeNode id="95295BF7-FB51-480D-9902-6ADA4E8427FC" Text="Plumbing" NavigateUrl="Transfer/Plumbing.aspx"></TreeNode>
<TreeNode id="05442049-1310-45B1-9D3D-CAAE759D8F3E" Text="HVAC" NavigateUrl="Transfer/HVAC.aspx"></TreeNode>
<TreeNode id="016903B1-3B86-4CF5-AFF8-FF8BE389BEE5" Text="Punchlist from" NavigateUrl="Transfer/PunchlistFrom.aspx"></TreeNode>
<TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="移交图表" NavigateUrl=""><TreeNode id="E6F5125D-DD94-4978-B7EB-D9C26694D86D" Text="全厂移交统计表" NavigateUrl="Transfer/Chart/Instrumentation.aspx"></TreeNode>
<TreeNode id="F97BCF55-E450-4007-AD84-AB64B3496204" Text="全厂移交统计递增表" NavigateUrl="Transfer/Chart/TransferChart.aspx"></TreeNode>
<TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="移交图表" NavigateUrl=""><TreeNode id="E6F5125D-DD94-4978-B7EB-D9C26694D86D" Text="全厂移交统计报表" NavigateUrl="Transfer/Chart/Instrumentation.aspx"></TreeNode>
<TreeNode id="F97BCF55-E450-4007-AD84-AB64B3496204" Text="全厂移交累积统计报表" NavigateUrl="Transfer/Chart/TransferChart.aspx"></TreeNode>
<TreeNode id="C2DD3E9E-DB18-466F-8FA0-19AD6E21EEF0" Text="Punchlist from" NavigateUrl="Transfer/Chart/PunchlistFrom.aspx"></TreeNode>
<TreeNode id="BB5EC5E1-A23D-4A3F-8772-CD40757974EC" Text="Punchlist from统计递增表" NavigateUrl="Transfer/Chart/PunchlistFromChart.aspx"></TreeNode>
</TreeNode>

915
SGGL/Model/Model.cs
View File

File diff suppressed because it is too large Load Diff

2
SGGL/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />