移交递增报表

DataBase/版本日志/SGGLDB_WH_2024-02-02-01-phf.sql

@@ -0,0 +1,86 @@
+Alter VIEW [dbo].[View_TransferDetail]  AS 
+/*Òƽ»¹ÜÀíÁбíÊÓͼ*/
+
+select Projectid,SystemName,Subsystem,TestPackage,sDate,fDate,Status,aDate from (
+
+SELECT Projectid, SYSTEM as SystemName, Subsystem ,TestPackage,
+TestPackageSTART as sDate,TestPackageFINISH as fDate,FINALStatus as Status,
+CompleteTime as aDate
+FROM Transfer_Piping
+
+UNION ALL
+
+SELECT Projectid,SYSTEM as SystemName, Subsystem ,TestPackage,TestPackageSTART as sDate,
+TestPackageFINISH as fDate,
+MechanicalFINALStatus as Status ,
+CompleteTime as aDate
+FROM Transfer_StaticEquipment
+
+UNION ALL
+
+SELECT Projectid,SYSTEM as SystemName, Subsystem ,TestPackage,TestPackageSTART as sDate,
+TestPackageFINISH as fDate,
+MechanicalFINALStatus as Status,
+CompleteTime as aDate 
+FROM Transfer_RotatingEquipment
+
+UNION ALL
+
+SELECT Projectid,SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+Test_Package_FINISH as fDate,
+FINAL_Status as Status,
+CompleteTime as aDate 
+FROM Transfer_Instrumentation
+
+UNION ALL
+
+SELECT Projectid,SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+Test_Package_FINISH as fDate,
+FINAL_Status as Status,
+CompleteTime as aDate 
+FROM Transfer_Electrical
+
+UNION ALL
+
+SELECT Projectid,SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+Test_Package_FINISH as fDate,
+FINAL_Status as Status,
+CompleteTime as aDate 
+FROM Transfer_Civil_Structure
+
+UNION ALL
+
+SELECT Projectid,SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+Test_Package_FINISH as fDate,
+FINAL_Status as Status,
+CompleteTime as aDate 
+FROM Transfer_Firefighting
+
+UNION ALL
+
+SELECT Projectid,SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+Test_Package_FINISH as fDate,
+FINAL_Status as Status,
+CompleteTime as aDate 
+FROM Transfer_Telecom
+
+UNION ALL
+
+SELECT Projectid,SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+Test_Package_FINISH as fDate,
+FINAL_Status as Status,
+CompleteTime as aDate 
+FROM Transfer_Plumbing
+
+UNION ALL
+
+SELECT Projectid,SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+Test_Package_FINISH as fDate,
+FINAL_Status as Status,
+CompleteTime as aDate 
+FROM Transfer_HVAC
+
+)f
+
+
+GO

DataBase/菜单初始化脚本/1-14移交管理图表（Menu_Transfer）.sql

@@ -12,5 +12,9 @@ INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffi
 VALUES('C2DD3E9E-DB18-466F-8FA0-19AD6E21EEF0','Punchlist from',
 'Transfer/Chart/PunchlistFrom.aspx',20,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
 
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('F97BCF55-E450-4007-AD84-AB64B3496204','全厂移交统计递增表',
+'Transfer/Chart/TransferChart.aspx',15,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
+
 
 

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -1833,6 +1833,7 @@
     <Content Include="TestRun\TestRunManage\TestRunRecordUploadList.aspx" />
     <Content Include="Transfer\Chart\Instrumentation.aspx" />
     <Content Include="Transfer\Chart\PunchlistFrom.aspx" />
+    <Content Include="Transfer\Chart\TransferChart.aspx" />
     <Content Include="Transfer\CivilStructure.aspx" />
     <Content Include="Transfer\CivilStructureDataIn.aspx" />
     <Content Include="Transfer\Electrical.aspx" />
@@ -16378,6 +16379,13 @@
     <Compile Include="Transfer\Chart\PunchlistFrom.aspx.designer.cs">
       <DependentUpon>PunchlistFrom.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Transfer\Chart\TransferChart.aspx.cs">
+      <DependentUpon>TransferChart.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\Chart\TransferChart.aspx.designer.cs">
+      <DependentUpon>TransferChart.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Transfer\CivilStructure.aspx.cs">
       <DependentUpon>CivilStructure.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx

@@ -0,0 +1,96 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TransferChart.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.TransferChart" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>全厂移交统计递增表</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="RegionPanel1" AjaxAspnetControls="divAnalyse,divCheck" />
+
+        <f:RegionPanel ID="RegionPanel1" ShowBorder="false" runat="server" Margin="5px">
+            <Regions>
+                   
+                <f:Region ID="Region1" ShowBorder="false" ShowHeader="false" RegionPosition="Top"
+                    BodyPadding="0 5 0 0" Width="200px" Layout="Fit" runat="server" EnableCollapse="true">
+                    <Items>
+                        <f:Form ID="Form2" ShowHeader="false" ShowBorder="false" runat="server">
+                            <Rows>
+                                <f:FormRow>
+                                    <Items>
+                                        <f:DropDownList ID="drpType" runat="server" Label="分类" AutoPostBack="true"
+                                             Width="100px" LabelWidth="80px">
+                                            <f:ListItem Value="" Text="全部"  Selected="true"></f:ListItem>
+                                            <f:ListItem Value="Piping" Text="Piping"></f:ListItem>
+                                            <f:ListItem Value="Static Equipment" Text="Static Equipment"></f:ListItem>
+                                            <f:ListItem Value="Rotating Equipment" Text="Rotating Equipment"></f:ListItem>
+                                            <f:ListItem Value="Instrumentation" Text="Instrumentation"></f:ListItem>
+                                            <f:ListItem Value="Electrical" Text="Electrical"></f:ListItem>
+                                            <f:ListItem Value="Civil Structure" Text="Civil Structure"></f:ListItem>
+                                            <f:ListItem Value="Firefighting" Text="Firefighting"></f:ListItem>
+                                            <f:ListItem Value="Telecom" Text="Telecom"></f:ListItem>
+                                            <f:ListItem Value="Plumbing" Text="Plumbing"></f:ListItem>
+                                            <f:ListItem Value="HVAC" Text="HVAC"></f:ListItem>
+
+                                        </f:DropDownList>
+
+                                        <%--<f:DropDownList ID="drpdateType" runat="server" Label="日期类型" AutoPostBack="true"
+                                            OnSelectedIndexChanged="drpdateType_SelectedIndexChanged" Width="100px" LabelWidth="80px">
+                                            <f:ListItem Value="0" Text="按年月"  Selected="true"></f:ListItem>
+                                            <f:ListItem Value="1" Text="按日期"></f:ListItem>
+                                        </f:DropDownList>--%>
+
+                                        <f:DatePicker runat="server" Label="完成时间" ID="txtStarTime" EnableEdit="true" LabelWidth="80px" DateFormatString="yyyy-MM" DisplayType="Month"></f:DatePicker>
+
+                                        <f:DatePicker runat="server" ID="txtEndTime" EnableEdit="true" LabelWidth="80px" DateFormatString="yyyy-MM" DisplayType="Month"></f:DatePicker>
+
+                                       <%-- <f:DatePicker runat="server" Label="完成时间" ID="txtStarTime1" EnableEdit="true" LabelWidth="80px" Hidden="true"></f:DatePicker>
+
+                                        <f:DatePicker runat="server" ID="txtEndTime1" EnableEdit="true" LabelWidth="80px" Hidden="true"></f:DatePicker>--%>
+
+                                       <%-- <f:DropDownList ID="drpChartType" runat="server" Label="图形类型" AutoPostBack="true"
+                                            OnSelectedIndexChanged="drpChartType_SelectedIndexChanged" Width="300px" LabelWidth="80px">
+                                            <f:ListItem Value="Column" Text="柱形图"  Selected="true"></f:ListItem>
+                                            <f:ListItem Value="Line" Text="折线图"></f:ListItem>
+                                        </f:DropDownList>--%>
+
+
+                                        <f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click"></f:Button>
+
+
+                                    </Items>
+                                </f:FormRow>
+                            </Rows>
+                        </f:Form>
+                    </Items>
+                </f:Region>
+                <f:Region ID="Region2" ShowBorder="false" ShowHeader="false" Position="Center" Layout="VBox" AutoScroll="true" 
+                    BoxConfigAlign="Stretch" BoxConfigPosition="Left" runat="server">
+                    <Items>
+                        <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="800px" ShowBorder="true"
+                            TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
+                            <Tabs>
+                                <f:Tab ID="Tab2" Title="图表" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" AutoScroll="true"
+                                    runat="server" TitleToolTip="按图形显示">
+                                    <Items>
+                                        <f:ContentPanel ShowHeader="false" runat="server" ID="cpCostTime" Margin="0 0 0 0" CssStyle="margin-left:200px">
+                                            <div id="divAnalyse">
+                                                <uc1:ChartControl ID="ChartUc" runat="server" />
+                                            </div>
+                                        </f:ContentPanel>
+                                    </Items>
+
+                                    
+                                </f:Tab>
+                            </Tabs>
+                        </f:TabStrip>
+                    </Items>
+                </f:Region>
+            </Regions>
+        </f:RegionPanel>
+    </form>
+</body>
+</html>

SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.cs

@@ -0,0 +1,155 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using BLL;
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class TransferChart : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]))
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+
+                //this.AnalyseData();
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// 统计分析
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void BtnAnalyse_Click(object sender, EventArgs e)
+        {
+            this.AnalyseData();
+        }
+
+        #region 统计
+        private void AnalyseData() {
+            if (string.IsNullOrEmpty(ProjectId))
+            {
+                Alert.ShowInTop("项目未获取到，请刷新页面。", MessageBoxIcon.Warning);
+                return;
+            }
+            var sTime = DateTime.Now.AddDays(-7);
+            var eTime = DateTime.Now;
+            if (string.IsNullOrEmpty(txtStarTime.Text) || string.IsNullOrEmpty(txtEndTime.Text))
+            {
+                Alert.ShowInTop("请选择日期。", MessageBoxIcon.Warning);
+                return;
+            }
+            else
+            {
+                sTime = Convert.ToDateTime(txtStarTime.Text);
+
+                eTime = Convert.ToDateTime(txtEndTime.Text).AddMonths(1).AddDays(-1);
+            }
+            var AfinishedCountSum = 0;//总的实际完成数量
+            var PfinishedCountSum = 0;//总的计划完成数量
+            switch (drpType.SelectedValue)
+            {
+                #region 全部
+                case "":
+                    //根据当前计划完成日期 查询总的计划完成的数量
+                    var systemListbyDate = Funs.DB.View_TransferDetail.Where(x => x.Projectid == ProjectId
+                                 && x.FDate >= sTime
+                                 && x.FDate < eTime
+                                 && x.Status.ToLower() == "finished").ToList();
+                    //查询TestPackage 去重
+                    var testpackageList = (from x in systemListbyDate select x.TestPackage).Distinct();
+
+                    foreach (var item in testpackageList) {
+                        //查询第12个表的数量
+                        var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                         && x.Test_Package == item
+                        ).ToList();
+                        //如果查到
+                        if (punchlistFromList.Count > 0)
+                        {
+                            //12表当前日期完成的数量
+                            var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                            //如果完成的数量等于总得数量，则是完成
+                            if (punchlistFromFinshCount == punchlistFromList.Count)
+                            {
+                                PfinishedCountSum += 1;
+                            }
+                        }
+                        else {
+                            PfinishedCountSum += 1;
+                        }
+
+                    }
+
+                    
+                    break;
+                    #endregion
+
+            }
+
+
+            DataTable dtTime = new DataTable();
+            dtTime.Columns.Add("日期", typeof(string));
+            dtTime.Columns.Add("Actual Finished", typeof(string));
+            dtTime.Columns.Add("Plan Finished", typeof(string));
+
+            for (var i = sTime; i <= eTime; i = i.AddMonths(1)) {
+                var AfinishedCount = 0;//实际完成数量
+                var PfinishedCount = 0;//计划完成数量
+                DataRow rowTime = dtTime.NewRow();
+                rowTime["日期"] = string.Format("{0:yyyy-MM}", i);
+                switch (drpType.SelectedValue)
+                {
+                    #region 全部
+                    case "":
+                        //根据当前计划完成日期 查询完成的数量
+                        var systemListbyDate = Funs.DB.View_TransferDetail.Where(x => x.Projectid == ProjectId
+                                     && x.FDate >= Convert.ToDateTime(rowTime["日期"])
+                                     && x.FDate < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)
+                                     && x.Status.ToLower()== "finished").ToList();
+                        //查询TestPackage的总数量，状态是完成的。
+                        var testpackageList = (from x in systemListbyDate select x.TestPackage).Distinct();
+                        foreach (var item in testpackageList) { 
+                            
+                        }
+                     break;
+                    #endregion
+
+                }
+
+            }
+        }
+        #endregion
+    }
+}

SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.designer.cs

@@ -0,0 +1,134 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+
+
+    public partial class TransferChart
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// RegionPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RegionPanel RegionPanel1;
+
+        /// <summary>
+        /// Region1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Region Region1;
+
+        /// <summary>
+        /// Form2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form2;
+
+        /// <summary>
+        /// drpType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpType;
+
+        /// <summary>
+        /// txtStarTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStarTime;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// BtnAnalyse 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button BtnAnalyse;
+
+        /// <summary>
+        /// Region2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Region Region2;
+
+        /// <summary>
+        /// TabStrip1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TabStrip TabStrip1;
+
+        /// <summary>
+        /// Tab2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab Tab2;
+
+        /// <summary>
+        /// cpCostTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel cpCostTime;
+    }
+}

SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs

@@ -350,6 +350,10 @@ namespace FineUIPro.Web.Transfer
                                 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
@@ -365,6 +369,10 @@ namespace FineUIPro.Web.Transfer
                             if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
                                 modelOnly.Test_Package_FINISH = t2;
                             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/ElectricalDataIn.aspx.cs

@@ -349,6 +349,11 @@ namespace FineUIPro.Web.Transfer
                                 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
@@ -364,6 +369,10 @@ namespace FineUIPro.Web.Transfer
                             if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
                                 modelOnly.Test_Package_FINISH = t2;
                             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/FirefightingDataIn.aspx.cs

@@ -349,6 +349,10 @@ namespace FineUIPro.Web.Transfer
                                 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
@@ -364,6 +368,10 @@ namespace FineUIPro.Web.Transfer
                             if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
                                 modelOnly.Test_Package_FINISH = t2;
                             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/HVACDataIn.aspx.cs

@@ -349,6 +349,11 @@ namespace FineUIPro.Web.Transfer
                                 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
@@ -364,6 +369,10 @@ namespace FineUIPro.Web.Transfer
                             if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
                                 modelOnly.Test_Package_FINISH = t2;
                             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/InstrumentationDataIn.aspx.cs

@@ -350,6 +350,11 @@ namespace FineUIPro.Web.Transfer
                                 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
@@ -365,6 +370,10 @@ namespace FineUIPro.Web.Transfer
                             if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
                                 modelOnly.Test_Package_FINISH = t2;
                             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/PipingDataIn.aspx.cs

@@ -344,6 +344,11 @@ namespace FineUIPro.Web.Transfer
                             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();
                         list.Add(model);
@@ -361,6 +366,10 @@ namespace FineUIPro.Web.Transfer
                         if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
                             modelOnly.TestPackageFINISH = t2;
                         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();

SGGL/FineUIPro.Web/Transfer/PlumbingDataIn.aspx.cs

@@ -350,6 +350,10 @@ namespace FineUIPro.Web.Transfer
                                 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
@@ -365,6 +369,10 @@ namespace FineUIPro.Web.Transfer
                             if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
                                 modelOnly.Test_Package_FINISH = t2;
                             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/RotatingEquipmentDataIn.aspx.cs

@@ -344,6 +344,10 @@ namespace FineUIPro.Web.Transfer
                             model.TestPackageFINISH = t2;
 
                         model.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
+                        if (model.MechanicalFINALStatus.ToLower() == "finished")
+                        {
+                            model.CompleteTime = DateTime.Now;
+                        }
                         list.Add(model);
                     }
                     else
@@ -359,6 +363,12 @@ namespace FineUIPro.Web.Transfer
                         if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
                             modelOnly.TestPackageFINISH = t2;
                         modelOnly.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
+
+                        if (modelOnly.MechanicalFINALStatus.ToLower() == "finished")
+                        {
+                            modelOnly.CompleteTime = DateTime.Now;
+                        }
+
                         Funs.DB.SubmitChanges();
                     }
                 }

SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs

@@ -344,6 +344,11 @@ namespace FineUIPro.Web.Transfer
                             model.TestPackageFINISH = t2;
 
                         model.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
+                        if (model.MechanicalFINALStatus.ToLower() == "finished")
+                        {
+                            model.CompleteTime = DateTime.Now;
+                        }
+
                         list.Add(model);
                     }
                     else
@@ -359,6 +364,10 @@ namespace FineUIPro.Web.Transfer
                         if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
                             modelOnly.TestPackageFINISH = t2;
                         modelOnly.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
+                        if (modelOnly.MechanicalFINALStatus.ToLower() == "finished")
+                        {
+                            modelOnly.CompleteTime = DateTime.Now;
+                        }
                         Funs.DB.SubmitChanges();
                     }
                 }

SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs

@@ -350,6 +350,10 @@ namespace FineUIPro.Web.Transfer
                                 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
@@ -365,6 +369,10 @@ namespace FineUIPro.Web.Transfer
                             if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
                                 modelOnly.Test_Package_FINISH = t2;
                             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/Web.config

@@ -11,8 +11,8 @@
   <FineUIPro DebugMode="false" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
     <!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
+    <add key="ConnectionString" value="Server=DESKTOP-1QITK9E\MSSQLSERVER2;Database=SGGLDB;Integrated Security=False;User ID=sa;Password=123;MultipleActiveResultSets=true;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
@@ -77,7 +77,7 @@
       <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
-    <compilation debug="false" targetFramework="4.6.1"/>
+    <compilation debug="true" targetFramework="4.6.1"/>
     <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
     <authentication mode="Forms">
       <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>