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

提交代码

This commit is contained in:
高飞 2024-05-05 17:12:18 +08:00
parent ae9728039b
commit b096b54df5
15 changed files with 589 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
DataBase/版本日志/SGGLDB_WH_2024-05-05-gaofei.sql Normal file
View File

@ -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

24
SGGL/BLL/JDGL/Check/QuantityCompletionService.cs
View File

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

BIN
SGGL/FineUIPro.Web/File/Excel/DataIn/项目进度完成情况导入模板.xls
View File

Binary file not shown.

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

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

13
SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx
View File

@ -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">

49
SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx.cs
View File

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

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

@ -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>

30
SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx
View File

@ -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">

52
SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx.cs
View File

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

54
SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx.designer.cs generated
View File

@ -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>

5
SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx
View File

@ -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>

26
SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx.cs
View File

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

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

@ -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/;"/>

570
SGGL/Model/Model.cs
View File

@ -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
{

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

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