提交代码
This commit is contained in:
@@ -5,3 +5,5 @@ go
|
|||||||
exec sp_rename 'dbo.Base_DNCompare.Sch10S', SCH10S, 'COLUMN'
|
exec sp_rename 'dbo.Base_DNCompare.Sch10S', SCH10S, 'COLUMN'
|
||||||
go
|
go
|
||||||
|
|
||||||
|
alter table Base_Project add ProjectRealCode nvarchar(50) null
|
||||||
|
GO
|
||||||
@@ -48,6 +48,20 @@
|
|||||||
}
|
}
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
///根据ID获取项目编号
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static string GetProjectRealCodeByProjectId(string projectId)
|
||||||
|
{
|
||||||
|
string name = string.Empty;
|
||||||
|
var project = Funs.DB.Base_Project.FirstOrDefault(e => e.ProjectId == projectId);
|
||||||
|
if (project != null)
|
||||||
|
{
|
||||||
|
name = project.ProjectRealCode;
|
||||||
|
}
|
||||||
|
return name;
|
||||||
|
}
|
||||||
public static Model.Base_Project GetProjectByProjectShortName(string name)
|
public static Model.Base_Project GetProjectByProjectShortName(string name)
|
||||||
{
|
{
|
||||||
return Funs.DB.Base_Project.FirstOrDefault(e => e.ShortName == name);
|
return Funs.DB.Base_Project.FirstOrDefault(e => e.ShortName == name);
|
||||||
@@ -110,6 +124,7 @@
|
|||||||
Province = project.Province,
|
Province = project.Province,
|
||||||
City = project.City,
|
City = project.City,
|
||||||
EnglishRemark = project.EnglishRemark,
|
EnglishRemark = project.EnglishRemark,
|
||||||
|
ProjectRealCode=project.ProjectRealCode,
|
||||||
|
|
||||||
};
|
};
|
||||||
db.Base_Project.InsertOnSubmit(newProject);
|
db.Base_Project.InsertOnSubmit(newProject);
|
||||||
@@ -155,6 +170,7 @@
|
|||||||
newProject.Province = project.Province;
|
newProject.Province = project.Province;
|
||||||
newProject.City = project.City;
|
newProject.City = project.City;
|
||||||
newProject.EnglishRemark = project.EnglishRemark;
|
newProject.EnglishRemark = project.EnglishRemark;
|
||||||
|
newProject.ProjectRealCode = project.ProjectRealCode;
|
||||||
db.SubmitChanges();
|
db.SubmitChanges();
|
||||||
HSEDataCollectService.ProjectHSEDataCollectSubmission(newProject);
|
HSEDataCollectService.ProjectHSEDataCollectSubmission(newProject);
|
||||||
CQMSDataCollectService.ProjectCQMSDataCollectSubmission(newProject);
|
CQMSDataCollectService.ProjectCQMSDataCollectSubmission(newProject);
|
||||||
|
|||||||
@@ -567,23 +567,23 @@ namespace FineUIPro.Web.CQMS.WBS
|
|||||||
protected void btnCreateCode_Click(object sender, EventArgs e)
|
protected void btnCreateCode_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
Model.SGGLDB db = Funs.DB;
|
Model.SGGLDB db = Funs.DB;
|
||||||
string projectCode = BLL.ProjectService.GetProjectCodeByProjectId(this.CurrUser.LoginProjectId);
|
string projectRealCode = BLL.ProjectService.GetProjectRealCodeByProjectId(this.CurrUser.LoginProjectId);
|
||||||
var unitWorks = from x in db.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x;
|
var unitWorks = from x in db.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x;
|
||||||
var workPackages = (from x in db.WBS_WorkPackage where x.ProjectId == this.CurrUser.LoginProjectId && x.IsApprove == true select x).ToList();
|
var workPackages = (from x in db.WBS_WorkPackage where x.ProjectId == this.CurrUser.LoginProjectId && x.IsApprove == true select x).ToList();
|
||||||
var controlItemAndCycles = (from x in db.WBS_ControlItemAndCycle where x.ProjectId == this.CurrUser.LoginProjectId && x.IsApprove == true select x).ToList();
|
var controlItemAndCycles = (from x in db.WBS_ControlItemAndCycle where x.ProjectId == this.CurrUser.LoginProjectId && x.IsApprove == true select x).ToList();
|
||||||
foreach (var unitWork in unitWorks)
|
foreach (var unitWork in unitWorks)
|
||||||
{
|
{
|
||||||
unitWork.WBSCode = projectCode + unitWork.UnitWorkCode;
|
unitWork.WBSCode = projectRealCode + unitWork.UnitWorkCode;
|
||||||
var workPackage1s = workPackages.Where(x => x.UnitWorkId == unitWork.UnitWorkId && x.SuperWorkPack == null).OrderBy(x => x.WorkPackageCode);
|
var workPackage1s = workPackages.Where(x => x.UnitWorkId == unitWork.UnitWorkId && x.SuperWorkPack == null).OrderBy(x => x.WorkPackageCode);
|
||||||
foreach (var workPackage1 in workPackage1s)
|
foreach (var workPackage1 in workPackage1s)
|
||||||
{
|
{
|
||||||
if (!workPackage1.PackageContent.Contains("-"))
|
if (!workPackage1.PackageContent.Contains("-"))
|
||||||
{
|
{
|
||||||
workPackage1.WBSCode = projectCode + unitWork.UnitWorkCode + unitWork.ProjectType + workPackage1.PackageCode;
|
workPackage1.WBSCode = projectRealCode + unitWork.UnitWorkCode + unitWork.ProjectType + workPackage1.PackageCode;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
workPackage1.WBSCode = projectCode + unitWork.UnitWorkCode + unitWork.ProjectType + workPackage1.PackageCode + workPackage1.WorkPackageCode.Substring(workPackage1.WorkPackageCode.Length - 2, 2);
|
workPackage1.WBSCode = projectRealCode + unitWork.UnitWorkCode + unitWork.ProjectType + workPackage1.PackageCode + workPackage1.WorkPackageCode.Substring(workPackage1.WorkPackageCode.Length - 2, 2);
|
||||||
}
|
}
|
||||||
UpdateWBSCode(db, workPackages, workPackage1.WorkPackageId, workPackage1.WBSCode, controlItemAndCycles);
|
UpdateWBSCode(db, workPackages, workPackage1.WorkPackageId, workPackage1.WBSCode, controlItemAndCycles);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -154,27 +154,27 @@ namespace FineUIPro.Web.HJGL.PreDesign
|
|||||||
protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
|
protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
|
||||||
{
|
{
|
||||||
this.BindGrid();
|
this.BindGrid();
|
||||||
var q = view_HJGL_Pipelines.Where(x => x.PipeArea == PipelineService.PipeArea_SHOP);
|
// var q = view_HJGL_Pipelines.Where(x => x.PipeArea == PipelineService.PipeArea_SHOP);
|
||||||
if (q.Any())
|
// if (q.Any())
|
||||||
{
|
// {
|
||||||
List<string> listpipecode = new List<string>();
|
// List<string> listpipecode = new List<string>();
|
||||||
foreach (var item in q)
|
// foreach (var item in q)
|
||||||
{
|
// {
|
||||||
listpipecode.Add("/" + item.PipelineCode);
|
// listpipecode.Add("/" + item.PipelineCode);
|
||||||
}
|
// }
|
||||||
Line_No = string.Join(",", listpipecode);
|
// Line_No = string.Join(",", listpipecode);
|
||||||
}
|
// }
|
||||||
Model.Parameter3D parameter3D = new Model.Parameter3D();
|
// Model.Parameter3D parameter3D = new Model.Parameter3D();
|
||||||
Model.ColorModel colorModel = new Model.ColorModel();
|
// Model.ColorModel colorModel = new Model.ColorModel();
|
||||||
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
|
// colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
|
||||||
parameter3D.ColorModel = colorModel;
|
// parameter3D.ColorModel = colorModel;
|
||||||
parameter3D.TagNum = Line_No;
|
// parameter3D.TagNum = Line_No;
|
||||||
parameter3D.ButtonType = "1";
|
// parameter3D.ButtonType = "1";
|
||||||
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
|
// parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
|
||||||
// parameter3D.Line_No = Line_No;
|
//// parameter3D.Line_No = Line_No;
|
||||||
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
|
// ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
|
||||||
ctlAuditFlow.data = parameter3D;
|
// ctlAuditFlow.data = parameter3D;
|
||||||
ctlAuditFlow.BindData();
|
// ctlAuditFlow.BindData();
|
||||||
|
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
@@ -212,7 +212,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
|
|||||||
var table = this.GetPagedDataTable(Grid1, list);
|
var table = this.GetPagedDataTable(Grid1, list);
|
||||||
Grid1.DataSource = table;
|
Grid1.DataSource = table;
|
||||||
Grid1.DataBind();
|
Grid1.DataBind();
|
||||||
lbSinglePreRate.Text= GetSinglePreRateByUnitWork(this.tvControlItem.SelectedNodeID);
|
//lbSinglePreRate.Text= GetSinglePreRateByUnitWork(this.tvControlItem.SelectedNodeID);
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|||||||
@@ -132,7 +132,7 @@
|
|||||||
</Editor>
|
</Editor>
|
||||||
</f:RenderField>
|
</f:RenderField>
|
||||||
|
|
||||||
<f:RenderField Width="150px" ColumnID="ControlItemAndCycleCode" DataField="ControlItemAndCycleCode" SortField="ControlItemAndCycleCode"
|
<f:RenderField Width="150px" ColumnID="WBSCode" DataField="WBSCode" SortField="WBSCode"
|
||||||
FieldType="String" HeaderText="WBS编号" TextAlign="Left" HeaderTextAlign="Center">
|
FieldType="String" HeaderText="WBS编号" TextAlign="Left" HeaderTextAlign="Center">
|
||||||
</f:RenderField>
|
</f:RenderField>
|
||||||
<f:RenderField Width="150px" ColumnID="ControlItemContent" DataField="ControlItemContent" SortField="ControlItemContent"
|
<f:RenderField Width="150px" ColumnID="ControlItemContent" DataField="ControlItemContent" SortField="ControlItemContent"
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
|
|||||||
MatchWbsId= y.Id ,
|
MatchWbsId= y.Id ,
|
||||||
y.ContractTrackId,
|
y.ContractTrackId,
|
||||||
y.ControlItemAndCycleId,
|
y.ControlItemAndCycleId,
|
||||||
z.ControlItemAndCycleCode,
|
z.WBSCode,
|
||||||
z.ControlItemContent,
|
z.ControlItemContent,
|
||||||
z.Weights,
|
z.Weights,
|
||||||
y.WorkPackageEstimate,
|
y.WorkPackageEstimate,
|
||||||
|
|||||||
@@ -30,6 +30,8 @@
|
|||||||
<Items>
|
<Items>
|
||||||
<f:DatePicker ID="txtCompileDate" runat="server" Label="日期" LabelAlign="Right" LabelWidth="120px" AutoPostBack="true" OnTextChanged="txtCompileDate_TextChanged"></f:DatePicker>
|
<f:DatePicker ID="txtCompileDate" runat="server" Label="日期" LabelAlign="Right" LabelWidth="120px" AutoPostBack="true" OnTextChanged="txtCompileDate_TextChanged"></f:DatePicker>
|
||||||
<f:TextBox runat="server" ID="hdId" Hidden="true"></f:TextBox>
|
<f:TextBox runat="server" ID="hdId" Hidden="true"></f:TextBox>
|
||||||
|
<f:DropDownList ID="drpContractNo" runat="server" Label="合同编号" LabelAlign="Right" EnableEdit="true" LabelWidth="120px" AutoPostBack="true" OnSelectedIndexChanged="drpContractNo_SelectedIndexChanged"></f:DropDownList>
|
||||||
|
<f:Label runat="server" Label="施工分包商" ID="lblUnitName" LabelWidth="150px" LabelAlign="Right"></f:Label>
|
||||||
<f:ToolbarFill runat="server"></f:ToolbarFill>
|
<f:ToolbarFill runat="server"></f:ToolbarFill>
|
||||||
</Items>
|
</Items>
|
||||||
</f:Toolbar>
|
</f:Toolbar>
|
||||||
|
|||||||
@@ -107,11 +107,33 @@ namespace FineUIPro.Web.PZHGL.InformationProject
|
|||||||
if (!IsPostBack)
|
if (!IsPostBack)
|
||||||
{
|
{
|
||||||
this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
|
this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
|
||||||
|
//合同编号
|
||||||
|
this.drpContractNo.DataTextField = "ContractNum";
|
||||||
|
this.drpContractNo.DataValueField = "ContractId";
|
||||||
|
this.drpContractNo.DataSource = BLL.PHTGL_ContractReviewService.GetContractReview_CompleteData(this.CurrUser.LoginProjectId);
|
||||||
|
this.drpContractNo.DataBind();
|
||||||
|
Funs.FineUIPleaseSelect(this.drpContractNo);
|
||||||
GetData();
|
GetData();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
protected void drpContractNo_SelectedIndexChanged(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
this.lblUnitName.Text = string.Empty;
|
||||||
|
if (this.drpContractNo.SelectedValue != BLL.Const._Null)
|
||||||
|
{
|
||||||
|
var contractTrack = (from x in Funs.DB.PHTGL_ContractTrack
|
||||||
|
where x.ContractId == this.drpContractNo.SelectedValue && x.ConstructionSubcontractor != null && x.ConstructionSubcontractor != string.Empty
|
||||||
|
select x).FirstOrDefault();
|
||||||
|
if (contractTrack != null)
|
||||||
|
{
|
||||||
|
this.lblUnitName.Text = contractTrack.ConstructionSubcontractor;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
GetData();
|
||||||
|
}
|
||||||
|
|
||||||
private void GetData()
|
private void GetData()
|
||||||
{
|
{
|
||||||
Model.SGGLDB db = Funs.DB;
|
Model.SGGLDB db = Funs.DB;
|
||||||
@@ -134,6 +156,10 @@ namespace FineUIPro.Web.PZHGL.InformationProject
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (this.drpContractNo.SelectedValue != BLL.Const._Null)
|
||||||
|
{
|
||||||
|
contractNo = this.drpContractNo.SelectedValue;
|
||||||
|
}
|
||||||
List<string> contractNoList = Funs.GetStrListByStr(contractNo, ',');
|
List<string> contractNoList = Funs.GetStrListByStr(contractNo, ',');
|
||||||
List<string> professionalList = Funs.GetStrListByStr(professional, ',');
|
List<string> professionalList = Funs.GetStrListByStr(professional, ',');
|
||||||
var workEfficiencys = from x in db.ZHGL_ConstructionLogWorkEfficiency
|
var workEfficiencys = from x in db.ZHGL_ConstructionLogWorkEfficiency
|
||||||
|
|||||||
Generated
+18
@@ -74,5 +74,23 @@ namespace FineUIPro.Web.PZHGL.InformationProject {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.TextBox hdId;
|
protected global::FineUIPro.TextBox hdId;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// drpContractNo 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.DropDownList drpContractNo;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// lblUnitName 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.Label lblUnitName;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,6 +29,8 @@
|
|||||||
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
|
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
|
||||||
<Items>
|
<Items>
|
||||||
<f:DatePicker ID="txtMonth" runat="server" Label="月份" LabelAlign="Right" DateFormatString="yyyy-MM" DisplayType="Month" AutoPostBack="true" OnTextChanged="txtMonth_TextChanged" LabelWidth="120px"></f:DatePicker>
|
<f:DatePicker ID="txtMonth" runat="server" Label="月份" LabelAlign="Right" DateFormatString="yyyy-MM" DisplayType="Month" AutoPostBack="true" OnTextChanged="txtMonth_TextChanged" LabelWidth="120px"></f:DatePicker>
|
||||||
|
<f:DropDownList ID="drpContractNo" runat="server" Label="合同编号" LabelAlign="Right" EnableEdit="true" LabelWidth="120px" AutoPostBack="true" OnSelectedIndexChanged="drpContractNo_SelectedIndexChanged"></f:DropDownList>
|
||||||
|
<f:Label runat="server" Label="施工分包商" ID="lblUnitName" LabelWidth="150px" LabelAlign="Right"></f:Label>
|
||||||
<f:TextBox runat="server" ID="hdId" Hidden="true"></f:TextBox>
|
<f:TextBox runat="server" ID="hdId" Hidden="true"></f:TextBox>
|
||||||
<f:ToolbarFill runat="server"></f:ToolbarFill>
|
<f:ToolbarFill runat="server"></f:ToolbarFill>
|
||||||
<f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie"
|
<f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie"
|
||||||
|
|||||||
+36
@@ -107,10 +107,35 @@ namespace FineUIPro.Web.PZHGL.InformationProject
|
|||||||
if (!IsPostBack)
|
if (!IsPostBack)
|
||||||
{
|
{
|
||||||
this.txtMonth.Text = string.Format("{0:yyyy-MM}", DateTime.Now);
|
this.txtMonth.Text = string.Format("{0:yyyy-MM}", DateTime.Now);
|
||||||
|
//合同编号
|
||||||
|
this.drpContractNo.DataTextField = "ContractNum";
|
||||||
|
this.drpContractNo.DataValueField = "ContractId";
|
||||||
|
this.drpContractNo.DataSource = BLL.PHTGL_ContractReviewService.GetContractReview_CompleteData(this.CurrUser.LoginProjectId);
|
||||||
|
this.drpContractNo.DataBind();
|
||||||
|
Funs.FineUIPleaseSelect(this.drpContractNo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
protected void drpContractNo_SelectedIndexChanged(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
this.lblUnitName.Text = string.Empty;
|
||||||
|
this.btnSave.Hidden = false;
|
||||||
|
if (this.drpContractNo.SelectedValue != BLL.Const._Null)
|
||||||
|
{
|
||||||
|
var contractTrack = (from x in Funs.DB.PHTGL_ContractTrack
|
||||||
|
where x.ContractId == this.drpContractNo.SelectedValue && x.ConstructionSubcontractor != null && x.ConstructionSubcontractor != string.Empty
|
||||||
|
select x).FirstOrDefault();
|
||||||
|
if (contractTrack != null)
|
||||||
|
{
|
||||||
|
this.lblUnitName.Text = contractTrack.ConstructionSubcontractor;
|
||||||
|
}
|
||||||
|
this.btnSave.Hidden = true;
|
||||||
|
}
|
||||||
|
this.Grid1.DataSource = null;
|
||||||
|
this.Grid1.DataBind();
|
||||||
|
}
|
||||||
|
|
||||||
private void GetData()
|
private void GetData()
|
||||||
{
|
{
|
||||||
Model.SGGLDB db = Funs.DB;
|
Model.SGGLDB db = Funs.DB;
|
||||||
@@ -135,6 +160,10 @@ namespace FineUIPro.Web.PZHGL.InformationProject
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (this.drpContractNo.SelectedValue != BLL.Const._Null)
|
||||||
|
{
|
||||||
|
contractNo = this.drpContractNo.SelectedValue;
|
||||||
|
}
|
||||||
List<string> contractNoList = Funs.GetStrListByStr(contractNo, ',');
|
List<string> contractNoList = Funs.GetStrListByStr(contractNo, ',');
|
||||||
List<string> professionalList = Funs.GetStrListByStr(professional, ',');
|
List<string> professionalList = Funs.GetStrListByStr(professional, ',');
|
||||||
var workEfficiencys = from x in db.ZHGL_ConstructionLogWorkEfficiency
|
var workEfficiencys = from x in db.ZHGL_ConstructionLogWorkEfficiency
|
||||||
@@ -182,6 +211,8 @@ namespace FineUIPro.Web.PZHGL.InformationProject
|
|||||||
protected void btnSave_Click(object sender, EventArgs e)
|
protected void btnSave_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
if (!string.IsNullOrEmpty(this.txtMonth.Text.Trim()))
|
if (!string.IsNullOrEmpty(this.txtMonth.Text.Trim()))
|
||||||
|
{
|
||||||
|
if (this.Grid1.Rows.Count > 0)
|
||||||
{
|
{
|
||||||
Model.SGGLDB db = Funs.DB;
|
Model.SGGLDB db = Funs.DB;
|
||||||
DateTime month = Funs.GetNewDateTimeOrNow(this.txtMonth.Text.Trim() + "-01");
|
DateTime month = Funs.GetNewDateTimeOrNow(this.txtMonth.Text.Trim() + "-01");
|
||||||
@@ -242,6 +273,11 @@ namespace FineUIPro.Web.PZHGL.InformationProject
|
|||||||
ShowNotify("保存成功!", MessageBoxIcon.Success);
|
ShowNotify("保存成功!", MessageBoxIcon.Success);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
|
Alert.ShowInTop("请先统计后再保存!", MessageBoxIcon.Warning);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
Alert.ShowInTop("请选择月份!", MessageBoxIcon.Warning);
|
Alert.ShowInTop("请选择月份!", MessageBoxIcon.Warning);
|
||||||
}
|
}
|
||||||
|
|||||||
Generated
+18
@@ -66,6 +66,24 @@ namespace FineUIPro.Web.PZHGL.InformationProject {
|
|||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.DatePicker txtMonth;
|
protected global::FineUIPro.DatePicker txtMonth;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// drpContractNo 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.DropDownList drpContractNo;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// lblUnitName 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.Label lblUnitName;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// hdId 控件。
|
/// hdId 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -54,6 +54,9 @@
|
|||||||
<f:RenderField Width="100px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode" FieldType="String"
|
<f:RenderField Width="100px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode" FieldType="String"
|
||||||
HeaderText="项目代号">
|
HeaderText="项目代号">
|
||||||
</f:RenderField>
|
</f:RenderField>
|
||||||
|
<f:RenderField Width="100px" ColumnID="ProjectRealCode" DataField="ProjectRealCode" SortField="ProjectRealCode" FieldType="String"
|
||||||
|
HeaderText="项目编码">
|
||||||
|
</f:RenderField>
|
||||||
<f:RenderField Width="200px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
|
<f:RenderField Width="200px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
|
||||||
FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Left">
|
FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Left">
|
||||||
</f:RenderField>
|
</f:RenderField>
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.ProjectData
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private void BindGrid()
|
private void BindGrid()
|
||||||
{
|
{
|
||||||
string strSql = "SELECT Project.ProjectId,Project.ProjectCode,Project.ProjectName,unit.UnitName,Project.StartDate,Project.EndDate,Project.ProjectAddress,ShortName, ConstructionMoney,"
|
string strSql = "SELECT Project.ProjectId,Project.ProjectCode,Project.ProjectName,Project.ProjectRealCode,unit.UnitName,Project.StartDate,Project.EndDate,Project.ProjectAddress,ShortName, ConstructionMoney,"
|
||||||
+ @" (CASE WHEN ProjectState='" + BLL.Const.ProjectState_2 + "' THEN '暂停中' WHEN ProjectState='" + BLL.Const.ProjectState_3 + "' THEN '已完工' ELSE '施工中' END) AS ProjectStateName,Project.ProjectState"
|
+ @" (CASE WHEN ProjectState='" + BLL.Const.ProjectState_2 + "' THEN '暂停中' WHEN ProjectState='" + BLL.Const.ProjectState_3 + "' THEN '已完工' ELSE '施工中' END) AS ProjectStateName,Project.ProjectState"
|
||||||
+ @" ,ProjectMoney,DATEDIFF(DAY,Project.StartDate,GETDATE()) AS DayCount,ProjectType.ProjectTypeName AS ProjectTypeName"
|
+ @" ,ProjectMoney,DATEDIFF(DAY,Project.StartDate,GETDATE()) AS DayCount,ProjectType.ProjectTypeName AS ProjectTypeName"
|
||||||
+ @" FROM Base_Project AS Project LEFT JOIN Base_Unit as unit on unit.UnitId=Project.UnitId "
|
+ @" FROM Base_Project AS Project LEFT JOIN Base_Unit as unit on unit.UnitId=Project.UnitId "
|
||||||
|
|||||||
@@ -57,6 +57,9 @@
|
|||||||
<f:RenderField Width="100px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode" FieldType="String"
|
<f:RenderField Width="100px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode" FieldType="String"
|
||||||
HeaderText="项目号">
|
HeaderText="项目号">
|
||||||
</f:RenderField>
|
</f:RenderField>
|
||||||
|
<f:RenderField Width="100px" ColumnID="ProjectRealCode" DataField="ProjectRealCode" SortField="ProjectRealCode" FieldType="String"
|
||||||
|
HeaderText="项目编码">
|
||||||
|
</f:RenderField>
|
||||||
<f:RenderField Width="300px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
|
<f:RenderField Width="300px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
|
||||||
FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Left">
|
FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Left">
|
||||||
</f:RenderField>
|
</f:RenderField>
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ namespace FineUIPro.Web.ProjectData
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private void BindGrid()
|
private void BindGrid()
|
||||||
{
|
{
|
||||||
string strSql = "SELECT Project.ProjectId,Project.ProjectCode,Project.ProjectName,unit.UnitName,Project.StartDate,Project.EndDate,Project.ProjectAddress,ProjectType.ProjectTypeName AS ProjectTypeName,ShortName, "
|
string strSql = "SELECT Project.ProjectId,Project.ProjectCode,Project.ProjectName,Project.ProjectRealCode,unit.UnitName,Project.StartDate,Project.EndDate,Project.ProjectAddress,ProjectType.ProjectTypeName AS ProjectTypeName,ShortName, "
|
||||||
+ @" (CASE WHEN ProjectState='" + BLL.Const.ProjectState_2 + "' THEN '暂停中' WHEN ProjectState='" + BLL.Const.ProjectState_3 + "' THEN '已完工' ELSE '施工中' END) AS ProjectStateName,Project.ProjectState"
|
+ @" (CASE WHEN ProjectState='" + BLL.Const.ProjectState_2 + "' THEN '暂停中' WHEN ProjectState='" + BLL.Const.ProjectState_3 + "' THEN '已完工' ELSE '施工中' END) AS ProjectStateName,Project.ProjectState"
|
||||||
+ @" FROM Base_Project AS Project LEFT JOIN Base_Unit as unit on unit.UnitId=Project.UnitId"
|
+ @" FROM Base_Project AS Project LEFT JOIN Base_Unit as unit on unit.UnitId=Project.UnitId"
|
||||||
+ @" LEFT JOIN Base_ProjectType AS ProjectType ON Project.ProjectType =ProjectType.ProjectTypeId"
|
+ @" LEFT JOIN Base_ProjectType AS ProjectType ON Project.ProjectType =ProjectType.ProjectTypeId"
|
||||||
|
|||||||
@@ -126,6 +126,16 @@
|
|||||||
|
|
||||||
</Items>
|
</Items>
|
||||||
</f:FormRow>
|
</f:FormRow>
|
||||||
|
<f:FormRow>
|
||||||
|
<Items>
|
||||||
|
<f:TextBox ID="txtProjectRealCode" runat="server" Label="项目编码" Required="true" MaxLength="50"
|
||||||
|
ShowRedStar="true"></f:TextBox>
|
||||||
|
</Items>
|
||||||
|
<Items>
|
||||||
|
<f:TextBox ID="TextBox2" runat="server" Label="" LabelWidth="150px" Hidden="true"
|
||||||
|
MaxLength="6" Required="true" ShowRedStar="true"></f:TextBox>
|
||||||
|
</Items>
|
||||||
|
</f:FormRow>
|
||||||
</rows>
|
</rows>
|
||||||
<toolbars>
|
<toolbars>
|
||||||
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
|
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
|
||||||
|
|||||||
@@ -100,6 +100,7 @@ namespace FineUIPro.Web.ProjectData
|
|||||||
}
|
}
|
||||||
this.txtCity.Text = project.City;
|
this.txtCity.Text = project.City;
|
||||||
this.txtEnglishRemark.Text = project.EnglishRemark;
|
this.txtEnglishRemark.Text = project.EnglishRemark;
|
||||||
|
this.txtProjectRealCode.Text = project.ProjectRealCode;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -141,6 +142,7 @@ namespace FineUIPro.Web.ProjectData
|
|||||||
Country = this.txtCountry.Text.Trim(),
|
Country = this.txtCountry.Text.Trim(),
|
||||||
City = this.txtCity.Text.Trim(),
|
City = this.txtCity.Text.Trim(),
|
||||||
EnglishRemark = this.txtEnglishRemark.Text.Trim(),
|
EnglishRemark = this.txtEnglishRemark.Text.Trim(),
|
||||||
|
ProjectRealCode=this.txtProjectRealCode.Text.Trim(),
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(txtStartDate.Text.Trim()))
|
if (!string.IsNullOrEmpty(txtStartDate.Text.Trim()))
|
||||||
|
|||||||
+20
-4
@@ -7,12 +7,10 @@
|
|||||||
// </自动生成>
|
// </自动生成>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
namespace FineUIPro.Web.ProjectData
|
namespace FineUIPro.Web.ProjectData {
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
public partial class ProjectSetSave
|
public partial class ProjectSetSave {
|
||||||
{
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// form1 控件。
|
/// form1 控件。
|
||||||
@@ -275,6 +273,24 @@ namespace FineUIPro.Web.ProjectData
|
|||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.TextBox txtEnglishRemark;
|
protected global::FineUIPro.TextBox txtEnglishRemark;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// txtProjectRealCode 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.TextBox txtProjectRealCode;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// TextBox2 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.TextBox TextBox2;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Toolbar1 控件。
|
/// Toolbar1 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -96,10 +96,20 @@
|
|||||||
</f:FormRow>
|
</f:FormRow>
|
||||||
<f:FormRow>
|
<f:FormRow>
|
||||||
<Items>
|
<Items>
|
||||||
<f:TextBox ID="txtEnglishRemark" runat="server" Label="英文简称" Readonly="true"></f:TextBox>
|
<f:TextBox ID="txtEnglishRemark" runat="server" Label="英文简称" Readonly="true" LabelWidth="150px"></f:TextBox>
|
||||||
<f:Label ID="lb1" runat="server"></f:Label>
|
<f:Label ID="lb1" runat="server"></f:Label>
|
||||||
</Items>
|
</Items>
|
||||||
</f:FormRow>
|
</f:FormRow>
|
||||||
|
<f:FormRow>
|
||||||
|
<Items>
|
||||||
|
<f:TextBox ID="txtProjectRealCode" runat="server" Label="项目编码" Required="true" MaxLength="50" Readonly="true" LabelWidth="150px"
|
||||||
|
ShowRedStar="true"></f:TextBox>
|
||||||
|
</Items>
|
||||||
|
<Items>
|
||||||
|
<f:TextBox ID="TextBox2" runat="server" Label="" LabelWidth="150px" Hidden="true"
|
||||||
|
MaxLength="6" Required="true" ShowRedStar="true"></f:TextBox>
|
||||||
|
</Items>
|
||||||
|
</f:FormRow>
|
||||||
</rows>
|
</rows>
|
||||||
<toolbars>
|
<toolbars>
|
||||||
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
|
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
|
||||||
|
|||||||
@@ -89,6 +89,7 @@ namespace FineUIPro.Web.ProjectData
|
|||||||
this.txtProvince.Text = project.Province;
|
this.txtProvince.Text = project.Province;
|
||||||
this.txtCity.Text = project.City;
|
this.txtCity.Text = project.City;
|
||||||
this.txtEnglishRemark.Text = project.EnglishRemark;
|
this.txtEnglishRemark.Text = project.EnglishRemark;
|
||||||
|
this.txtProjectRealCode.Text = project.ProjectRealCode;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -264,6 +264,24 @@ namespace FineUIPro.Web.ProjectData {
|
|||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.Label lb1;
|
protected global::FineUIPro.Label lb1;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// txtProjectRealCode 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.TextBox txtProjectRealCode;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// TextBox2 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.TextBox TextBox2;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Toolbar1 控件。
|
/// Toolbar1 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -23808,6 +23808,8 @@ namespace Model
|
|||||||
|
|
||||||
private string _EnglishRemark;
|
private string _EnglishRemark;
|
||||||
|
|
||||||
|
private string _ProjectRealCode;
|
||||||
|
|
||||||
private EntitySet<Accident_AccidentHandle> _Accident_AccidentHandle;
|
private EntitySet<Accident_AccidentHandle> _Accident_AccidentHandle;
|
||||||
|
|
||||||
private EntitySet<Accident_AccidentPersonRecord> _Accident_AccidentPersonRecord;
|
private EntitySet<Accident_AccidentPersonRecord> _Accident_AccidentPersonRecord;
|
||||||
@@ -24224,6 +24226,8 @@ namespace Model
|
|||||||
partial void OnTelephoneChanged();
|
partial void OnTelephoneChanged();
|
||||||
partial void OnEnglishRemarkChanging(string value);
|
partial void OnEnglishRemarkChanging(string value);
|
||||||
partial void OnEnglishRemarkChanged();
|
partial void OnEnglishRemarkChanged();
|
||||||
|
partial void OnProjectRealCodeChanging(string value);
|
||||||
|
partial void OnProjectRealCodeChanged();
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
public Base_Project()
|
public Base_Project()
|
||||||
@@ -24977,6 +24981,26 @@ namespace Model
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectRealCode", DbType="NVarChar(50)")]
|
||||||
|
public string ProjectRealCode
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._ProjectRealCode;
|
||||||
|
}
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if ((this._ProjectRealCode != value))
|
||||||
|
{
|
||||||
|
this.OnProjectRealCodeChanging(value);
|
||||||
|
this.SendPropertyChanging();
|
||||||
|
this._ProjectRealCode = value;
|
||||||
|
this.SendPropertyChanged("ProjectRealCode");
|
||||||
|
this.OnProjectRealCodeChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentHandle_Base_Project", Storage="_Accident_AccidentHandle", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
|
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentHandle_Base_Project", Storage="_Accident_AccidentHandle", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
|
||||||
public EntitySet<Accident_AccidentHandle> Accident_AccidentHandle
|
public EntitySet<Accident_AccidentHandle> Accident_AccidentHandle
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user