lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

Browse Source
This commit is contained in:
高飞
2023-10-25 16:58:47 +08:00
parent d1a4134e7b
commit 2e3ff9873c
23 changed files with 329 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataBase/版本日志/SGGLDB_V2023-10-25.sql
+2
View File
@@ -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
SGGL/BLL/ProjectData/ProjectService.cs
+16
View File
@@ -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);
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs
+4 -4
View File
@@ -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);
} }
SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs
+22 -22
View File
@@ -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
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx
+1 -1
View File
@@ -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"
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx.cs
+1 -1
View File
@@ -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,
SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx
+2
View File
@@ -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>
SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx.cs
+26
View File
@@ -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
SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx.designer.cs
Generated
+18
View File
@@ -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;
} }
} }
SGGL/FineUIPro.Web/PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx
+2
View File
@@ -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"
SGGL/FineUIPro.Web/PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx.cs
+87 -51
View File
@@ -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
@@ -183,63 +212,70 @@ namespace FineUIPro.Web.PZHGL.InformationProject
{ {
if (!string.IsNullOrEmpty(this.txtMonth.Text.Trim())) if (!string.IsNullOrEmpty(this.txtMonth.Text.Trim()))
{ {
Model.SGGLDB db = Funs.DB; if (this.Grid1.Rows.Count > 0)
DateTime month = Funs.GetNewDateTimeOrNow(this.txtMonth.Text.Trim() + "-01");
BLL.ConstructionLogWorkEfficiencyMonthService.DeleteConstructionLogWorkEfficiencyMonthsByConstructionLogId(this.CurrUser.LoginProjectId, month);
var workEfficiencys = from x in db.ZHGL_ConstructionLogWorkEfficiency
join y in db.ZHGL_ConstructionLog on x.ConstructionLogId equals y.ConstructionLogId
where y.ProjectId == this.CurrUser.LoginProjectId
select x;
List<string> workPostIds = (from x in workEfficiencys
where x.Type == "Person"
select x.TypeId).Distinct().ToList();
List<string> machineIds = (from x in workEfficiencys
where x.Type == "Machine"
select x.TypeId).Distinct().ToList();
foreach (JObject mergedRow in Grid1.GetMergedData())
{ {
JObject values = mergedRow.Value<JObject>("values"); Model.SGGLDB db = Funs.DB;
int a = mergedRow.Value<int>("index"); DateTime month = Funs.GetNewDateTimeOrNow(this.txtMonth.Text.Trim() + "-01");
if (this.Grid1.Rows[a].DataKeys[2] != null) BLL.ConstructionLogWorkEfficiencyMonthService.DeleteConstructionLogWorkEfficiencyMonthsByConstructionLogId(this.CurrUser.LoginProjectId, month);
var workEfficiencys = from x in db.ZHGL_ConstructionLogWorkEfficiency
join y in db.ZHGL_ConstructionLog on x.ConstructionLogId equals y.ConstructionLogId
where y.ProjectId == this.CurrUser.LoginProjectId
select x;
List<string> workPostIds = (from x in workEfficiencys
where x.Type == "Person"
select x.TypeId).Distinct().ToList();
List<string> machineIds = (from x in workEfficiencys
where x.Type == "Machine"
select x.TypeId).Distinct().ToList();
foreach (JObject mergedRow in Grid1.GetMergedData())
{ {
string physicalCompletionQuantity = values.Value<string>("PhysicalCompletionQuantity"); JObject values = mergedRow.Value<JObject>("values");
string materialConsumption = values.Value<string>("MaterialConsumption"); int a = mergedRow.Value<int>("index");
string unitOfMeasurement = values.Value<string>("UnitOfMeasurement"); if (this.Grid1.Rows[a].DataKeys[2] != null)
for (int i = 0; i < workPostIds.Count; i++)
{ {
Model.ZHGL_ConstructionLogWorkEfficiencyMonth workEfficiency = new Model.ZHGL_ConstructionLogWorkEfficiencyMonth(); string physicalCompletionQuantity = values.Value<string>("PhysicalCompletionQuantity");
workEfficiency.ConstructionLogWorkEfficiencyMonthId = SQLHelper.GetNewID(); string materialConsumption = values.Value<string>("MaterialConsumption");
workEfficiency.ProjectId = this.CurrUser.LoginProjectId; string unitOfMeasurement = values.Value<string>("UnitOfMeasurement");
workEfficiency.Month = month; for (int i = 0; i < workPostIds.Count; i++)
workEfficiency.ContractTrackId = this.Grid1.Rows[a].DataKeys[2].ToString(); {
workEfficiency.PhysicalCompletionQuantity = Funs.GetNewDecimal(physicalCompletionQuantity); Model.ZHGL_ConstructionLogWorkEfficiencyMonth workEfficiency = new Model.ZHGL_ConstructionLogWorkEfficiencyMonth();
workEfficiency.MaterialConsumption = Funs.GetNewDecimal(materialConsumption); workEfficiency.ConstructionLogWorkEfficiencyMonthId = SQLHelper.GetNewID();
workEfficiency.UnitOfMeasurement = unitOfMeasurement; workEfficiency.ProjectId = this.CurrUser.LoginProjectId;
workEfficiency.Type = "Person"; workEfficiency.Month = month;
workEfficiency.TypeId = workPostIds[i]; workEfficiency.ContractTrackId = this.Grid1.Rows[a].DataKeys[2].ToString();
workEfficiency.ConsumeHours = Funs.GetNewDecimal(values.Value<string>("PersonConsumeHours" + i.ToString())); workEfficiency.PhysicalCompletionQuantity = Funs.GetNewDecimal(physicalCompletionQuantity);
workEfficiency.WorkEfficiency = Funs.GetNewDecimal(values.Value<string>("PersonWorkEfficiency" + i.ToString())); workEfficiency.MaterialConsumption = Funs.GetNewDecimal(materialConsumption);
BLL.ConstructionLogWorkEfficiencyMonthService.AddConstructionLogWorkEfficiencyMonth(workEfficiency); workEfficiency.UnitOfMeasurement = unitOfMeasurement;
} workEfficiency.Type = "Person";
for (int i = 0; i < machineIds.Count; i++) workEfficiency.TypeId = workPostIds[i];
{ workEfficiency.ConsumeHours = Funs.GetNewDecimal(values.Value<string>("PersonConsumeHours" + i.ToString()));
Model.ZHGL_ConstructionLogWorkEfficiencyMonth workEfficiency = new Model.ZHGL_ConstructionLogWorkEfficiencyMonth(); workEfficiency.WorkEfficiency = Funs.GetNewDecimal(values.Value<string>("PersonWorkEfficiency" + i.ToString()));
workEfficiency.ConstructionLogWorkEfficiencyMonthId = SQLHelper.GetNewID(); BLL.ConstructionLogWorkEfficiencyMonthService.AddConstructionLogWorkEfficiencyMonth(workEfficiency);
workEfficiency.ProjectId = this.CurrUser.LoginProjectId; }
workEfficiency.Month = month; for (int i = 0; i < machineIds.Count; i++)
workEfficiency.ContractTrackId = this.Grid1.Rows[a].DataKeys[2].ToString(); {
workEfficiency.PhysicalCompletionQuantity = Funs.GetNewDecimal(physicalCompletionQuantity); Model.ZHGL_ConstructionLogWorkEfficiencyMonth workEfficiency = new Model.ZHGL_ConstructionLogWorkEfficiencyMonth();
workEfficiency.MaterialConsumption = Funs.GetNewDecimal(materialConsumption); workEfficiency.ConstructionLogWorkEfficiencyMonthId = SQLHelper.GetNewID();
workEfficiency.UnitOfMeasurement = unitOfMeasurement; workEfficiency.ProjectId = this.CurrUser.LoginProjectId;
workEfficiency.Type = "Machine"; workEfficiency.Month = month;
workEfficiency.TypeId = machineIds[i]; workEfficiency.ContractTrackId = this.Grid1.Rows[a].DataKeys[2].ToString();
workEfficiency.ConsumeHours = Funs.GetNewDecimal(values.Value<string>("MachineConsumeHours" + i.ToString())); workEfficiency.PhysicalCompletionQuantity = Funs.GetNewDecimal(physicalCompletionQuantity);
workEfficiency.WorkEfficiency = Funs.GetNewDecimal(values.Value<string>("MachineWorkEfficiency" + i.ToString())); workEfficiency.MaterialConsumption = Funs.GetNewDecimal(materialConsumption);
BLL.ConstructionLogWorkEfficiencyMonthService.AddConstructionLogWorkEfficiencyMonth(workEfficiency); workEfficiency.UnitOfMeasurement = unitOfMeasurement;
workEfficiency.Type = "Machine";
workEfficiency.TypeId = machineIds[i];
workEfficiency.ConsumeHours = Funs.GetNewDecimal(values.Value<string>("MachineConsumeHours" + i.ToString()));
workEfficiency.WorkEfficiency = Funs.GetNewDecimal(values.Value<string>("MachineWorkEfficiency" + i.ToString()));
BLL.ConstructionLogWorkEfficiencyMonthService.AddConstructionLogWorkEfficiencyMonth(workEfficiency);
}
} }
} }
ShowNotify("保存成功！", MessageBoxIcon.Success);
}
else
{
Alert.ShowInTop("请先统计后再保存！", MessageBoxIcon.Warning);
} }
ShowNotify("保存成功！", MessageBoxIcon.Success);
} }
else else
{ {
SGGL/FineUIPro.Web/PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx.designer.cs
Generated
+18
View File
@@ -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>
SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx
+3
View File
@@ -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>
SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs
+1 -1
View File
@@ -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 "
SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx
+3
View File
@@ -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>
SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs
+1 -1
View File
@@ -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"
SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx
+10
View File
@@ -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">
SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs
+2
View File
@@ -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()))
SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs
Generated
+56 -40
View File
@@ -7,13 +7,11 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.ProjectData namespace FineUIPro.Web.ProjectData {
{
public partial class ProjectSetSave {
public partial class ProjectSetSave
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
/// </summary> /// </summary>
@@ -22,7 +20,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1; protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary> /// <summary>
/// PageManager1 控件。 /// PageManager1 控件。
/// </summary> /// </summary>
@@ -31,7 +29,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.PageManager PageManager1; protected global::FineUIPro.PageManager PageManager1;
/// <summary> /// <summary>
/// SimpleForm1 控件。 /// SimpleForm1 控件。
/// </summary> /// </summary>
@@ -40,7 +38,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.Form SimpleForm1; protected global::FineUIPro.Form SimpleForm1;
/// <summary> /// <summary>
/// txtProjectName 控件。 /// txtProjectName 控件。
/// </summary> /// </summary>
@@ -49,7 +47,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtProjectName; protected global::FineUIPro.TextBox txtProjectName;
/// <summary> /// <summary>
/// txtProjectCode 控件。 /// txtProjectCode 控件。
/// </summary> /// </summary>
@@ -58,7 +56,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtProjectCode; protected global::FineUIPro.TextBox txtProjectCode;
/// <summary> /// <summary>
/// txtShortName 控件。 /// txtShortName 控件。
/// </summary> /// </summary>
@@ -67,7 +65,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtShortName; protected global::FineUIPro.TextBox txtShortName;
/// <summary> /// <summary>
/// drpProjectType 控件。 /// drpProjectType 控件。
/// </summary> /// </summary>
@@ -76,7 +74,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpProjectType; protected global::FineUIPro.DropDownList drpProjectType;
/// <summary> /// <summary>
/// drpProjectState 控件。 /// drpProjectState 控件。
/// </summary> /// </summary>
@@ -85,7 +83,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpProjectState; protected global::FineUIPro.DropDownList drpProjectState;
/// <summary> /// <summary>
/// txtStartDate 控件。 /// txtStartDate 控件。
/// </summary> /// </summary>
@@ -94,7 +92,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.DatePicker txtStartDate; protected global::FineUIPro.DatePicker txtStartDate;
/// <summary> /// <summary>
/// txtEndDate 控件。 /// txtEndDate 控件。
/// </summary> /// </summary>
@@ -103,7 +101,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.DatePicker txtEndDate; protected global::FineUIPro.DatePicker txtEndDate;
/// <summary> /// <summary>
/// txtContractNo 控件。 /// txtContractNo 控件。
/// </summary> /// </summary>
@@ -112,7 +110,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtContractNo; protected global::FineUIPro.TextBox txtContractNo;
/// <summary> /// <summary>
/// txtDuration 控件。 /// txtDuration 控件。
/// </summary> /// </summary>
@@ -121,7 +119,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.NumberBox txtDuration; protected global::FineUIPro.NumberBox txtDuration;
/// <summary> /// <summary>
/// drpUnit 控件。 /// drpUnit 控件。
/// </summary> /// </summary>
@@ -130,7 +128,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpUnit; protected global::FineUIPro.DropDownList drpUnit;
/// <summary> /// <summary>
/// ckbIsForeign 控件。 /// ckbIsForeign 控件。
/// </summary> /// </summary>
@@ -139,7 +137,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.CheckBox ckbIsForeign; protected global::FineUIPro.CheckBox ckbIsForeign;
/// <summary> /// <summary>
/// drpProjectManager 控件。 /// drpProjectManager 控件。
/// </summary> /// </summary>
@@ -148,7 +146,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpProjectManager; protected global::FineUIPro.DropDownList drpProjectManager;
/// <summary> /// <summary>
/// drpConstructionManager 控件。 /// drpConstructionManager 控件。
/// </summary> /// </summary>
@@ -157,7 +155,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpConstructionManager; protected global::FineUIPro.DropDownList drpConstructionManager;
/// <summary> /// <summary>
/// drpHSSEManager 控件。 /// drpHSSEManager 控件。
/// </summary> /// </summary>
@@ -166,7 +164,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpHSSEManager; protected global::FineUIPro.DropDownList drpHSSEManager;
/// <summary> /// <summary>
/// txtProjectAddress 控件。 /// txtProjectAddress 控件。
/// </summary> /// </summary>
@@ -175,7 +173,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtProjectAddress; protected global::FineUIPro.TextBox txtProjectAddress;
/// <summary> /// <summary>
/// txtWorkRange 控件。 /// txtWorkRange 控件。
/// </summary> /// </summary>
@@ -184,7 +182,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextArea txtWorkRange; protected global::FineUIPro.TextArea txtWorkRange;
/// <summary> /// <summary>
/// txtRemark 控件。 /// txtRemark 控件。
/// </summary> /// </summary>
@@ -193,7 +191,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextArea txtRemark; protected global::FineUIPro.TextArea txtRemark;
/// <summary> /// <summary>
/// txtProjectMoney 控件。 /// txtProjectMoney 控件。
/// </summary> /// </summary>
@@ -202,7 +200,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.NumberBox txtProjectMoney; protected global::FineUIPro.NumberBox txtProjectMoney;
/// <summary> /// <summary>
/// txtConstructionMoney 控件。 /// txtConstructionMoney 控件。
/// </summary> /// </summary>
@@ -211,7 +209,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.NumberBox txtConstructionMoney; protected global::FineUIPro.NumberBox txtConstructionMoney;
/// <summary> /// <summary>
/// txtTelephone 控件。 /// txtTelephone 控件。
/// </summary> /// </summary>
@@ -220,7 +218,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtTelephone; protected global::FineUIPro.TextBox txtTelephone;
/// <summary> /// <summary>
/// txtCountry 控件。 /// txtCountry 控件。
/// </summary> /// </summary>
@@ -229,7 +227,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtCountry; protected global::FineUIPro.TextBox txtCountry;
/// <summary> /// <summary>
/// drpProvince 控件。 /// drpProvince 控件。
/// </summary> /// </summary>
@@ -238,7 +236,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpProvince; protected global::FineUIPro.DropDownList drpProvince;
/// <summary> /// <summary>
/// txtCity 控件。 /// txtCity 控件。
/// </summary> /// </summary>
@@ -247,7 +245,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtCity; protected global::FineUIPro.TextBox txtCity;
/// <summary> /// <summary>
/// txtMapCoordinates 控件。 /// txtMapCoordinates 控件。
/// </summary> /// </summary>
@@ -256,7 +254,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtMapCoordinates; protected global::FineUIPro.TextBox txtMapCoordinates;
/// <summary> /// <summary>
/// bottomPanel 控件。 /// bottomPanel 控件。
/// </summary> /// </summary>
@@ -265,7 +263,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.ContentPanel bottomPanel; protected global::FineUIPro.ContentPanel bottomPanel;
/// <summary> /// <summary>
/// txtEnglishRemark 控件。 /// txtEnglishRemark 控件。
/// </summary> /// </summary>
@@ -274,7 +272,25 @@ 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>
@@ -283,7 +299,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.Toolbar Toolbar1; protected global::FineUIPro.Toolbar Toolbar1;
/// <summary> /// <summary>
/// ckIsUpTotalMonth 控件。 /// ckIsUpTotalMonth 控件。
/// </summary> /// </summary>
@@ -292,7 +308,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.CheckBox ckIsUpTotalMonth; protected global::FineUIPro.CheckBox ckIsUpTotalMonth;
/// <summary> /// <summary>
/// btnSave 控件。 /// btnSave 控件。
/// </summary> /// </summary>
@@ -301,7 +317,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.Button btnSave; protected global::FineUIPro.Button btnSave;
/// <summary> /// <summary>
/// btnClose 控件。 /// btnClose 控件。
/// </summary> /// </summary>
@@ -310,7 +326,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.Button btnClose; protected global::FineUIPro.Button btnClose;
/// <summary> /// <summary>
/// hdCompileMan 控件。 /// hdCompileMan 控件。
/// </summary> /// </summary>
SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx
+11 -1
View File
@@ -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">
SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.cs
+1
View File
@@ -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;
} }
} }
} }
SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.designer.cs
Generated
+18
View File
@@ -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>
SGGL/Model/Model.cs
+24
View File
@@ -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
{ {