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

移交

Browse Source
This commit is contained in:
潘鸿锋
2024-07-25 14:59:26 +08:00
parent 4023edecf9
commit 98029fa93c
38 changed files with 2527 additions and 1325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx
+40 -7
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>
@@ -62,12 +68,39 @@
</Columns>
</f:GroupField>
<f:GroupField HeaderText="Test Package Schedule" TextAlign="Center" MinWidth="400px">
<f:GroupField HeaderText="Test Package Schedule" TextAlign="Center">
<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="Foundation" DataField="Foundation" FieldType="String" HeaderText="Foundation" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="Mainstructure" DataField="Mainstructure" FieldType="String" HeaderText="Main structure<br/> acceptance" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="Buildingdecoration" DataField="Buildingdecoration" FieldType="String" HeaderText="Building<br/> decoration" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="Equipment" DataField="Equipment" FieldType="String" HeaderText="Equipment" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="Instrument" DataField="Instrument" FieldType="String" HeaderText="Instrument" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="Electrical" DataField="Electrical" FieldType="String" HeaderText="Electrical" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="FireFighting" DataField="FireFighting" FieldType="String" HeaderText="Fire<br/> Fighting" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="HVAC" DataField="HVAC" FieldType="String" HeaderText="HVAC" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
</Columns>
</f:GroupField>
SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.cs
+15 -10
View File
@@ -40,22 +40,27 @@ namespace FineUIPro.Web.Transfer
strSql += " AND Civil_Structure like @Civil_Structure";
listStr.Add(new SqlParameter("@Civil_Structure", "%" + this.txtCivil_Structure.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 Civil_Structure ";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.designer.cs
Generated
+2 -20
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 控件。
SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs
+93 -73
View File
@@ -130,7 +130,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 7);
AddDatasetToSQL(ds.Tables[0], 12);
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 + 3).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 + 3).ToString() + "," + "Test Package FINISH" + "," + "[" + row5 + "]错误！不是日期格式！" + "|";
}
result += (i + 3).ToString() + "," + "Structure/Civil/Architecture" + "," + "不能为空！" + "|";
}
}
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], 12);
}
catch (Exception ex)
{
@@ -329,57 +311,95 @@ namespace FineUIPro.Web.Transfer
List<Model.Transfer_Civil_Structure> list = new List<Model.Transfer_Civil_Structure>();
for (int i = 1; i < ir; i++)
{
if (!string.IsNullOrEmpty(pds.Rows[i][0].ToString().Trim()))
//if (!string.IsNullOrEmpty(pds.Rows[i][0].ToString().Trim()))
//{
// //查询第一列，没查到的情况下作导入处理
// var modelOnly = Funs.DB.Transfer_Civil_Structure.FirstOrDefault(x => x.Civil_Structure == pds.Rows[i][0].ToString().Trim()
//&& x.ProjectId == CurrUser.LoginProjectId);
// if (modelOnly == null)
// {
Model.Transfer_Civil_Structure model = new Model.Transfer_Civil_Structure();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.Civil_Structure = 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.Foundation = pds.Rows[i][4].ToString().Trim();
var obj2 = model.Mainstructure = pds.Rows[i][5].ToString().Trim();
var obj3 = model.Buildingdecoration = pds.Rows[i][6].ToString().Trim();
var obj4 = model.Equipment = pds.Rows[i][7].ToString().Trim();
var obj5 = model.Instrument = pds.Rows[i][8].ToString().Trim();
var obj6 = model.Electrical = pds.Rows[i][9].ToString().Trim();
var obj7 = model.FireFighting = pds.Rows[i][10].ToString().Trim();
var obj8 = model.HVAC = pds.Rows[i][11].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
listObj.Add(obj1);
listObj.Add(obj2);
listObj.Add(obj3);
listObj.Add(obj4);
listObj.Add(obj5);
listObj.Add(obj6);
listObj.Add(obj7);
listObj.Add(obj8);
//全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 8)
{
//查询第一列，没查到的情况下作导入处理
var modelOnly = Funs.DB.Transfer_Civil_Structure.FirstOrDefault(x => x.Civil_Structure == pds.Rows[i][0].ToString().Trim()
&& x.ProjectId == CurrUser.LoginProjectId);
if (modelOnly == null)
{
Model.Transfer_Civil_Structure model = new Model.Transfer_Civil_Structure();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.Civil_Structure = 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;
}
list.Add(model);
}
else
{
//修改
modelOnly.Civil_Structure = 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();
Funs.DB.SubmitChanges();
}
model.FINAL_Status = "Completed";
list.Add(model);
continue;
}
//如果全是Not Start 就是 Not Start
if (listObj.Where(x => x == "Not Start").ToList().Count == 8)
{
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.Civil_Structure = 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();
// Funs.DB.SubmitChanges();
// }
//}
}
if (list.Count > 0)
{
SGGL/FineUIPro.Web/Transfer/Electrical.aspx
+30 -12
View File
@@ -22,17 +22,24 @@
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" ID="txtELECTRICAL" Label="ELECTRICAL" LabelWidth="150px" LabelAlign="Right"></f:TextBox>
<f:TextBox runat="server" ID="txtELECTRICAL" Label="Tag. No" LabelWidth="110px" LabelAlign="Right"></f:TextBox>
<f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px" LabelAlign="Right"></f:TextBox>
<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>
@@ -50,24 +57,35 @@
<f:GroupField HeaderText="ELECTRICAL" TextAlign="Center" MinWidth="200px">
<Columns>
<f:BoundField Width="200px" TextAlign="Center" ColumnID="ELECTRICAL" DataField="ELECTRICAL" HeaderText="ELECTRICAL" />
<f:BoundField Width="200px" TextAlign="Center" ColumnID="ELECTRICAL" DataField="ELECTRICAL" HeaderText="Tag. No" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center" MinWidth="450">
<Columns>
<f:BoundField Width="150px" ColumnID="SystemName" DataField="SystemName" HeaderText="SYSTEM" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Subsystem" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Test Package" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="SystemName" DataField="SystemName" HeaderText="System" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Sub-System" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turn over Package" TextAlign="Center"/>
</Columns>
</f:GroupField>
<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="Communicationtest" DataField="Communicationtest" 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="LoopTest" DataField="LoopTest" FieldType="String" HeaderText="Loop Test" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
</Columns>
</f:GroupField>
SGGL/FineUIPro.Web/Transfer/Electrical.aspx.cs
+6 -10
View File
@@ -40,16 +40,7 @@ namespace FineUIPro.Web.Transfer
strSql += " AND ELECTRICAL like @ELECTRICAL";
listStr.Add(new SqlParameter("@ELECTRICAL", "%" + this.txtELECTRICAL.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()))
{
@@ -57,6 +48,11 @@ namespace FineUIPro.Web.Transfer
listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(ddStatus.SelectedValue))
{
strSql += " And FINAL_Status='" + ddStatus.SelectedValue + "' ";
}
strSql += " order by ELECTRICAL ";
SqlParameter[] parameter = listStr.ToArray();
SGGL/FineUIPro.Web/Transfer/Electrical.aspx.designer.cs
Generated
+2 -20
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 控件。
SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs
+90 -78
View File
@@ -129,7 +129,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)
@@ -156,9 +156,9 @@ namespace FineUIPro.Web.Transfer
string result = string.Empty;
int ic, ir;
ic = pds.Columns.Count;
if (ic < Cols)
if (ic != Cols)
{
ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning);
ShowNotify("导入Excel格式错误！Excel必须是" + Cols.ToString().Trim() + "列", MessageBoxIcon.Warning);
return false;
}
@@ -167,30 +167,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() + "," + "Tag. No" + "," + "不能为空！" + "|";
}
}
if (!string.IsNullOrEmpty(result))
{
@@ -297,7 +279,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 7);
AddDatasetToSQL2(ds.Tables[0], 9);
}
catch (Exception ex)
{
@@ -328,60 +310,90 @@ namespace FineUIPro.Web.Transfer
List<Model.Transfer_Electrical> list = new List<Model.Transfer_Electrical>();
for (int i = 1; i < ir; i++)
{
if (!string.IsNullOrEmpty(pds.Rows[i][0].ToString().Trim()))
//if (!string.IsNullOrEmpty(pds.Rows[i][0].ToString().Trim()))
//{
// //查询第一列，没查到的情况下作导入处理
// var modelOnly = Funs.DB.Transfer_Electrical.FirstOrDefault(x => x.ELECTRICAL == pds.Rows[i][0].ToString().Trim()
//&& x.ProjectId == CurrUser.LoginProjectId);
// if (modelOnly == null)
// {
Model.Transfer_Electrical model = new Model.Transfer_Electrical();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.ELECTRICAL = 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.Communicationtest = pds.Rows[i][5].ToString().Trim();
var obj3 = model.CableLaying = pds.Rows[i][6].ToString().Trim();
var obj4 = model.LoopTest = 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)
{
//查询第一列，没查到的情况下作导入处理
var modelOnly = Funs.DB.Transfer_Electrical.FirstOrDefault(x => x.ELECTRICAL == pds.Rows[i][0].ToString().Trim()
&& x.ProjectId == CurrUser.LoginProjectId);
if (modelOnly == null)
{
Model.Transfer_Electrical model = new Model.Transfer_Electrical();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.ELECTRICAL = 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;
}
list.Add(model);
}
else
{
//修改
modelOnly.ELECTRICAL = 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 == 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.ELECTRICAL = 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)
{
SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
+35 -13
View File
@@ -22,17 +22,24 @@
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" ID="txtINSTRUMENTATION" Label="INSTRUMENTATION" LabelWidth="150px" LabelAlign="Right"></f:TextBox>
<f:TextBox runat="server" ID="txtINSTRUMENTATION" Label="Tag No" LabelWidth="120px" LabelAlign="Right"></f:TextBox>
<f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px" LabelAlign="Right"></f:TextBox>
<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>
@@ -50,28 +57,43 @@
<f:GroupField HeaderText="INSTRUMENTATION" TextAlign="Center" MinWidth="200px">
<Columns>
<f:BoundField Width="200px" TextAlign="Center" ColumnID="INSTRUMENTATION" DataField="INSTRUMENTATION" HeaderText="INSTRUMENTATION" />
<f:BoundField Width="200px" TextAlign="Center" ColumnID="INSTRUMENTATION" DataField="INSTRUMENTATION" HeaderText="Tag No" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center" MinWidth="450">
<Columns>
<f:BoundField Width="150px" ColumnID="SystemName" DataField="SystemName" HeaderText="SYSTEM" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Subsystem" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Test Package" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="SystemName" DataField="SystemName" HeaderText="System" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Sub-System" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turn over Package" TextAlign="Center"/>
</Columns>
</f:GroupField>
<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="InstallationCalibration" DataField="InstallationCalibration" FieldType="String" HeaderText="Installation<br/> &Calibration " TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="PipingPressuretest" DataField="PipingPressuretest" FieldType="String" HeaderText="Piping Pressure test" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="PipingLeak" DataField="PipingLeak" FieldType="String" HeaderText="Piping Leak/<br/>Vacuum Test" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="PipingBlowing" DataField="PipingBlowing" FieldType="String" HeaderText="Piping Blowing" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="Looptest" DataField="Looptest" FieldType="String" HeaderText="Loop test" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
</Columns>
</f:GroupField>
<f:BoundField MinWidth="200px" ColumnID="FINAL_Status" DataField="FINAL_Status" HeaderText="FINAL Status" TextAlign="Center"/>
<f:BoundField MinWidth="200px" ColumnID="FINAL_Status" DataField="FINAL_Status" HeaderText="Mechanical FINAL Status" TextAlign="Center"/>
</Columns>
<Listeners>
SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.cs
+14 -8
View File
@@ -40,17 +40,23 @@ namespace FineUIPro.Web.Transfer
strSql += " AND INSTRUMENTATION like @INSTRUMENTATION";
listStr.Add(new SqlParameter("@INSTRUMENTATION", "%" + this.txtINSTRUMENTATION.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
if (!string.IsNullOrEmpty(ddStatus.SelectedValue))
{
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())));
strSql += " And FINAL_Status='" + ddStatus.SelectedValue + "' ";
}
//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";
SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.designer.cs
Generated
+2 -20
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 控件。
SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
+87 -73
View File
@@ -130,7 +130,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 7);
AddDatasetToSQL(ds.Tables[0], 9);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -157,9 +157,9 @@ namespace FineUIPro.Web.Transfer
string result = string.Empty;
int ic, ir;
ic = pds.Columns.Count;
if (ic < Cols)
if (ic != Cols)
{
ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning);
ShowNotify("导入Excel格式错误！Excel必须是" + Cols.ToString().Trim() + "列", MessageBoxIcon.Warning);
return false;
}
@@ -169,29 +169,11 @@ namespace FineUIPro.Web.Transfer
for (int i = 1; i < ir; i++)
{
string row4 = pds.Rows[i][4].ToString();
if (!string.IsNullOrEmpty(row4))
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() + "," + "Tag No" + "," + "不能为空！" + "|";
}
}
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], 9);
}
catch (Exception ex)
{
@@ -318,9 +300,9 @@ namespace FineUIPro.Web.Transfer
{
int ic, ir;
ic = pds.Columns.Count;
if (ic < Cols)
if (ic != Cols)
{
ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning);
ShowNotify("导入Excel格式错误！Excel只能有" + Cols.ToString().Trim() + "列", MessageBoxIcon.Warning);
}
string result = string.Empty;
ir = pds.Rows.Count;
@@ -331,58 +313,90 @@ namespace FineUIPro.Web.Transfer
{
if (!string.IsNullOrEmpty(pds.Rows[i][0].ToString().Trim()))
{
//查询第一列，没查到的情况下作导入处理
var modelOnly = Funs.DB.Transfer_Instrumentation.FirstOrDefault(x => x.INSTRUMENTATION == pds.Rows[i][0].ToString().Trim()
&& x.ProjectId == CurrUser.LoginProjectId);
if (modelOnly == null)
////查询第一列，没查到的情况下作导入处理
//var modelOnly = Funs.DB.Transfer_Instrumentation.FirstOrDefault(x => x.INSTRUMENTATION == pds.Rows[i][0].ToString().Trim()
//&& x.ProjectId == CurrUser.LoginProjectId);
//if (modelOnly == null)
//{
Model.Transfer_Instrumentation model = new Model.Transfer_Instrumentation();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.INSTRUMENTATION = 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.InstallationCalibration = pds.Rows[i][4].ToString().Trim();
var obj2 = model.PipingPressuretest = pds.Rows[i][5].ToString().Trim();
var obj3 = model.PipingLeak = pds.Rows[i][6].ToString().Trim();
var obj4 = model.PipingBlowing = pds.Rows[i][7].ToString().Trim();
var obj5 = model.Looptest = pds.Rows[i][8].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
listObj.Add(obj1);
listObj.Add(obj2);
listObj.Add(obj3);
listObj.Add(obj4);
listObj.Add(obj5);
//全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 5)
{
Model.Transfer_Instrumentation model = new Model.Transfer_Instrumentation();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.INSTRUMENTATION = 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.INSTRUMENTATION = 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 == 5)
{
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.INSTRUMENTATION = 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();
//}
}
}
SGGL/FineUIPro.Web/Transfer/Piping.aspx
+57 -33
View File
@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
</head>
<body>
@@ -22,17 +22,17 @@
<Toolbars>
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" ID="txtPIPINGLINENUMBER" Label="PIPINGLINENUMBER" LabelWidth="180px" LabelAlign="Right"></f:TextBox>
<f:TextBox runat="server" ID="txtPIPINGLINENUMBER" Label="Test Package No" LabelWidth="180px" LabelAlign="Right"></f:TextBox>
<f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px" LabelAlign="Right"></f:TextBox>
<f:TextBox runat="server" ID="txtSystem" Label="SYSTEM NO" LabelWidth="120px" LabelAlign="Right"></f:TextBox>
<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:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
</f:Button>
@@ -43,59 +43,83 @@
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:GroupField ID="g1" HeaderText="PIPING" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="PIPINGLINENUMBER" DataField="PIPINGLINENUMBER" FieldType="String" HeaderText="PIPING/LINE NUMBER" TextAlign="Center"
<f:RenderField ColumnID="PIPINGLINENUMBER" DataField="PIPINGLINENUMBER" FieldType="String" HeaderText="Test Package No" TextAlign="Center"
HeaderTextAlign="Center" Width="170px">
</f:RenderField>
</Columns>
</f:GroupField>
<f:GroupField ID="g2" HeaderText="SYSTEM AND TEST PACKAGE SELECTION" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="SYSTEM" TextAlign="Center"
<f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="SYSTEM No" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="Subsystem" DataField="Subsystem" FieldType="String" HeaderText="Subsystem" TextAlign="Center"
<f:RenderField ColumnID="Subsystem" DataField="Subsystem" FieldType="String" HeaderText="Sub-System" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Test Package" TextAlign="Center"
<f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Turn over Package" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
</Columns>
</f:GroupField>
<f:GroupField ID="g3" HeaderText="Test Package Schedule" HeaderTextAlign="Center">
<f:GroupField ID="g3" HeaderText="Ready for Test " HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="TestPackageSTART" DataField="TestPackageSTART" FieldType="Date" Renderer="Date" HeaderText="Test Package<br/>START" TextAlign="Center"
HeaderTextAlign="Center" Width="130px">
<f:RenderField ColumnID="PWD" DataField="PWD" FieldType="String" HeaderText="PWD" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="TestPackageFINISH" DataField="TestPackageFINISH" FieldType="Date" Renderer="Date" HeaderText="Test Package<br/>FINISH" TextAlign="Center"
HeaderTextAlign="Center" Width="130px">
<f:RenderField ColumnID="Apunchclosed" DataField="Apunchclosed" FieldType="String" HeaderText="A punch closed" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="NDTReport" DataField="NDTReport" FieldType="String" HeaderText="NDT Report" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="TemperaryMeasurement" DataField="TemperaryMeasurement" FieldType="String" HeaderText="Temperary<br/> Measurement" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="FWDfinished" DataField="FWDfinished" FieldType="String" HeaderText="FWD finished" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
</Columns>
</f:GroupField>
<f:GroupField ID="g4" HeaderText="PRE-TEST/CHECK" HeaderTextAlign="Center">
<f:GroupField ID="g4" HeaderText="Hydrostatic test schedule" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="PreTestFINISHED" DataField="PreTestFINISHED" FieldType="String" HeaderText="Ready for test" TextAlign="Center"
HeaderTextAlign="Center" Width="170px">
<f:RenderField ColumnID="HydrostaticTest" DataField="HydrostaticTest" FieldType="String" HeaderText="Hydrostatic Test<br/>(Golden joint) " TextAlign="Center"
HeaderTextAlign="Center" Width="160px">
</f:RenderField>
<f:RenderField ColumnID="FINALStatus" DataField="FINALStatus" FieldType="String" HeaderText="FINAL Status" TextAlign="Center"
HeaderTextAlign="Center" Width="130px">
<f:RenderField ColumnID="Report" DataField="Report" FieldType="String" HeaderText="Report" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
</Columns>
</f:GroupField>
<f:GroupField ID="g5" HeaderText="WITNESS TEST/CHECK<br/>BY OWNER" HeaderTextAlign="Center">
<f:GroupField ID="g5" HeaderText="Pre-Commissioning" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="FinalTestFINISHED" DataField="FinalTestFINISHED" FieldType="String" HeaderText="Final Test FINISHED?" ExpandUnusedSpace="true" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
<f:RenderField ColumnID="Blowingflushing" DataField="Blowingflushing" FieldType="String" HeaderText="Blowing /flushing &<br/> Dry out" TextAlign="Center"
HeaderTextAlign="Center" Width="160px">
</f:RenderField>
<f:RenderField ColumnID="Systemreinstalled" DataField="Systemreinstalled" FieldType="String" HeaderText="System reinstalled" TextAlign="Center"
HeaderTextAlign="Center" Width="150px">
</f:RenderField>
<f:RenderField ColumnID="BlowingReport" DataField="BlowingReport" FieldType="String" HeaderText="Blowing & flushing<br/> Report" TextAlign="Center"
HeaderTextAlign="Center" Width="150px">
</f:RenderField>
</Columns>
</f:GroupField>
<f:RenderField ColumnID="FINALStatus" DataField="FINALStatus" FieldType="String" HeaderText="Final Status" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="120px">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
SGGL/FineUIPro.Web/Transfer/Piping.aspx.cs
+12 -8
View File
@@ -39,15 +39,19 @@ namespace FineUIPro.Web.Transfer
strSql += " AND PIPINGLINENUMBER like @PIPINGLINENUMBER";
listStr.Add(new SqlParameter("@PIPINGLINENUMBER", "%" + this.txtPIPINGLINENUMBER.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
//if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
//{
// strSql += " AND TestPackageSTART >= @InspectionDateA";
// listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
//}
//if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
//{
// strSql += " AND TestPackageSTART <= @InspectionDateZ";
// listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
//}
if (!string.IsNullOrEmpty(ddStatus.SelectedValue))
{
strSql += " AND TestPackageSTART >= @InspectionDateA";
listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
}
if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
{
strSql += " AND TestPackageSTART <= @InspectionDateZ";
listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
strSql += " And FINALStatus='" + ddStatus.SelectedValue + "' ";
}
if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
{
SGGL/FineUIPro.Web/Transfer/Piping.aspx.designer.cs
Generated
+2 -29
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 控件。
@@ -122,15 +104,6 @@ namespace FineUIPro.Web.Transfer
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary>
/// lblPageIndex 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblPageIndex;
/// <summary>
/// g1 控件。
/// </summary>
SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs
+97 -74
View File
@@ -126,7 +126,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 9);
AddDatasetToSQL(ds.Tables[0], 13);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -164,30 +164,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 + 3).ToString() + "," + "Test Package START" + "," + "[" + row4 + "]错误！不是日期格式！" + "|";
}
}
string row5 = pds.Rows[i][5].ToString();
if (!string.IsNullOrEmpty(row4))
{
try
{
DateTime date = Convert.ToDateTime(row5.Trim());
}
catch (Exception)
{
result += (i + 3).ToString() + "," + "Test Package FINISH" + "," + "[" + row5 + "]错误！不是日期格式！" + "|";
}
result += (i + 3).ToString() + "," + "Test Package No" + "," + "不能为空！" + "|";
}
}
if (!string.IsNullOrEmpty(result))
{
@@ -294,7 +276,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 9);
AddDatasetToSQL2(ds.Tables[0], 13);
}
catch (Exception ex)
{
@@ -325,61 +307,102 @@ namespace FineUIPro.Web.Transfer
List<Model.Transfer_Piping> list = new List<Model.Transfer_Piping>();
for (int i = 1; i < ir; i++)
{
//查询第一列，没查到的情况下作导入处理
var modelOnly = Funs.DB.Transfer_Piping.FirstOrDefault(x => x.PIPINGLINENUMBER == pds.Rows[i][0].ToString().Trim()
&& x.ProjectId == CurrUser.LoginProjectId);
if (modelOnly == null)
////查询第一列，没查到的情况下作导入处理
//var modelOnly = Funs.DB.Transfer_Piping.FirstOrDefault(x => x.PIPINGLINENUMBER == pds.Rows[i][0].ToString().Trim()
//&& x.ProjectId == CurrUser.LoginProjectId);
//if (modelOnly == null)
//{
Model.Transfer_Piping model = new Model.Transfer_Piping();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.PIPINGLINENUMBER = pds.Rows[i][0].ToString().Trim();
model.SYSTEM = pds.Rows[i][1].ToString().Trim();
model.Subsystem = pds.Rows[i][2].ToString().Trim();
model.TestPackage = pds.Rows[i][3].ToString().Trim();
var obj1 = model.PWD= pds.Rows[i][4].ToString().Trim();
var obj2 =model.Apunchclosed = pds.Rows[i][5].ToString().Trim();
var obj3 =model.NDTReport = pds.Rows[i][6].ToString().Trim();
var obj4 =model.TemperaryMeasurement = pds.Rows[i][7].ToString().Trim();
var obj5 =model.FWDfinished = pds.Rows[i][8].ToString().Trim();
var obj6 =model.HydrostaticTest = pds.Rows[i][9].ToString().Trim();
var obj7 =model.Report = pds.Rows[i][10].ToString().Trim();
var obj8 =model.Blowingflushing = pds.Rows[i][11].ToString().Trim();
var obj9 = model.Systemreinstalled = pds.Rows[i][12].ToString().Trim();
model.BlowingReport= pds.Rows[i][13].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
listObj.Add(obj1);
listObj.Add(obj2);
listObj.Add(obj3);
listObj.Add(obj4);
listObj.Add(obj5);
listObj.Add(obj6);
listObj.Add(obj7);
listObj.Add(obj8);
listObj.Add(obj9);
//全是NA或Completed 状态是Completed
if (listObj.Where(x=>x=="NA" || x== "Completed").ToList().Count==9)
{
Model.Transfer_Piping model = new Model.Transfer_Piping();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.PIPINGLINENUMBER = pds.Rows[i][0].ToString().Trim();
model.SYSTEM = pds.Rows[i][1].ToString().Trim();
model.Subsystem = pds.Rows[i][2].ToString().Trim();
model.TestPackage = 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.TestPackageSTART = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
model.TestPackageFINISH = t2;
model.FINALStatus = pds.Rows[i][6].ToString().Trim();
if (model.FINALStatus.ToLower()== "finished")
{
model.CompleteTime = DateTime.Now;
}
model.PreTestFINISHED = pds.Rows[i][7].ToString().Trim();
model.FinalTestFINISHED = pds.Rows[i][8].ToString().Trim();
model.FINALStatus = "Completed";
list.Add(model);
continue ;
}
else
{
//修改
modelOnly.PIPINGLINENUMBER = pds.Rows[i][0].ToString().Trim();
modelOnly.SYSTEM = pds.Rows[i][1].ToString().Trim();
modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
modelOnly.TestPackage = 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.TestPackageSTART = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
modelOnly.TestPackageFINISH = t2;
//更改前不是finished，更改后是finished的，才修改实际完成时间
if (modelOnly.FINALStatus.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
{
modelOnly.CompleteTime = DateTime.Now;
}
modelOnly.FINALStatus = pds.Rows[i][6].ToString().Trim();
//if (modelOnly.FINALStatus.ToLower() == "finished")
//{
// modelOnly.CompleteTime = DateTime.Now;
//}
modelOnly.PreTestFINISHED = pds.Rows[i][7].ToString().Trim();
modelOnly.FinalTestFINISHED = pds.Rows[i][8].ToString().Trim();
Funs.DB.SubmitChanges();
//如果全是Not Start 就是 Not Start
if (listObj.Where(x=>x== "Not Start").ToList().Count==9)
{
model.FINALStatus = "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.FINALStatus = "In progress";
list.Add(model);
continue;
}
model.FINALStatus = "Not Start";
list.Add(model);
#endregion
//}
//else
//{
// //修改
// modelOnly.PIPINGLINENUMBER = pds.Rows[i][0].ToString().Trim();
// modelOnly.SYSTEM = pds.Rows[i][1].ToString().Trim();
// modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
// modelOnly.TestPackage = 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.TestPackageSTART = t1;
// if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
// modelOnly.TestPackageFINISH = t2;
// //更改前不是finished，更改后是finished的，才修改实际完成时间
// if (modelOnly.FINALStatus.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
// {
// modelOnly.CompleteTime = DateTime.Now;
// }
// modelOnly.FINALStatus = pds.Rows[i][6].ToString().Trim();
// //if (modelOnly.FINALStatus.ToLower() == "finished")
// //{
// // modelOnly.CompleteTime = DateTime.Now;
// //}
// modelOnly.PreTestFINISHED = pds.Rows[i][7].ToString().Trim();
// modelOnly.FinalTestFINISHED = pds.Rows[i][8].ToString().Trim();
// Funs.DB.SubmitChanges();
//}
}
if (list.Count > 0)
{
SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
+47 -45
View File
@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
</head>
<body>
@@ -22,17 +22,24 @@
<Toolbars>
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" ID="txtRotatingEquipment" Label="Rotating Equipment" LabelWidth="180px" LabelAlign="Right"></f:TextBox>
<f:TextBox runat="server" ID="txtRotatingEquipment" Label="Tag. No" LabelWidth="120px" LabelAlign="Right"></f:TextBox>
<f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px" LabelAlign="Right"></f:TextBox>
<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: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>
@@ -43,49 +50,44 @@
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
<%-- <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:GroupField ID="g1" HeaderText="MECHANICAL" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="RotatingEquipment" DataField="RotatingEquipment" FieldType="String" HeaderText="Rotating Equipment" TextAlign="Center"
HeaderTextAlign="Center" Width="170px">
</f:RenderField>
</Columns>
</f:GroupField>
<f:GroupField ID="g2" HeaderText="SYSTEM AND TEST PACKAGE SELECTION" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="SYSTEM" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="Subsystem" DataField="Subsystem" FieldType="String" HeaderText="Subsystem" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Test Package" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
</Columns>
</f:GroupField>
<f:GroupField ID="g3" HeaderText="Test Package Schedule" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="TestPackageSTART" DataField="TestPackageSTART" FieldType="Date" Renderer="Date" HeaderText="Test Package<br/>START" TextAlign="Center"
HeaderTextAlign="Center" Width="130px">
</f:RenderField>
<f:RenderField ColumnID="TestPackageFINISH" DataField="TestPackageFINISH" FieldType="Date" Renderer="Date" HeaderText="Test Package<br/>FINISH" TextAlign="Center"
HeaderTextAlign="Center" Width="130px">
</f:RenderField>
</Columns>
</f:GroupField>
<f:GroupField ID="g5" HeaderText="" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="MechanicalFINALStatus" DataField="MechanicalFINALStatus" FieldType="String" HeaderText="Mechanical FINAL Status" ExpandUnusedSpace="true" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
</Columns>
</f:GroupField>
</f:TemplateField>--%>
<f:RenderField ColumnID="RotatingEquipment" DataField="RotatingEquipment" FieldType="String" HeaderText="Tag. No" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="System" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="Subsystem" DataField="Subsystem" FieldType="String" HeaderText="Sub-System" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Turn over Package" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="Alignment" DataField="Alignment" FieldType="String" HeaderText="Alignment" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="Motorsoloruntest" DataField="Motorsoloruntest" FieldType="String" HeaderText="Motor solorun test" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="Standalonetest" DataField="Standalonetest" FieldType="String" HeaderText="Standalone test" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="MechanicalFINALStatus" DataField="MechanicalFINALStatus" FieldType="String" HeaderText="FINAL Status" ExpandUnusedSpace="true" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs
+14 -8
View File
@@ -39,16 +39,22 @@ namespace FineUIPro.Web.Transfer
strSql += " AND RotatingEquipment like @RotatingEquipment";
listStr.Add(new SqlParameter("@RotatingEquipment", "%" + this.txtRotatingEquipment.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
if (!string.IsNullOrEmpty(ddStatus.SelectedValue))
{
strSql += " AND TestPackageSTART >= @InspectionDateA";
listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
}
if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
{
strSql += " AND TestPackageSTART <= @InspectionDateZ";
listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
strSql += " And MechanicalFINALStatus='" + ddStatus.SelectedValue + "' ";
}
//if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
//{
// strSql += " AND TestPackageSTART >= @InspectionDateA";
// listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
//}
//if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
//{
// strSql += " AND TestPackageSTART <= @InspectionDateZ";
// listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
//}
if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
{
strSql += " AND SYSTEM like @SYSTEM";
SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs
Generated
+2 -65
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 控件。
@@ -122,51 +104,6 @@ namespace FineUIPro.Web.Transfer
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary>
/// lblPageIndex 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblPageIndex;
/// <summary>
/// g1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupField g1;
/// <summary>
/// g2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupField g2;
/// <summary>
/// g3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupField g3;
/// <summary>
/// g5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupField g5;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs
+87 -71
View File
@@ -153,9 +153,9 @@ namespace FineUIPro.Web.Transfer
string result = string.Empty;
int ic, ir;
ic = pds.Columns.Count;
if (ic < Cols)
if (ic != Cols)
{
ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning);
ShowNotify("导入Excel格式错误！Excel必须是" + Cols.ToString().Trim() + "列", MessageBoxIcon.Warning);
return false;
}
@@ -164,30 +164,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 + 3).ToString() + "," + "Test Package START" + "," + "[" + row4 + "]错误！不是日期格式！" + "|";
}
}
string row5 = pds.Rows[i][5].ToString();
if (!string.IsNullOrEmpty(row4))
{
try
{
DateTime date = Convert.ToDateTime(row5.Trim());
}
catch (Exception)
{
result += (i + 3).ToString() + "," + "Test Package FINISH" + "," + "[" + row5 + "]错误！不是日期格式！" + "|";
}
result += (i + 3).ToString() + "," + "Tag. No" + "," + "不能为空！" + "|";
}
}
if (!string.IsNullOrEmpty(result))
{
@@ -325,58 +307,92 @@ namespace FineUIPro.Web.Transfer
List<Model.Transfer_RotatingEquipment> list = new List<Model.Transfer_RotatingEquipment>();
for (int i = 1; i < ir; i++)
{
//查询第一列，没查到的情况下作导入处理
var modelOnly = Funs.DB.Transfer_RotatingEquipment.FirstOrDefault(x => x.RotatingEquipment == pds.Rows[i][0].ToString().Trim()
&& x.ProjectId == CurrUser.LoginProjectId);
if (modelOnly == null)
{
Model.Transfer_RotatingEquipment model = new Model.Transfer_RotatingEquipment();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.RotatingEquipment = pds.Rows[i][0].ToString().Trim();
model.SYSTEM = pds.Rows[i][1].ToString().Trim();
model.Subsystem = pds.Rows[i][2].ToString().Trim();
model.TestPackage = 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.TestPackageSTART = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
model.TestPackageFINISH = t2;
////查询第一列，没查到的情况下作导入处理
//var modelOnly = Funs.DB.Transfer_RotatingEquipment.FirstOrDefault(x => x.RotatingEquipment == pds.Rows[i][0].ToString().Trim()
//&& x.ProjectId == CurrUser.LoginProjectId);
//if (modelOnly == null)
//{
Model.Transfer_RotatingEquipment model = new Model.Transfer_RotatingEquipment();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.RotatingEquipment = pds.Rows[i][0].ToString().Trim();
model.SYSTEM = pds.Rows[i][1].ToString().Trim();
model.Subsystem = pds.Rows[i][2].ToString().Trim();
model.TestPackage = pds.Rows[i][3].ToString().Trim();
model.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
if (model.MechanicalFINALStatus.ToLower() == "finished")
{
model.CompleteTime = DateTime.Now;
}
var obj1 = model.Alignment = pds.Rows[i][4].ToString().Trim();
var obj2 = model.Motorsoloruntest = pds.Rows[i][5].ToString().Trim();
var obj3 = model.Standalonetest = 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.MechanicalFINALStatus = "Completed";
list.Add(model);
continue;
}
else
//如果全是Not Start 就是 Not Start
if (listObj.Where(x => x == "Not Start").ToList().Count == 3)
{
//修改
modelOnly.RotatingEquipment = pds.Rows[i][0].ToString().Trim();
modelOnly.SYSTEM = pds.Rows[i][1].ToString().Trim();
modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
modelOnly.TestPackage = 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.TestPackageSTART = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
modelOnly.TestPackageFINISH = t2;
//更改前不是finished，更改后是finished的，才修改实际完成时间
if (modelOnly.MechanicalFINALStatus.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
{
modelOnly.CompleteTime = DateTime.Now;
}
modelOnly.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
//if (modelOnly.MechanicalFINALStatus.ToLower() == "finished")
//{
// modelOnly.CompleteTime = DateTime.Now;
//}
Funs.DB.SubmitChanges();
model.MechanicalFINALStatus = "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.MechanicalFINALStatus = "In progress";
list.Add(model);
continue;
}
model.MechanicalFINALStatus = "Not Start";
list.Add(model);
#endregion
model.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
if (model.MechanicalFINALStatus.ToLower() == "finished")
{
model.CompleteTime = DateTime.Now;
}
list.Add(model);
//}
//else
//{
// //修改
// modelOnly.RotatingEquipment = pds.Rows[i][0].ToString().Trim();
// modelOnly.SYSTEM = pds.Rows[i][1].ToString().Trim();
// modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
// modelOnly.TestPackage = 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.TestPackageSTART = t1;
// if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
// modelOnly.TestPackageFINISH = t2;
// //更改前不是finished，更改后是finished的，才修改实际完成时间
// if (modelOnly.MechanicalFINALStatus.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
// {
// modelOnly.CompleteTime = DateTime.Now;
// }
// modelOnly.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
// //if (modelOnly.MechanicalFINALStatus.ToLower() == "finished")
// //{
// // modelOnly.CompleteTime = DateTime.Now;
// //}
// Funs.DB.SubmitChanges();
//}
}
if (list.Count > 0)
{
SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
+26 -14
View File
@@ -22,17 +22,24 @@
<Toolbars>
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" ID="txtStaticEquipment" Label="Static Equipment" LabelWidth="180px" LabelAlign="Right"></f:TextBox>
<f:TextBox runat="server" ID="txtStaticEquipment" Label="Tag No" LabelWidth="100px" LabelAlign="Right"></f:TextBox>
<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: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: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>
@@ -43,39 +50,44 @@
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
<%-- <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</f:TemplateField>--%>
<f:GroupField ID="g1" HeaderText="MECHANICAL" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="StaticEquipment" DataField="StaticEquipment" FieldType="String" HeaderText="Static Equipment" TextAlign="Center"
HeaderTextAlign="Center" Width="170px">
<f:RenderField ColumnID="StaticEquipment" DataField="StaticEquipment" FieldType="String" HeaderText="Tag No" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
</Columns>
</f:GroupField>
<f:GroupField ID="g2" HeaderText="SYSTEM AND TEST PACKAGE SELECTION" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="SYSTEM" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
HeaderTextAlign="Center" Width="160px">
</f:RenderField>
<f:RenderField ColumnID="Subsystem" DataField="Subsystem" FieldType="String" HeaderText="Subsystem" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
HeaderTextAlign="Center" Width="160px">
</f:RenderField>
<f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Test Package" TextAlign="Center"
<f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Turn over Package" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
</Columns>
</f:GroupField>
<f:GroupField ID="g3" HeaderText="Test Package Schedule" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="TestPackageSTART" DataField="TestPackageSTART" FieldType="Date" Renderer="Date" HeaderText="Test Package<br/>START" TextAlign="Center"
HeaderTextAlign="Center" Width="130px">
<f:RenderField ColumnID="Internalinspection" DataField="Internalinspection" FieldType="String" HeaderText="Internal inspection " TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="TestPackageFINISH" DataField="TestPackageFINISH" FieldType="Date" Renderer="Date" HeaderText="Test Package<br/>FINISH" TextAlign="Center"
HeaderTextAlign="Center" Width="130px">
<f:RenderField ColumnID="InternalsPacking" DataField="InternalsPacking" FieldType="String" HeaderText="Internals/Packing<br/> installation " TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="BOXupRecord" DataField="BOXupRecord" FieldType="String" HeaderText="BOX-up Record" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
</Columns>
</f:GroupField>
SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs
+14 -10
View File
@@ -39,22 +39,26 @@ namespace FineUIPro.Web.Transfer
strSql += " AND StaticEquipment like @StaticEquipment";
listStr.Add(new SqlParameter("@StaticEquipment", "%" + this.txtStaticEquipment.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
{
strSql += " AND TestPackageSTART >= @InspectionDateA";
listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
}
if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
{
strSql += " AND TestPackageSTART <= @InspectionDateZ";
listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
}
//if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
//{
// strSql += " AND TestPackageSTART >= @InspectionDateA";
// listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
//}
//if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
//{
// strSql += " AND TestPackageSTART <= @InspectionDateZ";
// listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
//}
if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
{
strSql += " AND SYSTEM like @SYSTEM";
listStr.Add(new SqlParameter("@SYSTEM", "%" + this.txtSystem.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(ddStatus.SelectedValue))
{
strSql += " And MechanicalFINALStatus='" + ddStatus.SelectedValue + "' ";
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs
Generated
+2 -29
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 控件。
@@ -122,15 +104,6 @@ namespace FineUIPro.Web.Transfer
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary>
/// lblPageIndex 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblPageIndex;
/// <summary>
/// g1 控件。
/// </summary>
SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs
+90 -68
View File
@@ -164,30 +164,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 + 3).ToString() + "," + "Test Package START" + "," + "[" + row4 + "]错误！不是日期格式！" + "|";
}
}
string row5 = pds.Rows[i][5].ToString();
if (!string.IsNullOrEmpty(row4))
{
try
{
DateTime date = Convert.ToDateTime(row5.Trim());
}
catch (Exception)
{
result += (i + 3).ToString() + "," + "Test Package FINISH" + "," + "[" + row5 + "]错误！不是日期格式！" + "|";
}
result += (i + 3).ToString() + "," + "Tag No" + "," + "不能为空！" + "|";
}
}
if (!string.IsNullOrEmpty(result))
{
@@ -325,57 +307,97 @@ namespace FineUIPro.Web.Transfer
List<Model.Transfer_StaticEquipment> list = new List<Model.Transfer_StaticEquipment>();
for (int i = 1; i < ir; i++)
{
//查询第一列，没查到的情况下作导入处理
var modelOnly = Funs.DB.Transfer_StaticEquipment.FirstOrDefault(x => x.StaticEquipment == pds.Rows[i][0].ToString().Trim()
&& x.ProjectId == CurrUser.LoginProjectId);
if (modelOnly == null)
////查询第一列，没查到的情况下作导入处理
//var modelOnly = Funs.DB.Transfer_StaticEquipment.FirstOrDefault(x => x.StaticEquipment == pds.Rows[i][0].ToString().Trim()
//&& x.ProjectId == CurrUser.LoginProjectId);
//if (modelOnly == null)
//{
Model.Transfer_StaticEquipment model = new Model.Transfer_StaticEquipment();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.StaticEquipment = pds.Rows[i][0].ToString().Trim();
model.SYSTEM = pds.Rows[i][1].ToString().Trim();
model.Subsystem = pds.Rows[i][2].ToString().Trim();
model.TestPackage = pds.Rows[i][3].ToString().Trim();
var obj1 = model.Internalinspection = pds.Rows[i][4].ToString().Trim();
var obj2 = model.InternalsPacking = pds.Rows[i][5].ToString().Trim();
var obj3 = model.BOXupRecord = 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_StaticEquipment model = new Model.Transfer_StaticEquipment();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.StaticEquipment = pds.Rows[i][0].ToString().Trim();
model.SYSTEM = pds.Rows[i][1].ToString().Trim();
model.Subsystem = pds.Rows[i][2].ToString().Trim();
model.TestPackage = 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.TestPackageSTART = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
model.TestPackageFINISH = t2;
model.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
if (model.MechanicalFINALStatus.ToLower() == "finished")
{
model.CompleteTime = DateTime.Now;
}
model.MechanicalFINALStatus = "Completed";
list.Add(model);
continue;
}
else
{
//修改
modelOnly.StaticEquipment = pds.Rows[i][0].ToString().Trim();
modelOnly.SYSTEM = pds.Rows[i][1].ToString().Trim();
modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
modelOnly.TestPackage = 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.TestPackageSTART = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
modelOnly.TestPackageFINISH = t2;
//更改前不是finished，更改后是finished的，才修改实际完成时间
if (modelOnly.MechanicalFINALStatus.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
{
modelOnly.CompleteTime = DateTime.Now;
}
modelOnly.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
//if (modelOnly.MechanicalFINALStatus.ToLower() == "finished")
//{
// modelOnly.CompleteTime = DateTime.Now;
//}
Funs.DB.SubmitChanges();
//如果全是Not Start 就是 Not Start
if (listObj.Where(x => x == "Not Start").ToList().Count == 3)
{
model.MechanicalFINALStatus = "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.MechanicalFINALStatus = "In progress";
list.Add(model);
continue;
}
model.MechanicalFINALStatus = "Not Start";
list.Add(model);
#endregion
//DateTime t1, t2;
//if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
// model.TestPackageSTART = t1;
//if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
// model.TestPackageFINISH = t2;
//model.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
//if (model.MechanicalFINALStatus.ToLower() == "finished")
//{
// model.CompleteTime = DateTime.Now;
//}
list.Add(model);
//}
//else
//{
// //修改
// modelOnly.StaticEquipment = pds.Rows[i][0].ToString().Trim();
// modelOnly.SYSTEM = pds.Rows[i][1].ToString().Trim();
// modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
// modelOnly.TestPackage = 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.TestPackageSTART = t1;
// if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
// modelOnly.TestPackageFINISH = t2;
// //更改前不是finished，更改后是finished的，才修改实际完成时间
// if (modelOnly.MechanicalFINALStatus.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
// {
// modelOnly.CompleteTime = DateTime.Now;
// }
// modelOnly.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
// //if (modelOnly.MechanicalFINALStatus.ToLower() == "finished")
// //{
// // modelOnly.CompleteTime = DateTime.Now;
// //}
// Funs.DB.SubmitChanges();
//}
}
if (list.Count > 0)
{