From b096b54df5fbc86c38e17a30753ff61d60e0899b Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Sun, 5 May 2024 17:12:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SGGLDB_WH_2024-05-05-gaofei.sql           |  32 +
 .../JDGL/Check/QuantityCompletionService.cs   |  24 +-
 .../项目进度完成情况导入模板.xls  | Bin 18432 -> 25088 bytes
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user  |   2 +-
 .../JDGL/Check/QuantityCompletion.aspx        |  13 +-
 .../JDGL/Check/QuantityCompletion.aspx.cs     |  49 +-
 .../Check/QuantityCompletion.aspx.designer.cs |   9 +
 .../JDGL/Check/QuantityCompletionEdit.aspx    |  30 +
 .../JDGL/Check/QuantityCompletionEdit.aspx.cs |  52 ++
 .../QuantityCompletionEdit.aspx.designer.cs   |  54 ++
 .../JDGL/Check/QuantityCompletionIn.aspx      |   5 +-
 .../JDGL/Check/QuantityCompletionIn.aspx.cs   |  26 +-
 SGGL/FineUIPro.Web/Web.config                 |   2 +-
 SGGL/Model/Model.cs                           | 570 ++++++++++--------
 SGGL/WebAPI/WebAPI.csproj.user                |   2 +-
 15 files changed, 589 insertions(+), 281 deletions(-)
 create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-05-05-gaofei.sql

diff --git a/DataBase/版本日志/SGGLDB_WH_2024-05-05-gaofei.sql b/DataBase/版本日志/SGGLDB_WH_2024-05-05-gaofei.sql
new file mode 100644
index 00000000..812d5821
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-05-05-gaofei.sql
@@ -0,0 +1,32 @@
+alter table [dbo].[JDGL_QuantityCompletion] add NextNum decimal(9,2) null
+GO
+
+
+ALTER VIEW [dbo].[View_JDGL_QuantityCompletion]
+AS
+select qc.*,ql.DesignNum,ql.Name,ql.Unit,ql.SortIndex,
+                            CONVERT(FLOAT,(select sum(ISNULL(PlanNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and EndDate<=getdate())) as TotalPlanNum,
+                            CONVERT(FLOAT,(select sum(ISNULL(RealNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and EndDate<=getdate())) as TotalRealNum,
+                            CONVERT(NVARCHAR(10),((CAST(CASE ISNULL(qc.PlanNum,0) WHEN 0 THEN 0
+		ELSE 100*ISNULL(qc.RealNum,0) / (1.0 *qc.PlanNum) END AS DECIMAL(9,2)))))+'%'
+		AS Rate,
+		                    CONVERT(NVARCHAR(10),((CAST(CASE (select sum(ISNULL(PlanNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and EndDate<=getdate()) WHEN 0 THEN 0
+		ELSE 100*(select sum(ISNULL(RealNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and EndDate<=getdate()) / (1.0 *(select sum(ISNULL(PlanNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and EndDate<=getdate())) END AS DECIMAL(9,2)))))+'%'
+		AS TotalRate,
+		                    CONVERT(NVARCHAR(10),((CAST(CASE ISNULL(ql.DesignNum,0) WHEN 0 THEN 0
+		ELSE 100*(select sum(ISNULL(RealNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and EndDate<=getdate()) / (1.0 *ql.DesignNum) END AS DECIMAL(9,2)))))+'%'
+		AS SumRate,
+                            CONVERT(FLOAT,(select sum(ISNULL(PlanNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and Months<qc.Months)) as LastTotalPlanNum, 
+                            CONVERT(FLOAT,(select sum(ISNULL(RealNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and Months<qc.Months)) as LastTotalRealNum
+                            from [dbo].JDGL_QuantityList ql
+							left join dbo.[JDGL_QuantityCompletion] qc on ql.QuantityListId=qc.QuantityListId
+where qc.QuantityCompletionId=(select top 1 QuantityCompletionId from [JDGL_QuantityCompletion] q where q.QuantityListId=qc.QuantityListId order by q.EndDate desc)
+
+
+
+
+
+
+GO
+
+
diff --git a/SGGL/BLL/JDGL/Check/QuantityCompletionService.cs b/SGGL/BLL/JDGL/Check/QuantityCompletionService.cs
index 401eb7c0..ea800f4d 100644
--- a/SGGL/BLL/JDGL/Check/QuantityCompletionService.cs
+++ b/SGGL/BLL/JDGL/Check/QuantityCompletionService.cs
@@ -37,10 +37,11 @@ namespace BLL
                 Months = quantityCompletion.Months,
                 PlanNum = quantityCompletion.PlanNum,
                 RealNum = quantityCompletion.RealNum,
+                NextNum = quantityCompletion.NextNum,
                 CompileMan = quantityCompletion.CompileMan,
                 CompileDate = quantityCompletion.CompileDate,
-                StartDate=quantityCompletion.StartDate,
-                EndDate=quantityCompletion.EndDate
+                StartDate = quantityCompletion.StartDate,
+                EndDate = quantityCompletion.EndDate
             };
             db.JDGL_QuantityCompletion.InsertOnSubmit(newQuantityCompletion);
             db.SubmitChanges();
@@ -56,10 +57,29 @@ namespace BLL
             Model.JDGL_QuantityCompletion newQuantityCompletion = db.JDGL_QuantityCompletion.FirstOrDefault(e => e.QuantityCompletionId == quantityCompletion.QuantityCompletionId);
             if (newQuantityCompletion != null)
             {
+                newQuantityCompletion.QuantityListId = quantityCompletion.QuantityListId;
                 newQuantityCompletion.PlanNum = quantityCompletion.PlanNum;
                 newQuantityCompletion.RealNum = quantityCompletion.RealNum;
+                newQuantityCompletion.NextNum = quantityCompletion.NextNum;
                 newQuantityCompletion.CompileMan = quantityCompletion.CompileMan;
                 newQuantityCompletion.CompileDate = quantityCompletion.CompileDate;
+                newQuantityCompletion.StartDate = quantityCompletion.StartDate;
+                newQuantityCompletion.EndDate = quantityCompletion.EndDate;
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键删除工程量完成情况
+        /// </summary>
+        /// <param name="quantityCompletionId"></param>
+        public static void DeleteQuantityCompletionByQuantityCompletionId(string QuantityCompletionId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var q = (from x in db.JDGL_QuantityCompletion where x.QuantityCompletionId == QuantityCompletionId select x).FirstOrDefault();
+            if (q != null)
+            {
+                db.JDGL_QuantityCompletion.DeleteOnSubmit(q);
                 db.SubmitChanges();
             }
         }
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/项目进度完成情况导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/项目进度完成情况导入模板.xls
index 9f71b163a1c6f9d2592ca35e83674d202a875284..865b5692017a1e47ec8e3aed519b34f8fd7b715a 100644
GIT binary patch
literal 25088
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

literal 18432
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

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
index 9e91deff..63ca13cc 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx
index eaeb9804..a6098651 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx
+++ b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx
@@ -17,19 +17,22 @@
                 <f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="工程量清单设置" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="QuantityCompletionId,QuantityListId" AllowCellEditing="true" ForceFit="true"
                     ClicksToEdit="1" DataIDField="QuantityCompletionId" AllowSorting="true" SortField="SortIndex,Name"
-                    SortDirection="ASC" EnableColumnLines="true"
+                    SortDirection="ASC" EnableColumnLines="true" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="1000"
                      AllowFilters="true" EnableTextSelection="True">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:DatePicker runat="server" ID="txtMonths" DateFormatString="yyyy-MM" AutoPostBack="true"
-                                    Label="月份" LabelWidth="50px" Width="150px" OnTextChanged="txtMonths_TextChanged" Hidden="true">
+                                <f:DatePicker runat="server" ID="txtMonths" DateFormatString="yyyy-MM" AutoPostBack="true" DisplayType="Month"
+                                    Label="月份" LabelWidth="50px" Width="150px" OnTextChanged="txtMonths_TextChanged">
                                 </f:DatePicker>
                                 <f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" Hidden="true"
                                     OnClick="btnSave_Click">
                                 </f:Button>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server"
+                                    Hidden="true">
+                                </f:Button>
                                 <f:Button ID="btnImport" ToolTip="导入" Icon="ApplicationGet" runat="server"
                                             OnClick="btnImport_Click">
                                         </f:Button>
@@ -67,6 +70,10 @@
                                 <f:RenderField Width="100px" ColumnID="Rate" DataField="Rate"
                                     FieldType="String" HeaderText="完成率" HeaderTextAlign="Center" TextAlign="Left">
                                 </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="NextNum" DataField="NextNum"
+                                    FieldType="Float" HeaderText="下月计划" HeaderTextAlign="Center" TextAlign="Left"
+                                    EnableColumnEdit="true">
+                                </f:RenderField>
                             </Columns>
                         </f:GroupField>
                         <f:GroupField EnableLock="true" HeaderText="累计" TextAlign="Center">
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx.cs
index 5e735e42..3fa4f44e 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx.cs
+++ b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx.cs
@@ -18,6 +18,8 @@ namespace FineUIPro.Web.JDGL.Check
             if (!IsPostBack)
             {
                 GetButtonPower();
+                btnNew.OnClientClick = Window1.GetShowReference("QuantityCompletionEdit.aspx") + "return false;";
+                this.txtMonths.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
                 BindGrid();
             }
         }
@@ -39,6 +41,7 @@ namespace FineUIPro.Web.JDGL.Check
             {
                 if (buttonList.Contains(BLL.Const.BtnSave))
                 {
+                    this.btnNew.Hidden = false;
                     this.btnMenuModify.Hidden = false;
                     this.btnMenuDel.Hidden = false;
                 }
@@ -46,6 +49,18 @@ namespace FineUIPro.Web.JDGL.Check
         }
         #endregion
 
+        #region Grid双击事件
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            btnMenuModify_Click(null, null);
+        }
+        #endregion
+
         protected void btnMenuModify_Click(object sender, EventArgs e)
         {
             if (Grid1.SelectedRowIndexArray.Length == 0)
@@ -90,11 +105,35 @@ namespace FineUIPro.Web.JDGL.Check
         private void BindGrid()
         {
             //GetQuantityCompletion();
-            string strSql = @"select *
-                            from dbo.View_JDGL_QuantityCompletion qc 
-                            where qc.ProjectId=@ProjectId order by qc.SortIndex, qc.Name";
+            string strSql = @"select qc.*,ql.DesignNum,ql.Name,ql.Unit,ql.SortIndex,
+                            CONVERT(FLOAT, (select sum(ISNULL(PlanNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and EndDate <= @month)) as TotalPlanNum,
+                            CONVERT(FLOAT, (select sum(ISNULL(RealNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and EndDate <= @month)) as TotalRealNum,
+                            CONVERT(NVARCHAR(10), ((CAST(CASE ISNULL(qc.PlanNum, 0) WHEN 0 THEN 0
+
+        ELSE 100 * ISNULL(qc.RealNum, 0) / (1.0 * qc.PlanNum) END AS DECIMAL(9, 2))))) + '%'
+
+        AS Rate,
+                            CONVERT(NVARCHAR(10), ((CAST(CASE(select sum(ISNULL(PlanNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and EndDate <= @month) WHEN 0 THEN 0
+
+        ELSE 100 * (select sum(ISNULL(RealNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and EndDate <= @month) / (1.0 * (select sum(ISNULL(PlanNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and EndDate <= @month)) END AS DECIMAL(9, 2)))))+'%'
+
+        AS TotalRate,
+                            CONVERT(NVARCHAR(10), ((CAST(CASE ISNULL(ql.DesignNum, 0) WHEN 0 THEN 0
+
+        ELSE 100 * (select sum(ISNULL(RealNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and EndDate <= @month) / (1.0 * ql.DesignNum) END AS DECIMAL(9, 2)))))+'%'
+
+        AS SumRate,
+                            CONVERT(FLOAT, (select sum(ISNULL(PlanNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months < qc.Months)) as LastTotalPlanNum, 
+                            CONVERT(FLOAT, (select sum(ISNULL(RealNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months < qc.Months)) as LastTotalRealNum
+                            from[dbo].JDGL_QuantityList ql
+                           left join dbo.[JDGL_QuantityCompletion] qc on ql.QuantityListId=qc.QuantityListId
+where qc.QuantityCompletionId=(select top 1 QuantityCompletionId from[JDGL_QuantityCompletion] q where q.QuantityListId=qc.QuantityListId and q.EndDate<=@month order by q.EndDate desc) and qc.ProjectId=@ProjectId order by ql.SortIndex, ql.Name";
+            //string strSql = @"select *
+            //                from dbo.View_JDGL_QuantityCompletion qc 
+            //                where qc.ProjectId=@ProjectId order by qc.SortIndex, qc.Name";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            listStr.Add(new SqlParameter("@month", string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(this.txtMonths.Text.Trim() + "-01").AddMonths(1))));
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;
@@ -163,8 +202,8 @@ namespace FineUIPro.Web.JDGL.Check
             {
                 foreach (int rowIndex in Grid1.SelectedRowIndexArray)
                 {
-                    string rowID = Grid1.DataKeys[rowIndex][1].ToString();
-                    BLL.QuantityCompletionService.DeleteQuantityCompletionById(rowID);
+                    string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                    BLL.QuantityCompletionService.DeleteQuantityCompletionByQuantityCompletionId(rowID);
                 }
 
                 BindGrid();
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx.designer.cs
index 97e18dcf..5b0f805c 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx.designer.cs
@@ -75,6 +75,15 @@ namespace FineUIPro.Web.JDGL.Check {
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
         
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+        
         /// <summary>
         /// btnImport 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx
index 32efedc9..921ae393 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx
+++ b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx
@@ -13,6 +13,31 @@
         <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
             BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
             <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:DatePicker ID="txtStartDate" runat="server" ShowRedStar="true" Required="true" Label="开始日期" LabelAlign="Right" LabelWidth="150px"
+                                                EnableEdit="true" >
+                                            </f:DatePicker>
+                    <f:DatePicker ID="txtEndDate" runat="server" ShowRedStar="true" Required="true" Label="结束日期" LabelAlign="Right"
+                                                EnableEdit="true" >
+                                            </f:DatePicker>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtName" runat="server" Label="类型" LabelAlign="Right" LabelWidth="150px" ShowRedStar="true" Required="true"
+                                                MaxLength="50">
+                                            </f:TextBox>
+                        <f:TextBox ID="txtUnit" runat="server" Label="单位" LabelAlign="Right" ShowRedStar="true" Required="true"
+                                                MaxLength="50">
+                                            </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:NumberBox runat="server" ID="txtDesignNum" Required="true" ShowRedStar="true" Label="设计数量" LabelWidth="150px" NoDecimal="false" NoNegative="true"></f:NumberBox>
+                    </Items>
+                </f:FormRow>
                 <f:FormRow>
                     <Items>
                         <f:NumberBox runat="server" ID="txtPlanNum" Required="true" ShowRedStar="true" Label="计划完成" LabelWidth="150px" NoDecimal="false" NoNegative="true"></f:NumberBox>
@@ -23,6 +48,11 @@
                         <f:NumberBox runat="server" ID="txtRealNum" Required="true" ShowRedStar="true" Label="实际完成" LabelWidth="150px" NoDecimal="false" NoNegative="true"></f:NumberBox>
                     </Items>
                 </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:NumberBox runat="server" ID="txtNextNum" Label="下月计划" LabelWidth="150px" NoDecimal="false" NoNegative="true"></f:NumberBox>
+                    </Items>
+                </f:FormRow>
             </Rows>
             <Toolbars>
                 <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx.cs
index c802d8f4..651a653c 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx.cs
@@ -52,6 +52,24 @@ namespace FineUIPro.Web.JDGL.Check
                     if (QuantityCompletion != null)
                     {
                         this.ProjectId = QuantityCompletion.ProjectId;
+                        if (QuantityCompletion.StartDate != null)
+                        {
+                            this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", QuantityCompletion.StartDate);
+                        }
+                        if (QuantityCompletion.EndDate != null)
+                        {
+                            this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", QuantityCompletion.EndDate);
+                        }
+                        Model.JDGL_QuantityList list = BLL.QuantityListService.GetQuantityListById(QuantityCompletion.QuantityListId);
+                        if (list != null)
+                        {
+                            this.txtName.Text = list.Name;
+                            this.txtUnit.Text = list.Unit;
+                            if (list.DesignNum != null)
+                            {
+                                this.txtDesignNum.Text = list.DesignNum.ToString();
+                            }
+                        }
                         if (QuantityCompletion.PlanNum != null)
                         {
                             this.txtPlanNum.Text = QuantityCompletion.PlanNum.ToString();
@@ -60,6 +78,10 @@ namespace FineUIPro.Web.JDGL.Check
                         {
                             this.txtRealNum.Text = QuantityCompletion.RealNum.ToString();
                         }
+                        if (QuantityCompletion.NextNum != null)
+                        {
+                            this.txtNextNum.Text = QuantityCompletion.NextNum.ToString();
+                        }
                     }
                 }
             }
@@ -73,6 +95,26 @@ namespace FineUIPro.Web.JDGL.Check
         private void SaveData(bool bl)
         {
             string QuantityCompletionId = Request.Params["QuantityCompletionId"];
+            string quantityListId = string.Empty;
+            var oldQuantityList = Funs.DB.JDGL_QuantityList.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.Name == this.txtName.Text.Trim());
+            if (oldQuantityList == null)
+            {
+                Model.JDGL_QuantityList newQuantityList = new Model.JDGL_QuantityList();
+                quantityListId = SQLHelper.GetNewID(typeof(Model.JDGL_QuantityList));
+                newQuantityList.QuantityListId = quantityListId;
+                newQuantityList.ProjectId = this.CurrUser.LoginProjectId;
+                newQuantityList.Name = this.txtName.Text.Trim();
+                newQuantityList.Unit = this.txtUnit.Text.Trim();
+                newQuantityList.DesignNum = Convert.ToDecimal(this.txtDesignNum.Text.Trim());
+                BLL.QuantityListService.AddQuantityList(newQuantityList);
+            }
+            else
+            {
+                quantityListId = oldQuantityList.QuantityListId;
+                oldQuantityList.Unit = this.txtUnit.Text.Trim();
+                oldQuantityList.DesignNum = Convert.ToDecimal(this.txtDesignNum.Text.Trim());
+                BLL.QuantityListService.UpdateQuantityList(oldQuantityList);
+            }
             Model.JDGL_QuantityCompletion QuantityCompletion = new Model.JDGL_QuantityCompletion();
             if (!string.IsNullOrEmpty(this.txtPlanNum.Text.Trim()))
             {
@@ -82,6 +124,15 @@ namespace FineUIPro.Web.JDGL.Check
             {
                 QuantityCompletion.RealNum = Convert.ToDecimal(this.txtRealNum.Text.Trim());
             }
+            if (!string.IsNullOrEmpty(this.txtNextNum.Text.Trim()))
+            {
+                QuantityCompletion.NextNum = Convert.ToDecimal(this.txtNextNum.Text.Trim());
+            }
+            QuantityCompletion.QuantityListId = quantityListId;
+            QuantityCompletion.CompileMan = this.CurrUser.UserId;
+            QuantityCompletion.CompileDate = DateTime.Now;
+            QuantityCompletion.StartDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
+            QuantityCompletion.EndDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
             if (!string.IsNullOrEmpty(QuantityCompletionId))
             {
                 QuantityCompletion.QuantityCompletionId = QuantityCompletionId;
@@ -90,6 +141,7 @@ namespace FineUIPro.Web.JDGL.Check
             else
             {
                 QuantityCompletion.QuantityCompletionId = SQLHelper.GetNewID(typeof(Model.JDGL_QuantityCompletion));
+                QuantityCompletion.ProjectId = this.CurrUser.LoginProjectId;
                 BLL.QuantityCompletionService.AddQuantityCompletion(QuantityCompletion);
             }
             ShowNotify("保存成功！", MessageBoxIcon.Success);
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx.designer.cs
index c474d371..c9d5c868 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx.designer.cs
@@ -39,6 +39,51 @@ namespace FineUIPro.Web.JDGL.Check {
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
         
+        /// <summary>
+        /// txtStartDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartDate;
+        
+        /// <summary>
+        /// txtEndDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndDate;
+        
+        /// <summary>
+        /// txtName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtName;
+        
+        /// <summary>
+        /// txtUnit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtUnit;
+        
+        /// <summary>
+        /// txtDesignNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtDesignNum;
+        
         /// <summary>
         /// txtPlanNum 控件。
         /// </summary>
@@ -57,6 +102,15 @@ namespace FineUIPro.Web.JDGL.Check {
         /// </remarks>
         protected global::FineUIPro.NumberBox txtRealNum;
         
+        /// <summary>
+        /// txtNextNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtNextNum;
+        
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx
index 7b40e96f..966fb8c1 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx
+++ b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx
@@ -49,7 +49,7 @@
             <f:FormRow>
                 <Items>
                     <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" runat="server" ForceFit="true"
-                        EnableColumnLines="true" BoxFlex="1" DataKeyNames="Name" DataIDField="Name"
+                        EnableColumnLines="true" BoxFlex="1" DataKeyNames="Name" DataIDField="Name" 
                         AllowSorting="true" SortField="Name"  PageSize="500" Height="400px">
                         <Columns>
                             <f:TemplateField Width="55px" HeaderText="序号">
@@ -74,6 +74,9 @@
                             <f:RenderField Width="100px" ColumnID="RealNum" DataField="RealNum" SortField="RealNum"
                                 FieldType="String" HeaderText="实际完成" HeaderTextAlign="Center" TextAlign="Center">
                             </f:RenderField>
+                            <f:RenderField Width="100px" ColumnID="NextNum" DataField="NextNum" SortField="NextNum"
+                                FieldType="String" HeaderText="下月计划" HeaderTextAlign="Center" TextAlign="Center">
+                            </f:RenderField>
                         </Columns>
                     </f:Grid>
                 </Items>
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx.cs
index d6c468f9..a33c6448 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx.cs
@@ -150,7 +150,7 @@ namespace FineUIPro.Web.JDGL.Check
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL(ds.Tables[0], 5);
+                AddDatasetToSQL(ds.Tables[0], 6);
             }
             catch (Exception ex)
             {
@@ -242,6 +242,19 @@ namespace FineUIPro.Web.JDGL.Check
                     {
                         result += "第" + (i + 2).ToString() + "行," + "实际完成" + "," + "此项为必填项！" + "|";
                     }
+
+                    string col5 = pds.Rows[i][5].ToString().Trim();
+                    if (!string.IsNullOrEmpty(col5))
+                    {
+                        try
+                        {
+                            decimal dec = Convert.ToDecimal(col5);
+                        }
+                        catch (Exception)
+                        {
+                            result += "第" + (i + 2).ToString() + "行," + "下月计划" + "," + "[" + col5 + "]错误！" + "|";
+                        }
+                    }
                 }
                 if (!string.IsNullOrEmpty(result))
                 {
@@ -334,7 +347,7 @@ namespace FineUIPro.Web.JDGL.Check
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL2(ds.Tables[0], 5);
+                AddDatasetToSQL2(ds.Tables[0], 6);
             }
             catch (Exception ex)
             {
@@ -371,6 +384,7 @@ namespace FineUIPro.Web.JDGL.Check
                     string col2 = pds.Rows[i][2].ToString().Trim();
                     string col3 = pds.Rows[i][3].ToString().Trim();
                     string col4 = pds.Rows[i][4].ToString().Trim();
+                    string col5 = pds.Rows[i][5].ToString().Trim();
                     if (!string.IsNullOrEmpty(col0))//类型
                     {
                         quantityCompletion.Name = col0;
@@ -387,10 +401,14 @@ namespace FineUIPro.Web.JDGL.Check
                     {
                         quantityCompletion.PlanNum = Funs.GetNewDecimalOrZero(col3);
                     }
-                    if (!string.IsNullOrEmpty(col4))//计划完成
+                    if (!string.IsNullOrEmpty(col4))//实际完成
                     {
                         quantityCompletion.RealNum = Funs.GetNewDecimalOrZero(col4);
                     }
+                    if (!string.IsNullOrEmpty(col5))//下月计划
+                    {
+                        quantityCompletion.NextNum = Funs.GetNewDecimalOrZero(col5);
+                    }
                     quantityCompletion.QuantityCompletionId = SQLHelper.GetNewID(typeof(Model.JDGL_QuantityCompletion));
                     quantityCompletions.Add(quantityCompletion);
                 }
@@ -461,6 +479,7 @@ namespace FineUIPro.Web.JDGL.Check
                         newQuantityCompletion.QuantityListId = quantityListId;
                         newQuantityCompletion.PlanNum = quantityCompletions[i].PlanNum;
                         newQuantityCompletion.RealNum = quantityCompletions[i].RealNum;
+                        newQuantityCompletion.NextNum = quantityCompletions[i].NextNum;
                         newQuantityCompletion.CompileMan = this.CurrUser.UserId;
                         newQuantityCompletion.CompileDate = DateTime.Now;
                         newQuantityCompletion.StartDate = startDate;
@@ -471,6 +490,7 @@ namespace FineUIPro.Web.JDGL.Check
                     {
                         oldQuantityCompletion.PlanNum= quantityCompletions[i].PlanNum;
                         oldQuantityCompletion.RealNum= quantityCompletions[i].RealNum;
+                        oldQuantityCompletion.NextNum = quantityCompletions[i].NextNum;
                         BLL.QuantityCompletionService.UpdateQuantityCompletion(oldQuantityCompletion);
                     }
                 }
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index eafda425..963148f2 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -12,7 +12,7 @@
   <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=.\SQL2012;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="SystemName" value="智慧施工管理信息系统V1.0"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 04f34bf3..750e6fd7 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -212893,6 +212893,8 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _EndDate;
 		
+		private System.Nullable<decimal> _NextNum;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<JDGL_QuantityList> _JDGL_QuantityList;
@@ -212923,6 +212925,8 @@ namespace Model
     partial void OnStartDateChanged();
     partial void OnEndDateChanging(System.Nullable<System.DateTime> value);
     partial void OnEndDateChanged();
+    partial void OnNextNumChanging(System.Nullable<decimal> value);
+    partial void OnNextNumChanged();
     #endregion
 		
 		public JDGL_QuantityCompletion()
@@ -213145,6 +213149,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NextNum", DbType="Decimal(9,2)")]
+		public System.Nullable<decimal> NextNum
+		{
+			get
+			{
+				return this._NextNum;
+			}
+			set
+			{
+				if ((this._NextNum != value))
+				{
+					this.OnNextNumChanging(value);
+					this.SendPropertyChanging();
+					this._NextNum = value;
+					this.SendPropertyChanged("NextNum");
+					this.OnNextNumChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_QuantityCompletion_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -275014,7 +275038,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
 		public string Remark
 		{
 			get
@@ -275159,20 +275183,6 @@ namespace Model
 		
 		private string _PropertyTechnologyId;
 		
-		private System.Nullable<System.DateTime> _InspectTime;
-		
-		private string _AddUser;
-		
-		private System.Nullable<System.DateTime> _AddTime;
-		
-		private System.Nullable<int> _IsSiteImplement;
-		
-		private System.Nullable<System.DateTime> _SiteImplementConfirmData;
-		
-		private System.Nullable<System.DateTime> _RecordUploadData;
-		
-		private string _SiteImplementUser;
-		
 		private System.Nullable<System.DateTime> _SubcontractorAllPassData;
 		
 		private System.Nullable<System.DateTime> _ContractorAllPassData;
@@ -275181,22 +275191,36 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _OwnerAllPassData;
 		
+		private System.Nullable<int> _WanderIsComplete;
+		
 		private System.Nullable<System.DateTime> _WanderCompleteData;
 		
-		private System.Nullable<int> _WanderIsComplete;
+		private System.Nullable<int> _IsSiteImplement;
+		
+		private string _SiteImplementUser;
+		
+		private System.Nullable<System.DateTime> _SiteImplementConfirmData;
+		
+		private System.Nullable<System.DateTime> _RecordUploadData;
 		
 		private System.Nullable<int> _InspectIsClose;
 		
-		private System.Nullable<System.DateTime> _InspectCloseData;
-		
 		private string _InspectIsCloseUser;
 		
+		private System.Nullable<System.DateTime> _InspectCloseData;
+		
 		private System.Nullable<int> _IsUnifyWanderAbout;
 		
 		private System.Nullable<System.DateTime> _UnifyWanderAboutData;
 		
 		private string _UnifyWanderAboutOpinion;
 		
+		private System.Nullable<System.DateTime> _InspectTime;
+		
+		private string _AddUser;
+		
+		private System.Nullable<System.DateTime> _AddTime;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -275239,20 +275263,6 @@ namespace Model
     partial void OnWorkPackTypeChanged();
     partial void OnPropertyTechnologyIdChanging(string value);
     partial void OnPropertyTechnologyIdChanged();
-    partial void OnInspectTimeChanging(System.Nullable<System.DateTime> value);
-    partial void OnInspectTimeChanged();
-    partial void OnAddUserChanging(string value);
-    partial void OnAddUserChanged();
-    partial void OnAddTimeChanging(System.Nullable<System.DateTime> value);
-    partial void OnAddTimeChanged();
-    partial void OnIsSiteImplementChanging(System.Nullable<int> value);
-    partial void OnIsSiteImplementChanged();
-    partial void OnSiteImplementConfirmDataChanging(System.Nullable<System.DateTime> value);
-    partial void OnSiteImplementConfirmDataChanged();
-    partial void OnRecordUploadDataChanging(System.Nullable<System.DateTime> value);
-    partial void OnRecordUploadDataChanged();
-    partial void OnSiteImplementUserChanging(string value);
-    partial void OnSiteImplementUserChanged();
     partial void OnSubcontractorAllPassDataChanging(System.Nullable<System.DateTime> value);
     partial void OnSubcontractorAllPassDataChanged();
     partial void OnContractorAllPassDataChanging(System.Nullable<System.DateTime> value);
@@ -275261,22 +275271,36 @@ namespace Model
     partial void OnSupervisionAllPassDataChanged();
     partial void OnOwnerAllPassDataChanging(System.Nullable<System.DateTime> value);
     partial void OnOwnerAllPassDataChanged();
-    partial void OnWanderCompleteDataChanging(System.Nullable<System.DateTime> value);
-    partial void OnWanderCompleteDataChanged();
     partial void OnWanderIsCompleteChanging(System.Nullable<int> value);
     partial void OnWanderIsCompleteChanged();
+    partial void OnWanderCompleteDataChanging(System.Nullable<System.DateTime> value);
+    partial void OnWanderCompleteDataChanged();
+    partial void OnIsSiteImplementChanging(System.Nullable<int> value);
+    partial void OnIsSiteImplementChanged();
+    partial void OnSiteImplementUserChanging(string value);
+    partial void OnSiteImplementUserChanged();
+    partial void OnSiteImplementConfirmDataChanging(System.Nullable<System.DateTime> value);
+    partial void OnSiteImplementConfirmDataChanged();
+    partial void OnRecordUploadDataChanging(System.Nullable<System.DateTime> value);
+    partial void OnRecordUploadDataChanged();
     partial void OnInspectIsCloseChanging(System.Nullable<int> value);
     partial void OnInspectIsCloseChanged();
-    partial void OnInspectCloseDataChanging(System.Nullable<System.DateTime> value);
-    partial void OnInspectCloseDataChanged();
     partial void OnInspectIsCloseUserChanging(string value);
     partial void OnInspectIsCloseUserChanged();
+    partial void OnInspectCloseDataChanging(System.Nullable<System.DateTime> value);
+    partial void OnInspectCloseDataChanged();
     partial void OnIsUnifyWanderAboutChanging(System.Nullable<int> value);
     partial void OnIsUnifyWanderAboutChanged();
     partial void OnUnifyWanderAboutDataChanging(System.Nullable<System.DateTime> value);
     partial void OnUnifyWanderAboutDataChanged();
     partial void OnUnifyWanderAboutOpinionChanging(string value);
     partial void OnUnifyWanderAboutOpinionChanged();
+    partial void OnInspectTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnInspectTimeChanged();
+    partial void OnAddUserChanging(string value);
+    partial void OnAddUserChanged();
+    partial void OnAddTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnAddTimeChanged();
     #endregion
 		
 		public PreRun_SubInspectTerm()
@@ -275664,146 +275688,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")]
-		public System.Nullable<System.DateTime> InspectTime
-		{
-			get
-			{
-				return this._InspectTime;
-			}
-			set
-			{
-				if ((this._InspectTime != value))
-				{
-					this.OnInspectTimeChanging(value);
-					this.SendPropertyChanging();
-					this._InspectTime = value;
-					this.SendPropertyChanged("InspectTime");
-					this.OnInspectTimeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")]
-		public string AddUser
-		{
-			get
-			{
-				return this._AddUser;
-			}
-			set
-			{
-				if ((this._AddUser != value))
-				{
-					this.OnAddUserChanging(value);
-					this.SendPropertyChanging();
-					this._AddUser = value;
-					this.SendPropertyChanged("AddUser");
-					this.OnAddUserChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")]
-		public System.Nullable<System.DateTime> AddTime
-		{
-			get
-			{
-				return this._AddTime;
-			}
-			set
-			{
-				if ((this._AddTime != value))
-				{
-					this.OnAddTimeChanging(value);
-					this.SendPropertyChanging();
-					this._AddTime = value;
-					this.SendPropertyChanged("AddTime");
-					this.OnAddTimeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSiteImplement", DbType="Int")]
-		public System.Nullable<int> IsSiteImplement
-		{
-			get
-			{
-				return this._IsSiteImplement;
-			}
-			set
-			{
-				if ((this._IsSiteImplement != value))
-				{
-					this.OnIsSiteImplementChanging(value);
-					this.SendPropertyChanging();
-					this._IsSiteImplement = value;
-					this.SendPropertyChanged("IsSiteImplement");
-					this.OnIsSiteImplementChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementConfirmData", DbType="DateTime")]
-		public System.Nullable<System.DateTime> SiteImplementConfirmData
-		{
-			get
-			{
-				return this._SiteImplementConfirmData;
-			}
-			set
-			{
-				if ((this._SiteImplementConfirmData != value))
-				{
-					this.OnSiteImplementConfirmDataChanging(value);
-					this.SendPropertyChanging();
-					this._SiteImplementConfirmData = value;
-					this.SendPropertyChanged("SiteImplementConfirmData");
-					this.OnSiteImplementConfirmDataChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordUploadData", DbType="DateTime")]
-		public System.Nullable<System.DateTime> RecordUploadData
-		{
-			get
-			{
-				return this._RecordUploadData;
-			}
-			set
-			{
-				if ((this._RecordUploadData != value))
-				{
-					this.OnRecordUploadDataChanging(value);
-					this.SendPropertyChanging();
-					this._RecordUploadData = value;
-					this.SendPropertyChanged("RecordUploadData");
-					this.OnRecordUploadDataChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementUser", DbType="VarChar(50)")]
-		public string SiteImplementUser
-		{
-			get
-			{
-				return this._SiteImplementUser;
-			}
-			set
-			{
-				if ((this._SiteImplementUser != value))
-				{
-					this.OnSiteImplementUserChanging(value);
-					this.SendPropertyChanging();
-					this._SiteImplementUser = value;
-					this.SendPropertyChanged("SiteImplementUser");
-					this.OnSiteImplementUserChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorAllPassData", DbType="DateTime")]
 		public System.Nullable<System.DateTime> SubcontractorAllPassData
 		{
@@ -275884,6 +275768,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderIsComplete", DbType="Int")]
+		public System.Nullable<int> WanderIsComplete
+		{
+			get
+			{
+				return this._WanderIsComplete;
+			}
+			set
+			{
+				if ((this._WanderIsComplete != value))
+				{
+					this.OnWanderIsCompleteChanging(value);
+					this.SendPropertyChanging();
+					this._WanderIsComplete = value;
+					this.SendPropertyChanged("WanderIsComplete");
+					this.OnWanderIsCompleteChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderCompleteData", DbType="DateTime")]
 		public System.Nullable<System.DateTime> WanderCompleteData
 		{
@@ -275904,22 +275808,82 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderIsComplete", DbType="Int")]
-		public System.Nullable<int> WanderIsComplete
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSiteImplement", DbType="Int")]
+		public System.Nullable<int> IsSiteImplement
 		{
 			get
 			{
-				return this._WanderIsComplete;
+				return this._IsSiteImplement;
 			}
 			set
 			{
-				if ((this._WanderIsComplete != value))
+				if ((this._IsSiteImplement != value))
 				{
-					this.OnWanderIsCompleteChanging(value);
+					this.OnIsSiteImplementChanging(value);
 					this.SendPropertyChanging();
-					this._WanderIsComplete = value;
-					this.SendPropertyChanged("WanderIsComplete");
-					this.OnWanderIsCompleteChanged();
+					this._IsSiteImplement = value;
+					this.SendPropertyChanged("IsSiteImplement");
+					this.OnIsSiteImplementChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementUser", DbType="VarChar(50)")]
+		public string SiteImplementUser
+		{
+			get
+			{
+				return this._SiteImplementUser;
+			}
+			set
+			{
+				if ((this._SiteImplementUser != value))
+				{
+					this.OnSiteImplementUserChanging(value);
+					this.SendPropertyChanging();
+					this._SiteImplementUser = value;
+					this.SendPropertyChanged("SiteImplementUser");
+					this.OnSiteImplementUserChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementConfirmData", DbType="DateTime")]
+		public System.Nullable<System.DateTime> SiteImplementConfirmData
+		{
+			get
+			{
+				return this._SiteImplementConfirmData;
+			}
+			set
+			{
+				if ((this._SiteImplementConfirmData != value))
+				{
+					this.OnSiteImplementConfirmDataChanging(value);
+					this.SendPropertyChanging();
+					this._SiteImplementConfirmData = value;
+					this.SendPropertyChanged("SiteImplementConfirmData");
+					this.OnSiteImplementConfirmDataChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordUploadData", DbType="DateTime")]
+		public System.Nullable<System.DateTime> RecordUploadData
+		{
+			get
+			{
+				return this._RecordUploadData;
+			}
+			set
+			{
+				if ((this._RecordUploadData != value))
+				{
+					this.OnRecordUploadDataChanging(value);
+					this.SendPropertyChanging();
+					this._RecordUploadData = value;
+					this.SendPropertyChanged("RecordUploadData");
+					this.OnRecordUploadDataChanged();
 				}
 			}
 		}
@@ -275944,26 +275908,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectCloseData", DbType="DateTime")]
-		public System.Nullable<System.DateTime> InspectCloseData
-		{
-			get
-			{
-				return this._InspectCloseData;
-			}
-			set
-			{
-				if ((this._InspectCloseData != value))
-				{
-					this.OnInspectCloseDataChanging(value);
-					this.SendPropertyChanging();
-					this._InspectCloseData = value;
-					this.SendPropertyChanged("InspectCloseData");
-					this.OnInspectCloseDataChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsCloseUser", DbType="VarChar(50)")]
 		public string InspectIsCloseUser
 		{
@@ -275984,6 +275928,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectCloseData", DbType="DateTime")]
+		public System.Nullable<System.DateTime> InspectCloseData
+		{
+			get
+			{
+				return this._InspectCloseData;
+			}
+			set
+			{
+				if ((this._InspectCloseData != value))
+				{
+					this.OnInspectCloseDataChanging(value);
+					this.SendPropertyChanging();
+					this._InspectCloseData = value;
+					this.SendPropertyChanged("InspectCloseData");
+					this.OnInspectCloseDataChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUnifyWanderAbout", DbType="Int")]
 		public System.Nullable<int> IsUnifyWanderAbout
 		{
@@ -276044,6 +276008,66 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> InspectTime
+		{
+			get
+			{
+				return this._InspectTime;
+			}
+			set
+			{
+				if ((this._InspectTime != value))
+				{
+					this.OnInspectTimeChanging(value);
+					this.SendPropertyChanging();
+					this._InspectTime = value;
+					this.SendPropertyChanged("InspectTime");
+					this.OnInspectTimeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")]
+		public string AddUser
+		{
+			get
+			{
+				return this._AddUser;
+			}
+			set
+			{
+				if ((this._AddUser != value))
+				{
+					this.OnAddUserChanging(value);
+					this.SendPropertyChanging();
+					this._AddUser = value;
+					this.SendPropertyChanged("AddUser");
+					this.OnAddUserChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> AddTime
+		{
+			get
+			{
+				return this._AddTime;
+			}
+			set
+			{
+				if ((this._AddTime != value))
+				{
+					this.OnAddTimeChanging(value);
+					this.SendPropertyChanging();
+					this._AddTime = value;
+					this.SendPropertyChanged("AddTime");
+					this.OnAddTimeChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -277851,6 +277875,8 @@ namespace Model
 		
 		private string _RestrictCondition;
 		
+		private System.Nullable<int> _ResponsibilityProposeSatate;
+		
 		private System.Nullable<int> _ResponsibilityConfirm;
 		
 		private System.Nullable<int> _ProposeConfirm;
@@ -277861,9 +277887,11 @@ namespace Model
 		
 		private System.Nullable<int> _OwnerConfirm;
 		
+		private System.Nullable<System.DateTime> _ProposeConfirmData;
+		
 		private System.Nullable<System.DateTime> _ResponsibilityConfirmData;
 		
-		private System.Nullable<System.DateTime> _ProposeConfirmData;
+		private System.Nullable<System.DateTime> _ProposeHandleData;
 		
 		private System.Nullable<System.DateTime> _GeneraConfirmData;
 		
@@ -277879,10 +277907,6 @@ namespace Model
 		
 		private System.Nullable<int> _Sort;
 		
-		private System.Nullable<int> _ResponsibilityProposeSatate;
-		
-		private System.Nullable<System.DateTime> _ProposeHandleData;
-		
 		private string _FourDecisionCode;
 		
     #region 可扩展性方法定义
@@ -277919,6 +277943,8 @@ namespace Model
     partial void OnRealityDestructionTimeChanged();
     partial void OnRestrictConditionChanging(string value);
     partial void OnRestrictConditionChanged();
+    partial void OnResponsibilityProposeSatateChanging(System.Nullable<int> value);
+    partial void OnResponsibilityProposeSatateChanged();
     partial void OnResponsibilityConfirmChanging(System.Nullable<int> value);
     partial void OnResponsibilityConfirmChanged();
     partial void OnProposeConfirmChanging(System.Nullable<int> value);
@@ -277929,10 +277955,12 @@ namespace Model
     partial void OnSupervisionConfirmChanged();
     partial void OnOwnerConfirmChanging(System.Nullable<int> value);
     partial void OnOwnerConfirmChanged();
-    partial void OnResponsibilityConfirmDataChanging(System.Nullable<System.DateTime> value);
-    partial void OnResponsibilityConfirmDataChanged();
     partial void OnProposeConfirmDataChanging(System.Nullable<System.DateTime> value);
     partial void OnProposeConfirmDataChanged();
+    partial void OnResponsibilityConfirmDataChanging(System.Nullable<System.DateTime> value);
+    partial void OnResponsibilityConfirmDataChanged();
+    partial void OnProposeHandleDataChanging(System.Nullable<System.DateTime> value);
+    partial void OnProposeHandleDataChanged();
     partial void OnGeneraConfirmDataChanging(System.Nullable<System.DateTime> value);
     partial void OnGeneraConfirmDataChanged();
     partial void OnSupervisionConfirmDataChanging(System.Nullable<System.DateTime> value);
@@ -277947,10 +277975,6 @@ namespace Model
     partial void OnAddTimeChanged();
     partial void OnSortChanging(System.Nullable<int> value);
     partial void OnSortChanged();
-    partial void OnResponsibilityProposeSatateChanging(System.Nullable<int> value);
-    partial void OnResponsibilityProposeSatateChanged();
-    partial void OnProposeHandleDataChanging(System.Nullable<System.DateTime> value);
-    partial void OnProposeHandleDataChanged();
     partial void OnFourDecisionCodeChanging(string value);
     partial void OnFourDecisionCodeChanged();
     #endregion
@@ -278260,6 +278284,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")]
+		public System.Nullable<int> ResponsibilityProposeSatate
+		{
+			get
+			{
+				return this._ResponsibilityProposeSatate;
+			}
+			set
+			{
+				if ((this._ResponsibilityProposeSatate != value))
+				{
+					this.OnResponsibilityProposeSatateChanging(value);
+					this.SendPropertyChanging();
+					this._ResponsibilityProposeSatate = value;
+					this.SendPropertyChanged("ResponsibilityProposeSatate");
+					this.OnResponsibilityProposeSatateChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirm", DbType="Int")]
 		public System.Nullable<int> ResponsibilityConfirm
 		{
@@ -278360,6 +278404,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")]
+		public System.Nullable<System.DateTime> ProposeConfirmData
+		{
+			get
+			{
+				return this._ProposeConfirmData;
+			}
+			set
+			{
+				if ((this._ProposeConfirmData != value))
+				{
+					this.OnProposeConfirmDataChanging(value);
+					this.SendPropertyChanging();
+					this._ProposeConfirmData = value;
+					this.SendPropertyChanged("ProposeConfirmData");
+					this.OnProposeConfirmDataChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirmData", DbType="DateTime")]
 		public System.Nullable<System.DateTime> ResponsibilityConfirmData
 		{
@@ -278380,22 +278444,22 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")]
-		public System.Nullable<System.DateTime> ProposeConfirmData
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")]
+		public System.Nullable<System.DateTime> ProposeHandleData
 		{
 			get
 			{
-				return this._ProposeConfirmData;
+				return this._ProposeHandleData;
 			}
 			set
 			{
-				if ((this._ProposeConfirmData != value))
+				if ((this._ProposeHandleData != value))
 				{
-					this.OnProposeConfirmDataChanging(value);
+					this.OnProposeHandleDataChanging(value);
 					this.SendPropertyChanging();
-					this._ProposeConfirmData = value;
-					this.SendPropertyChanged("ProposeConfirmData");
-					this.OnProposeConfirmDataChanged();
+					this._ProposeHandleData = value;
+					this.SendPropertyChanged("ProposeHandleData");
+					this.OnProposeHandleDataChanged();
 				}
 			}
 		}
@@ -278540,46 +278604,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")]
-		public System.Nullable<int> ResponsibilityProposeSatate
-		{
-			get
-			{
-				return this._ResponsibilityProposeSatate;
-			}
-			set
-			{
-				if ((this._ResponsibilityProposeSatate != value))
-				{
-					this.OnResponsibilityProposeSatateChanging(value);
-					this.SendPropertyChanging();
-					this._ResponsibilityProposeSatate = value;
-					this.SendPropertyChanged("ResponsibilityProposeSatate");
-					this.OnResponsibilityProposeSatateChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")]
-		public System.Nullable<System.DateTime> ProposeHandleData
-		{
-			get
-			{
-				return this._ProposeHandleData;
-			}
-			set
-			{
-				if ((this._ProposeHandleData != value))
-				{
-					this.OnProposeHandleDataChanging(value);
-					this.SendPropertyChanging();
-					this._ProposeHandleData = value;
-					this.SendPropertyChanged("ProposeHandleData");
-					this.OnProposeHandleDataChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FourDecisionCode", DbType="VarChar(20)")]
 		public string FourDecisionCode
 		{
@@ -279292,7 +279316,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
 		public string Remark
 		{
 			get
@@ -417802,6 +417826,8 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _EndDate;
 		
+		private System.Nullable<decimal> _NextNum;
+		
 		private System.Nullable<decimal> _DesignNum;
 		
 		private string _Name;
@@ -417988,6 +418014,22 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NextNum", DbType="Decimal(9,2)")]
+		public System.Nullable<decimal> NextNum
+		{
+			get
+			{
+				return this._NextNum;
+			}
+			set
+			{
+				if ((this._NextNum != value))
+				{
+					this._NextNum = value;
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DesignNum", DbType="Decimal(9,2)")]
 		public System.Nullable<decimal> DesignNum
 		{
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 5fe155da..bd497c6b 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />