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

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

This commit is contained in:
高飞 2024-07-26 14:44:26 +08:00
parent 2a942f5f47 2c1cd6b767
commit a2d254b869
17 changed files with 597 additions and 309 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
DataBase/版本日志/SGGLDB_WH_V2024-07-26-phf.sql Normal file
View File

@ -0,0 +1,26 @@
ALTER TABLE Transfer_Firefighting ADD Installation nvarchar(50) NULL
GO
ALTER TABLE Transfer_Firefighting ADD Debugging nvarchar(50) NULL
GO
ALTER TABLE Transfer_Firefighting ADD Acceptancecheck nvarchar(50) NULL
GO
ALTER TABLE Transfer_Telecom ADD Installation nvarchar(50) NULL
GO
ALTER TABLE Transfer_Telecom ADD Communication nvarchar(50) NULL
GO
ALTER TABLE Transfer_Telecom ADD CableLaying nvarchar(50) NULL
GO
ALTER TABLE Transfer_Telecom ADD FunctionTest nvarchar(50) NULL
GO
ALTER TABLE Transfer_Plumbing ADD Ndt nvarchar(50) NULL
GO
ALTER TABLE Transfer_Plumbing ADD Flushing nvarchar(50) NULL
GO
ALTER TABLE Transfer_Plumbing ADD RunningTest nvarchar(50) NULL
GO

BIN
SGGL/FineUIPro.Web/File/Excel/DataIn/Firefighting导入模板.xls
View File

Binary file not shown.

BIN
SGGL/FineUIPro.Web/File/Excel/DataIn/Plumbing导入模板.xls
View File

Binary file not shown.

BIN
SGGL/FineUIPro.Web/File/Excel/DataIn/Telecom导入模板.xls
View File

Binary file not shown.

26
SGGL/FineUIPro.Web/Transfer/Firefighting.aspx
View File

@ -26,13 +26,20 @@
<f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px" LabelAlign="Right"></f:TextBox>
<f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
<f:DropDownList runat="server" ID="ddStatus" Label="Status">
<f:ListItem Value="" Text="All" Selected="true"/>
<f:ListItem Value="Not Start" Text="Not Start"/>
<f:ListItem Value="In progress" Text="In progress"/>
<f:ListItem Value="Completed" Text="Completed"/>
</f:DropDownList>
<%-- <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
Width="280px">
</f:DatePicker>
<f:Label ID="Label1" runat="server" Text="至">
</f:Label>
<f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" Width="150px">
</f:DatePicker>
</f:DatePicker>--%>
<f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
</f:Button>
@ -64,10 +71,17 @@
<f:GroupField HeaderText="Test Package Schedule" TextAlign="Center" MinWidth="400px">
<Columns>
<f:RenderField Width="200px" ColumnID="Test_Package_START" DataField="Test_Package_START" HeaderText="Test Package START" TextAlign="Center"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"/>
<f:RenderField Width="200px" ColumnID="Test_Package_FINISH" DataField="Test_Package_FINISH" HeaderText="Test Package FINISH" TextAlign="Center"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"/>
<f:RenderField ColumnID="Installation" DataField="Installation" FieldType="String" HeaderText="Installation" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="Debugging" DataField="Debugging" FieldType="String" HeaderText="Debugging" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="Acceptancecheck" DataField="Acceptancecheck" FieldType="String" HeaderText="Acceptance check" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
</Columns>
</f:GroupField>

25
SGGL/FineUIPro.Web/Transfer/Firefighting.aspx.cs
View File

@ -40,22 +40,27 @@ namespace FineUIPro.Web.Transfer
strSql += " AND Firefighting like @Firefighting";
listStr.Add(new SqlParameter("@Firefighting", "%" + this.txtFirefighting.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
{
strSql += " AND Test_Package_START >= @InspectionDateA";
listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
}
if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
{
strSql += " AND Test_Package_START <= @InspectionDateZ";
listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
}
//if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
//{
// strSql += " AND Test_Package_START >= @InspectionDateA";
// listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
//}
//if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
//{
// strSql += " AND Test_Package_START <= @InspectionDateZ";
// listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
//}
if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
{
strSql += " AND SystemName like @SystemName";
listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(ddStatus.SelectedValue))
{
strSql += " And FINAL_Status='" + ddStatus.SelectedValue + "' ";
}
strSql += " order by Firefighting ";
SqlParameter[] parameter = listStr.ToArray();

22
SGGL/FineUIPro.Web/Transfer/Firefighting.aspx.designer.cs generated
View File

@ -78,31 +78,13 @@ namespace FineUIPro.Web.Transfer
protected global::FineUIPro.TextBox txtSystem;
/// <summary>
/// txtStarTime 控件。
/// ddStatus 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStarTime;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// txtEndTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndTime;
protected global::FineUIPro.DropDownList ddStatus;
/// <summary>
/// btnSearch 控件。

132
SGGL/FineUIPro.Web/Transfer/FirefightingDataIn.aspx.cs
View File

@ -168,30 +168,12 @@ namespace FineUIPro.Web.Transfer
{
for (int i = 1; i < ir; i++)
{
string row4 = pds.Rows[i][4].ToString();
if (!string.IsNullOrEmpty(row4))
string row4 = pds.Rows[i][0].ToString();
if (string.IsNullOrEmpty(row4))
{
try
{
DateTime date = Convert.ToDateTime(row4.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "Test Package START" + "," + "[" + row4 + "]错误！不是日期格式！" + "|";
}
}
string row5 = pds.Rows[i][5].ToString();
if (!string.IsNullOrEmpty(row5))
{
try
{
DateTime date = Convert.ToDateTime(row5.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "Test Package FINISH" + "," + "[" + row5 + "]错误！不是日期格式！" + "|";
}
result += (i + 2).ToString() + "," + "Firefighting" + "," + "不能为空！" + "|";
}
}
if (!string.IsNullOrEmpty(result))
{
@ -331,10 +313,10 @@ namespace FineUIPro.Web.Transfer
{
if (!string.IsNullOrEmpty(pds.Rows[i][0].ToString().Trim()))
{
//查询第一列，没查到的情况下作导入处理
var modelOnly = Funs.DB.Transfer_Firefighting.FirstOrDefault(x => x.Firefighting == pds.Rows[i][0].ToString().Trim() && x.ProjectId == CurrUser.LoginProjectId);
if (modelOnly == null)
{
////查询第一列，没查到的情况下作导入处理
//var modelOnly = Funs.DB.Transfer_Firefighting.FirstOrDefault(x => x.Firefighting == pds.Rows[i][0].ToString().Trim() && x.ProjectId == CurrUser.LoginProjectId);
//if (modelOnly == null)
//{
Model.Transfer_Firefighting model = new Model.Transfer_Firefighting();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
@ -342,44 +324,72 @@ namespace FineUIPro.Web.Transfer
model.SystemName = pds.Rows[i][1].ToString().Trim();
model.Subsystem = pds.Rows[i][2].ToString().Trim();
model.Test_Package = pds.Rows[i][3].ToString().Trim();
DateTime t1, t2;
if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
model.Test_Package_START = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
model.Test_Package_FINISH = t2;
model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
if (model.FINAL_Status.ToLower() == "finished")
{
model.CompleteTime = DateTime.Now;
}
list.Add(model);
}
else
var obj1 = model.Installation = pds.Rows[i][4].ToString().Trim();
var obj2 = model.Debugging = pds.Rows[i][5].ToString().Trim();
var obj3 = model.Acceptancecheck = pds.Rows[i][6].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
listObj.Add(obj1);
listObj.Add(obj2);
listObj.Add(obj3);
//全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
{
//修改
modelOnly.Firefighting = pds.Rows[i][0].ToString().Trim();
modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
DateTime t1, t2;
if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
modelOnly.Test_Package_START = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
modelOnly.Test_Package_FINISH = t2;
//更改前不是finished，更改后是finished的，才修改实际完成时间
if (modelOnly.FINAL_Status.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
{
modelOnly.CompleteTime = DateTime.Now;
}
modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
//if (modelOnly.FINAL_Status.ToLower() == "finished")
//{
// modelOnly.CompleteTime = DateTime.Now;
//}
Funs.DB.SubmitChanges();
model.FINAL_Status = "Completed";
list.Add(model);
continue;
}
//如果全是Not Start 就是 Not Start
if (listObj.Where(x => x == "Not Start").ToList().Count == 3)
{
model.FINAL_Status = "Not Start";
list.Add(model);
continue;
}
//如果其中有一项是In progress 或Not Start 是 In progress
if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
{
model.FINAL_Status = "In progress";
list.Add(model);
continue;
}
model.FINAL_Status = "Not Start";
list.Add(model);
#endregion
list.Add(model);
//}
//else
//{
// //修改
// modelOnly.Firefighting = pds.Rows[i][0].ToString().Trim();
// modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
// modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
// modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
// DateTime t1, t2;
// if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
// modelOnly.Test_Package_START = t1;
// if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
// modelOnly.Test_Package_FINISH = t2;
// //更改前不是finished，更改后是finished的，才修改实际完成时间
// if (modelOnly.FINAL_Status.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
// {
// modelOnly.CompleteTime = DateTime.Now;
// }
// modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
// //if (modelOnly.FINAL_Status.ToLower() == "finished")
// //{
// // modelOnly.CompleteTime = DateTime.Now;
// //}
// Funs.DB.SubmitChanges();
//}
}
}
if (list.Count > 0)

28
SGGL/FineUIPro.Web/Transfer/Plumbing.aspx
View File

@ -26,13 +26,12 @@
<f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px" LabelAlign="Right"></f:TextBox>
<f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
Width="280px">
</f:DatePicker>
<f:Label ID="Label1" runat="server" Text="至">
</f:Label>
<f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" Width="150px">
</f:DatePicker>
<f:DropDownList runat="server" ID="ddStatus" Label="Status">
<f:ListItem Value="" Text="All" Selected="true"/>
<f:ListItem Value="Not Start" Text="Not Start"/>
<f:ListItem Value="In progress" Text="In progress"/>
<f:ListItem Value="Completed" Text="Completed"/>
</f:DropDownList>
<f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
</f:Button>
@ -64,10 +63,17 @@
<f:GroupField HeaderText="Test Package Schedule" TextAlign="Center" MinWidth="400px">
<Columns>
<f:RenderField Width="200px" ColumnID="Test_Package_START" DataField="Test_Package_START" HeaderText="Test Package START" TextAlign="Center"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"/>
<f:RenderField Width="200px" ColumnID="Test_Package_FINISH" DataField="Test_Package_FINISH" HeaderText="Test Package FINISH" TextAlign="Center"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"/>
<f:RenderField ColumnID="Ndt" DataField="Ndt" FieldType="String" HeaderText="NDT" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="Flushing" DataField="Flushing" FieldType="String" HeaderText="Flushing" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="RunningTest" DataField="RunningTest" FieldType="String" HeaderText="Running Test" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
</Columns>
</f:GroupField>

17
SGGL/FineUIPro.Web/Transfer/Plumbing.aspx.cs
View File

@ -41,22 +41,19 @@ namespace FineUIPro.Web.Transfer
strSql += " AND Plumbing like @Plumbing";
listStr.Add(new SqlParameter("@Plumbing", "%" + this.txtPlumbing.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
{
strSql += " AND Test_Package_START >= @InspectionDateA";
listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
}
if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
{
strSql += " AND Test_Package_START <= @InspectionDateZ";
listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
}
if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
{
strSql += " AND SystemName like @SystemName";
listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(ddStatus.SelectedValue))
{
strSql += " And FINAL_Status='" + ddStatus.SelectedValue + "' ";
}
strSql += " order by Plumbing ";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);

22
SGGL/FineUIPro.Web/Transfer/Plumbing.aspx.designer.cs generated
View File

@ -78,31 +78,13 @@ namespace FineUIPro.Web.Transfer
protected global::FineUIPro.TextBox txtSystem;
/// <summary>
/// txtStarTime 控件。
/// ddStatus 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStarTime;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// txtEndTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndTime;
protected global::FineUIPro.DropDownList ddStatus;
/// <summary>
/// btnSearch 控件。

142
SGGL/FineUIPro.Web/Transfer/PlumbingDataIn.aspx.cs
View File

@ -168,30 +168,12 @@ namespace FineUIPro.Web.Transfer
{
for (int i = 1; i < ir; i++)
{
string row4 = pds.Rows[i][4].ToString();
if (!string.IsNullOrEmpty(row4))
string row4 = pds.Rows[i][0].ToString();
if (string.IsNullOrEmpty(row4))
{
try
{
DateTime date = Convert.ToDateTime(row4.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "Test Package START" + "," + "[" + row4 + "]错误！不是日期格式！" + "|";
}
}
string row5 = pds.Rows[i][5].ToString();
if (!string.IsNullOrEmpty(row5))
{
try
{
DateTime date = Convert.ToDateTime(row5.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "Test Package FINISH" + "," + "[" + row5 + "]错误！不是日期格式！" + "|";
}
result += (i + 2).ToString() + "," + "Plumbing" + "," + "不能为空！" + "|";
}
}
if (!string.IsNullOrEmpty(result))
{
@ -332,55 +314,83 @@ namespace FineUIPro.Web.Transfer
if (!string.IsNullOrEmpty(pds.Rows[i][0].ToString().Trim()))
{
//查询第一列，没查到的情况下作导入处理
var modelOnly = Funs.DB.Transfer_Plumbing.FirstOrDefault(x => x.Plumbing == pds.Rows[i][0].ToString().Trim()
&& x.ProjectId == CurrUser.LoginProjectId);
if (modelOnly == null)
// var modelOnly = Funs.DB.Transfer_Plumbing.FirstOrDefault(x => x.Plumbing == pds.Rows[i][0].ToString().Trim()
//&& x.ProjectId == CurrUser.LoginProjectId);
// if (modelOnly == null)
// {
Model.Transfer_Plumbing model = new Model.Transfer_Plumbing();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.Plumbing = pds.Rows[i][0].ToString().Trim();
model.SystemName = pds.Rows[i][1].ToString().Trim();
model.Subsystem = pds.Rows[i][2].ToString().Trim();
model.Test_Package = pds.Rows[i][3].ToString().Trim();
var obj1 = model.Ndt = pds.Rows[i][4].ToString().Trim();
var obj2 = model.Flushing = pds.Rows[i][5].ToString().Trim();
var obj3 = model.RunningTest = pds.Rows[i][6].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
listObj.Add(obj1);
listObj.Add(obj2);
listObj.Add(obj3);
//全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
{
Model.Transfer_Plumbing model = new Model.Transfer_Plumbing();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.Plumbing = pds.Rows[i][0].ToString().Trim();
model.SystemName = pds.Rows[i][1].ToString().Trim();
model.Subsystem = pds.Rows[i][2].ToString().Trim();
model.Test_Package = pds.Rows[i][3].ToString().Trim();
DateTime t1, t2;
if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
model.Test_Package_START = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
model.Test_Package_FINISH = t2;
model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
if (model.FINAL_Status.ToLower() == "finished")
{
model.CompleteTime = DateTime.Now;
}
model.FINAL_Status = "Completed";
list.Add(model);
continue;
}
else
{
//修改
modelOnly.Plumbing = pds.Rows[i][0].ToString().Trim();
modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
DateTime t1, t2;
if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
modelOnly.Test_Package_START = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
modelOnly.Test_Package_FINISH = t2;
//更改前不是finished，更改后是finished的，才修改实际完成时间
if (modelOnly.FINAL_Status.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
{
modelOnly.CompleteTime = DateTime.Now;
}
modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
//if (modelOnly.FINAL_Status.ToLower() == "finished")
//{
// modelOnly.CompleteTime = DateTime.Now;
//}
Funs.DB.SubmitChanges();
//如果全是Not Start 就是 Not Start
if (listObj.Where(x => x == "Not Start").ToList().Count == 3)
{
model.FINAL_Status = "Not Start";
list.Add(model);
continue;
}
//如果其中有一项是In progress 或Not Start 是 In progress
if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
{
model.FINAL_Status = "In progress";
list.Add(model);
continue;
}
model.FINAL_Status = "Not Start";
list.Add(model);
#endregion
list.Add(model);
//}
//else
//{
// //修改
// modelOnly.Plumbing = pds.Rows[i][0].ToString().Trim();
// modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
// modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
// modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
// DateTime t1, t2;
// if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
// modelOnly.Test_Package_START = t1;
// if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
// modelOnly.Test_Package_FINISH = t2;
// //更改前不是finished，更改后是finished的，才修改实际完成时间
// if (modelOnly.FINAL_Status.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
// {
// modelOnly.CompleteTime = DateTime.Now;
// }
// modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
// //if (modelOnly.FINAL_Status.ToLower() == "finished")
// //{
// // modelOnly.CompleteTime = DateTime.Now;
// //}
// Funs.DB.SubmitChanges();
//}
}
}
if (list.Count > 0)

29
SGGL/FineUIPro.Web/Transfer/Telecom.aspx
View File

@ -26,13 +26,19 @@
<f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px" LabelAlign="Right"></f:TextBox>
<f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
<f:DropDownList runat="server" ID="ddStatus" Label="Status">
<f:ListItem Value="" Text="All" Selected="true"/>
<f:ListItem Value="Not Start" Text="Not Start"/>
<f:ListItem Value="In progress" Text="In progress"/>
<f:ListItem Value="Completed" Text="Completed"/>
</f:DropDownList>
<%-- <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
Width="280px">
</f:DatePicker>
<f:Label ID="Label1" runat="server" Text="至">
</f:Label>
<f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" Width="150px">
</f:DatePicker>
</f:DatePicker>--%>
<f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
</f:Button>
@ -64,10 +70,21 @@
<f:GroupField HeaderText="Test Package Schedule" TextAlign="Center" MinWidth="400px">
<Columns>
<f:RenderField Width="200px" ColumnID="Test_Package_START" DataField="Test_Package_START" HeaderText="Test Package START" TextAlign="Center"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"/>
<f:RenderField Width="200px" ColumnID="Test_Package_FINISH" DataField="Test_Package_FINISH" HeaderText="Test Package FINISH" TextAlign="Center"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"/>
<f:RenderField ColumnID="Installation" DataField="Installation" FieldType="String" HeaderText="Installation<br/> &Inspection Reocrd" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="Communication" DataField="Communication" FieldType="String" HeaderText="Communication<br/> test" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="CableLaying" DataField="CableLaying" FieldType="String" HeaderText="Cable Laying and<br/> Insulation Test<br/> Record" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="FunctionTest" DataField="FunctionTest" FieldType="String" HeaderText="Function Test" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
</Columns>
</f:GroupField>

24
SGGL/FineUIPro.Web/Transfer/Telecom.aspx.cs
View File

@ -41,21 +41,25 @@ namespace FineUIPro.Web.Transfer
strSql += " AND Telecom like @Telecom";
listStr.Add(new SqlParameter("@Telecom", "%" + this.txtTelecom.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
{
strSql += " AND Test_Package_START >= @InspectionDateA";
listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
}
if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
{
strSql += " AND Test_Package_START <= @InspectionDateZ";
listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
}
//if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
//{
// strSql += " AND Test_Package_START >= @InspectionDateA";
// listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
//}
//if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
//{
// strSql += " AND Test_Package_START <= @InspectionDateZ";
// listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
//}
if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
{
strSql += " AND SystemName like @SystemName";
listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(ddStatus.SelectedValue))
{
strSql += " And FINAL_Status='" + ddStatus.SelectedValue + "' ";
}
strSql += " order by Telecom ";

22
SGGL/FineUIPro.Web/Transfer/Telecom.aspx.designer.cs generated
View File

@ -78,31 +78,13 @@ namespace FineUIPro.Web.Transfer
protected global::FineUIPro.TextBox txtSystem;
/// <summary>
/// txtStarTime 控件。
/// ddStatus 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStarTime;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// txtEndTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndTime;
protected global::FineUIPro.DropDownList ddStatus;
/// <summary>
/// btnSearch 控件。

151
SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs
View File

@ -130,7 +130,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 7);
AddDatasetToSQL(ds.Tables[0], 8);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@ -168,30 +168,12 @@ namespace FineUIPro.Web.Transfer
{
for (int i = 1; i < ir; i++)
{
string row4 = pds.Rows[i][4].ToString();
if (!string.IsNullOrEmpty(row4))
string row4 = pds.Rows[i][0].ToString();
if (string.IsNullOrEmpty(row4))
{
try
{
DateTime date = Convert.ToDateTime(row4.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "Test Package START" + "," + "[" + row4 + "]错误！不是日期格式！" + "|";
}
}
string row5 = pds.Rows[i][5].ToString();
if (!string.IsNullOrEmpty(row5))
{
try
{
DateTime date = Convert.ToDateTime(row5.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "Test Package FINISH" + "," + "[" + row5 + "]错误！不是日期格式！" + "|";
}
result += (i + 2).ToString() + "," + "Telecom" + "," + "不能为空！" + "|";
}
}
if (!string.IsNullOrEmpty(result))
{
@ -298,7 +280,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 7);
AddDatasetToSQL2(ds.Tables[0], 8);
}
catch (Exception ex)
{
@ -331,56 +313,87 @@ namespace FineUIPro.Web.Transfer
{
if (!string.IsNullOrEmpty(pds.Rows[i][0].ToString().Trim()))
{
//查询第一列，没查到的情况下作导入处理
var modelOnly = Funs.DB.Transfer_Telecom.FirstOrDefault(x => x.Telecom == pds.Rows[i][0].ToString().Trim()
&& x.ProjectId == CurrUser.LoginProjectId);
if (modelOnly == null)
// //查询第一列，没查到的情况下作导入处理
// var modelOnly = Funs.DB.Transfer_Telecom.FirstOrDefault(x => x.Telecom == pds.Rows[i][0].ToString().Trim()
//&& x.ProjectId == CurrUser.LoginProjectId);
// if (modelOnly == null)
// {
Model.Transfer_Telecom model = new Model.Transfer_Telecom();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.Telecom = pds.Rows[i][0].ToString().Trim();
model.SystemName = pds.Rows[i][1].ToString().Trim();
model.Subsystem = pds.Rows[i][2].ToString().Trim();
model.Test_Package = pds.Rows[i][3].ToString().Trim();
var obj1 = model.Installation = pds.Rows[i][4].ToString().Trim();
var obj2 = model.Communication = pds.Rows[i][5].ToString().Trim();
var obj3 = model.CableLaying = pds.Rows[i][6].ToString().Trim();
var obj4 = model.FunctionTest = pds.Rows[i][7].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
listObj.Add(obj1);
listObj.Add(obj2);
listObj.Add(obj3);
listObj.Add(obj4);
//全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 4)
{
Model.Transfer_Telecom model = new Model.Transfer_Telecom();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.Telecom = pds.Rows[i][0].ToString().Trim();
model.SystemName = pds.Rows[i][1].ToString().Trim();
model.Subsystem = pds.Rows[i][2].ToString().Trim();
model.Test_Package = pds.Rows[i][3].ToString().Trim();
DateTime t1, t2;
if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
model.Test_Package_START = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
model.Test_Package_FINISH = t2;
model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
if (model.FINAL_Status.ToLower() == "finished")
{
model.CompleteTime = DateTime.Now;
}
model.FINAL_Status = "Completed";
list.Add(model);
continue;
}
else
{
//修改
modelOnly.Telecom = pds.Rows[i][0].ToString().Trim();
modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
DateTime t1, t2;
if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
modelOnly.Test_Package_START = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
modelOnly.Test_Package_FINISH = t2;
//更改前不是finished，更改后是finished的，才修改实际完成时间
if (modelOnly.FINAL_Status.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
{
modelOnly.CompleteTime = DateTime.Now;
}
modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
//if (modelOnly.FINAL_Status.ToLower() == "finished")
//{
// modelOnly.CompleteTime = DateTime.Now;
//}
Funs.DB.SubmitChanges();
//如果全是Not Start 就是 Not Start
if (listObj.Where(x => x == "Not Start").ToList().Count == 4)
{
model.FINAL_Status = "Not Start";
list.Add(model);
continue;
}
//如果其中有一项是In progress 或Not Start 是 In progress
if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
{
model.FINAL_Status = "In progress";
list.Add(model);
continue;
}
model.FINAL_Status = "Not Start";
list.Add(model);
#endregion
list.Add(model);
//}
//else
//{
// //修改
// modelOnly.Telecom = pds.Rows[i][0].ToString().Trim();
// modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
// modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
// modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
// DateTime t1, t2;
// if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
// modelOnly.Test_Package_START = t1;
// if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
// modelOnly.Test_Package_FINISH = t2;
// //更改前不是finished，更改后是finished的，才修改实际完成时间
// if (modelOnly.FINAL_Status.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
// {
// modelOnly.CompleteTime = DateTime.Now;
// }
// modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
// //if (modelOnly.FINAL_Status.ToLower() == "finished")
// //{
// // modelOnly.CompleteTime = DateTime.Now;
// //}
// Funs.DB.SubmitChanges();
//}
}
}
if (list.Count > 0)

240
SGGL/Model/Model.cs
View File

@ -391650,6 +391650,12 @@ namespace Model
private System.Nullable<System.DateTime> _CompleteTime;
private string _Installation;
private string _Debugging;
private string _Acceptancecheck;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -391674,6 +391680,12 @@ namespace Model
partial void OnFINAL_StatusChanged();
partial void OnCompleteTimeChanging(System.Nullable<System.DateTime> value);
partial void OnCompleteTimeChanged();
partial void OnInstallationChanging(string value);
partial void OnInstallationChanged();
partial void OnDebuggingChanging(string value);
partial void OnDebuggingChanged();
partial void OnAcceptancecheckChanging(string value);
partial void OnAcceptancecheckChanged();
#endregion
public Transfer_Firefighting()
@ -391881,6 +391893,66 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Installation", DbType="NVarChar(50)")]
public string Installation
{
get
{
return this._Installation;
}
set
{
if ((this._Installation != value))
{
this.OnInstallationChanging(value);
this.SendPropertyChanging();
this._Installation = value;
this.SendPropertyChanged("Installation");
this.OnInstallationChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Debugging", DbType="NVarChar(50)")]
public string Debugging
{
get
{
return this._Debugging;
}
set
{
if ((this._Debugging != value))
{
this.OnDebuggingChanging(value);
this.SendPropertyChanging();
this._Debugging = value;
this.SendPropertyChanged("Debugging");
this.OnDebuggingChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Acceptancecheck", DbType="NVarChar(50)")]
public string Acceptancecheck
{
get
{
return this._Acceptancecheck;
}
set
{
if ((this._Acceptancecheck != value))
{
this.OnAcceptancecheckChanging(value);
this.SendPropertyChanging();
this._Acceptancecheck = value;
this.SendPropertyChanged("Acceptancecheck");
this.OnAcceptancecheckChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -393520,6 +393592,12 @@ namespace Model
private System.Nullable<System.DateTime> _CompleteTime;
private string _Ndt;
private string _Flushing;
private string _RunningTest;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -393544,6 +393622,12 @@ namespace Model
partial void OnFINAL_StatusChanged();
partial void OnCompleteTimeChanging(System.Nullable<System.DateTime> value);
partial void OnCompleteTimeChanged();
partial void OnNdtChanging(string value);
partial void OnNdtChanged();
partial void OnFlushingChanging(string value);
partial void OnFlushingChanged();
partial void OnRunningTestChanging(string value);
partial void OnRunningTestChanged();
#endregion
public Transfer_Plumbing()
@ -393751,6 +393835,66 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Ndt", DbType="NVarChar(50)")]
public string Ndt
{
get
{
return this._Ndt;
}
set
{
if ((this._Ndt != value))
{
this.OnNdtChanging(value);
this.SendPropertyChanging();
this._Ndt = value;
this.SendPropertyChanged("Ndt");
this.OnNdtChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Flushing", DbType="NVarChar(50)")]
public string Flushing
{
get
{
return this._Flushing;
}
set
{
if ((this._Flushing != value))
{
this.OnFlushingChanging(value);
this.SendPropertyChanging();
this._Flushing = value;
this.SendPropertyChanged("Flushing");
this.OnFlushingChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RunningTest", DbType="NVarChar(50)")]
public string RunningTest
{
get
{
return this._RunningTest;
}
set
{
if ((this._RunningTest != value))
{
this.OnRunningTestChanging(value);
this.SendPropertyChanging();
this._RunningTest = value;
this.SendPropertyChanged("RunningTest");
this.OnRunningTestChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -395870,6 +396014,14 @@ namespace Model
private System.Nullable<System.DateTime> _CompleteTime;
private string _Installation;
private string _Communication;
private string _CableLaying;
private string _FunctionTest;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -395894,6 +396046,14 @@ namespace Model
partial void OnFINAL_StatusChanged();
partial void OnCompleteTimeChanging(System.Nullable<System.DateTime> value);
partial void OnCompleteTimeChanged();
partial void OnInstallationChanging(string value);
partial void OnInstallationChanged();
partial void OnCommunicationChanging(string value);
partial void OnCommunicationChanged();
partial void OnCableLayingChanging(string value);
partial void OnCableLayingChanged();
partial void OnFunctionTestChanging(string value);
partial void OnFunctionTestChanged();
#endregion
public Transfer_Telecom()
@ -396101,6 +396261,86 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Installation", DbType="NVarChar(50)")]
public string Installation
{
get
{
return this._Installation;
}
set
{
if ((this._Installation != value))
{
this.OnInstallationChanging(value);
this.SendPropertyChanging();
this._Installation = value;
this.SendPropertyChanged("Installation");
this.OnInstallationChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Communication", DbType="NVarChar(50)")]
public string Communication
{
get
{
return this._Communication;
}
set
{
if ((this._Communication != value))
{
this.OnCommunicationChanging(value);
this.SendPropertyChanging();
this._Communication = value;
this.SendPropertyChanged("Communication");
this.OnCommunicationChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CableLaying", DbType="NVarChar(50)")]
public string CableLaying
{
get
{
return this._CableLaying;
}
set
{
if ((this._CableLaying != value))
{
this.OnCableLayingChanging(value);
this.SendPropertyChanging();
this._CableLaying = value;
this.SendPropertyChanged("CableLaying");
this.OnCableLayingChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FunctionTest", DbType="NVarChar(50)")]
public string FunctionTest
{
get
{
return this._FunctionTest;
}
set
{
if ((this._FunctionTest != value))
{
this.OnFunctionTestChanging(value);
this.SendPropertyChanging();
this._FunctionTest = value;
this.SendPropertyChanged("FunctionTest");
this.OnFunctionTestChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;