diff --git a/DataBase/版本日志/SGGLDB_V2023-10-25.sql b/DataBase/版本日志/SGGLDB_V2023-10-25.sql index 8950d1fc..4e97ccc5 100644 --- a/DataBase/版本日志/SGGLDB_V2023-10-25.sql +++ b/DataBase/版本日志/SGGLDB_V2023-10-25.sql @@ -5,3 +5,5 @@ go exec sp_rename 'dbo.Base_DNCompare.Sch10S', SCH10S, 'COLUMN' go +alter table Base_Project add ProjectRealCode nvarchar(50) null +GO \ No newline at end of file diff --git a/SGGL/BLL/ProjectData/ProjectService.cs b/SGGL/BLL/ProjectData/ProjectService.cs index 2ceea35c..4e45f8e3 100644 --- a/SGGL/BLL/ProjectData/ProjectService.cs +++ b/SGGL/BLL/ProjectData/ProjectService.cs @@ -48,6 +48,20 @@ } return name; } + /// + ///根据ID获取项目编号 + /// + /// + 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) { return Funs.DB.Base_Project.FirstOrDefault(e => e.ShortName == name); @@ -110,6 +124,7 @@ Province = project.Province, City = project.City, EnglishRemark = project.EnglishRemark, + ProjectRealCode=project.ProjectRealCode, }; db.Base_Project.InsertOnSubmit(newProject); @@ -155,6 +170,7 @@ newProject.Province = project.Province; newProject.City = project.City; newProject.EnglishRemark = project.EnglishRemark; + newProject.ProjectRealCode = project.ProjectRealCode; db.SubmitChanges(); HSEDataCollectService.ProjectHSEDataCollectSubmission(newProject); CQMSDataCollectService.ProjectCQMSDataCollectSubmission(newProject); diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs index 73ef09b8..1555c4c8 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs @@ -567,23 +567,23 @@ namespace FineUIPro.Web.CQMS.WBS protected void btnCreateCode_Click(object sender, EventArgs e) { 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 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(); 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); foreach (var workPackage1 in workPackage1s) { if (!workPackage1.PackageContent.Contains("-")) { - workPackage1.WBSCode = projectCode + unitWork.UnitWorkCode + unitWork.ProjectType + workPackage1.PackageCode; + workPackage1.WBSCode = projectRealCode + unitWork.UnitWorkCode + unitWork.ProjectType + workPackage1.PackageCode; } 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); } diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs index be81ca9e..4a4f0398 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs @@ -154,27 +154,27 @@ namespace FineUIPro.Web.HJGL.PreDesign protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) { this.BindGrid(); - var q = view_HJGL_Pipelines.Where(x => x.PipeArea == PipelineService.PipeArea_SHOP); - if (q.Any()) - { - List listpipecode = new List(); - foreach (var item in q) - { - listpipecode.Add("/" + item.PipelineCode); - } - Line_No = string.Join(",", listpipecode); - } - Model.Parameter3D parameter3D = new Model.Parameter3D(); - Model.ColorModel colorModel = new Model.ColorModel(); - colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId); - parameter3D.ColorModel = colorModel; - parameter3D.TagNum = Line_No; - parameter3D.ButtonType = "1"; - parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); - // parameter3D.Line_No = Line_No; - ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName; - ctlAuditFlow.data = parameter3D; - ctlAuditFlow.BindData(); + // var q = view_HJGL_Pipelines.Where(x => x.PipeArea == PipelineService.PipeArea_SHOP); + // if (q.Any()) + // { + // List listpipecode = new List(); + // foreach (var item in q) + // { + // listpipecode.Add("/" + item.PipelineCode); + // } + // Line_No = string.Join(",", listpipecode); + // } + // Model.Parameter3D parameter3D = new Model.Parameter3D(); + // Model.ColorModel colorModel = new Model.ColorModel(); + // colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId); + // parameter3D.ColorModel = colorModel; + // parameter3D.TagNum = Line_No; + // parameter3D.ButtonType = "1"; + // parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); + //// parameter3D.Line_No = Line_No; + // ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName; + // ctlAuditFlow.data = parameter3D; + // ctlAuditFlow.BindData(); } #endregion @@ -212,7 +212,7 @@ namespace FineUIPro.Web.HJGL.PreDesign var table = this.GetPagedDataTable(Grid1, list); Grid1.DataSource = table; Grid1.DataBind(); - lbSinglePreRate.Text= GetSinglePreRateByUnitWork(this.tvControlItem.SelectedNodeID); + //lbSinglePreRate.Text= GetSinglePreRateByUnitWork(this.tvControlItem.SelectedNodeID); } #endregion diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx index 34f26861..45484aae 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx @@ -132,7 +132,7 @@ - + + diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx.cs index 25fdd6b8..00e42502 100644 --- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx.cs +++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx.cs @@ -107,11 +107,33 @@ namespace FineUIPro.Web.PZHGL.InformationProject if (!IsPostBack) { 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(); } } #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() { 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 contractNoList = Funs.GetStrListByStr(contractNo, ','); List professionalList = Funs.GetStrListByStr(professional, ','); var workEfficiencys = from x in db.ZHGL_ConstructionLogWorkEfficiency diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx.designer.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx.designer.cs index 68913b12..1c6d9e98 100644 --- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx.designer.cs @@ -74,5 +74,23 @@ namespace FineUIPro.Web.PZHGL.InformationProject { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox hdId; + + /// + /// drpContractNo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpContractNo; + + /// + /// lblUnitName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblUnitName; } } diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx b/SGGL/FineUIPro.Web/PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx index 461cd6d0..c1c9bbda 100644 --- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx +++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx @@ -29,6 +29,8 @@ + + contractNoList = Funs.GetStrListByStr(contractNo, ','); List professionalList = Funs.GetStrListByStr(professional, ','); var workEfficiencys = from x in db.ZHGL_ConstructionLogWorkEfficiency @@ -183,63 +212,70 @@ namespace FineUIPro.Web.PZHGL.InformationProject { if (!string.IsNullOrEmpty(this.txtMonth.Text.Trim())) { - Model.SGGLDB db = Funs.DB; - 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 workPostIds = (from x in workEfficiencys - where x.Type == "Person" - select x.TypeId).Distinct().ToList(); - List machineIds = (from x in workEfficiencys - where x.Type == "Machine" - select x.TypeId).Distinct().ToList(); - foreach (JObject mergedRow in Grid1.GetMergedData()) + if (this.Grid1.Rows.Count > 0) { - JObject values = mergedRow.Value("values"); - int a = mergedRow.Value("index"); - if (this.Grid1.Rows[a].DataKeys[2] != null) + Model.SGGLDB db = Funs.DB; + 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 workPostIds = (from x in workEfficiencys + where x.Type == "Person" + select x.TypeId).Distinct().ToList(); + List machineIds = (from x in workEfficiencys + where x.Type == "Machine" + select x.TypeId).Distinct().ToList(); + foreach (JObject mergedRow in Grid1.GetMergedData()) { - string physicalCompletionQuantity = values.Value("PhysicalCompletionQuantity"); - string materialConsumption = values.Value("MaterialConsumption"); - string unitOfMeasurement = values.Value("UnitOfMeasurement"); - for (int i = 0; i < workPostIds.Count; i++) + JObject values = mergedRow.Value("values"); + int a = mergedRow.Value("index"); + if (this.Grid1.Rows[a].DataKeys[2] != null) { - Model.ZHGL_ConstructionLogWorkEfficiencyMonth workEfficiency = new Model.ZHGL_ConstructionLogWorkEfficiencyMonth(); - workEfficiency.ConstructionLogWorkEfficiencyMonthId = SQLHelper.GetNewID(); - workEfficiency.ProjectId = this.CurrUser.LoginProjectId; - workEfficiency.Month = month; - workEfficiency.ContractTrackId = this.Grid1.Rows[a].DataKeys[2].ToString(); - workEfficiency.PhysicalCompletionQuantity = Funs.GetNewDecimal(physicalCompletionQuantity); - workEfficiency.MaterialConsumption = Funs.GetNewDecimal(materialConsumption); - workEfficiency.UnitOfMeasurement = unitOfMeasurement; - workEfficiency.Type = "Person"; - workEfficiency.TypeId = workPostIds[i]; - workEfficiency.ConsumeHours = Funs.GetNewDecimal(values.Value("PersonConsumeHours" + i.ToString())); - workEfficiency.WorkEfficiency = Funs.GetNewDecimal(values.Value("PersonWorkEfficiency" + i.ToString())); - BLL.ConstructionLogWorkEfficiencyMonthService.AddConstructionLogWorkEfficiencyMonth(workEfficiency); - } - for (int i = 0; i < machineIds.Count; i++) - { - Model.ZHGL_ConstructionLogWorkEfficiencyMonth workEfficiency = new Model.ZHGL_ConstructionLogWorkEfficiencyMonth(); - workEfficiency.ConstructionLogWorkEfficiencyMonthId = SQLHelper.GetNewID(); - workEfficiency.ProjectId = this.CurrUser.LoginProjectId; - workEfficiency.Month = month; - workEfficiency.ContractTrackId = this.Grid1.Rows[a].DataKeys[2].ToString(); - workEfficiency.PhysicalCompletionQuantity = Funs.GetNewDecimal(physicalCompletionQuantity); - workEfficiency.MaterialConsumption = Funs.GetNewDecimal(materialConsumption); - workEfficiency.UnitOfMeasurement = unitOfMeasurement; - workEfficiency.Type = "Machine"; - workEfficiency.TypeId = machineIds[i]; - workEfficiency.ConsumeHours = Funs.GetNewDecimal(values.Value("MachineConsumeHours" + i.ToString())); - workEfficiency.WorkEfficiency = Funs.GetNewDecimal(values.Value("MachineWorkEfficiency" + i.ToString())); - BLL.ConstructionLogWorkEfficiencyMonthService.AddConstructionLogWorkEfficiencyMonth(workEfficiency); + string physicalCompletionQuantity = values.Value("PhysicalCompletionQuantity"); + string materialConsumption = values.Value("MaterialConsumption"); + string unitOfMeasurement = values.Value("UnitOfMeasurement"); + for (int i = 0; i < workPostIds.Count; i++) + { + Model.ZHGL_ConstructionLogWorkEfficiencyMonth workEfficiency = new Model.ZHGL_ConstructionLogWorkEfficiencyMonth(); + workEfficiency.ConstructionLogWorkEfficiencyMonthId = SQLHelper.GetNewID(); + workEfficiency.ProjectId = this.CurrUser.LoginProjectId; + workEfficiency.Month = month; + workEfficiency.ContractTrackId = this.Grid1.Rows[a].DataKeys[2].ToString(); + workEfficiency.PhysicalCompletionQuantity = Funs.GetNewDecimal(physicalCompletionQuantity); + workEfficiency.MaterialConsumption = Funs.GetNewDecimal(materialConsumption); + workEfficiency.UnitOfMeasurement = unitOfMeasurement; + workEfficiency.Type = "Person"; + workEfficiency.TypeId = workPostIds[i]; + workEfficiency.ConsumeHours = Funs.GetNewDecimal(values.Value("PersonConsumeHours" + i.ToString())); + workEfficiency.WorkEfficiency = Funs.GetNewDecimal(values.Value("PersonWorkEfficiency" + i.ToString())); + BLL.ConstructionLogWorkEfficiencyMonthService.AddConstructionLogWorkEfficiencyMonth(workEfficiency); + } + for (int i = 0; i < machineIds.Count; i++) + { + Model.ZHGL_ConstructionLogWorkEfficiencyMonth workEfficiency = new Model.ZHGL_ConstructionLogWorkEfficiencyMonth(); + workEfficiency.ConstructionLogWorkEfficiencyMonthId = SQLHelper.GetNewID(); + workEfficiency.ProjectId = this.CurrUser.LoginProjectId; + workEfficiency.Month = month; + workEfficiency.ContractTrackId = this.Grid1.Rows[a].DataKeys[2].ToString(); + workEfficiency.PhysicalCompletionQuantity = Funs.GetNewDecimal(physicalCompletionQuantity); + workEfficiency.MaterialConsumption = Funs.GetNewDecimal(materialConsumption); + workEfficiency.UnitOfMeasurement = unitOfMeasurement; + workEfficiency.Type = "Machine"; + workEfficiency.TypeId = machineIds[i]; + workEfficiency.ConsumeHours = Funs.GetNewDecimal(values.Value("MachineConsumeHours" + i.ToString())); + workEfficiency.WorkEfficiency = Funs.GetNewDecimal(values.Value("MachineWorkEfficiency" + i.ToString())); + BLL.ConstructionLogWorkEfficiencyMonthService.AddConstructionLogWorkEfficiencyMonth(workEfficiency); + } } } + ShowNotify("保存成功！", MessageBoxIcon.Success); + } + else + { + Alert.ShowInTop("请先统计后再保存！", MessageBoxIcon.Warning); } - ShowNotify("保存成功！", MessageBoxIcon.Success); } else { diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx.designer.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx.designer.cs index 05cc6ceb..ad212511 100644 --- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx.designer.cs @@ -66,6 +66,24 @@ namespace FineUIPro.Web.PZHGL.InformationProject { /// protected global::FineUIPro.DatePicker txtMonth; + /// + /// drpContractNo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpContractNo; + + /// + /// lblUnitName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblUnitName; + /// /// hdId 控件。 /// diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx index eeb7b945..013fe491 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx @@ -54,6 +54,9 @@ + + diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs index 1c7b6378..8afc1bdc 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs @@ -34,7 +34,7 @@ namespace FineUIPro.Web.ProjectData /// 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" + @" ,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 " diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx index da68cb66..f49960ce 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx @@ -57,6 +57,9 @@ + + diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs index 45632592..884c81b8 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs @@ -35,7 +35,7 @@ namespace FineUIPro.Web.ProjectData /// 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" + @" 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" diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx index 3cf66773..07de310d 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx @@ -126,6 +126,16 @@ + + + + + + + + diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs index 8428b24b..a2fcda54 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs @@ -100,6 +100,7 @@ namespace FineUIPro.Web.ProjectData } this.txtCity.Text = project.City; this.txtEnglishRemark.Text = project.EnglishRemark; + this.txtProjectRealCode.Text = project.ProjectRealCode; } } else @@ -141,6 +142,7 @@ namespace FineUIPro.Web.ProjectData Country = this.txtCountry.Text.Trim(), City = this.txtCity.Text.Trim(), EnglishRemark = this.txtEnglishRemark.Text.Trim(), + ProjectRealCode=this.txtProjectRealCode.Text.Trim(), }; if (!string.IsNullOrEmpty(txtStartDate.Text.Trim())) diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs index 1782f86b..f7aa1fbf 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs @@ -7,13 +7,11 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.ProjectData -{ - - - public partial class ProjectSetSave - { - +namespace FineUIPro.Web.ProjectData { + + + public partial class ProjectSetSave { + /// /// form1 控件。 /// @@ -22,7 +20,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -31,7 +29,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -40,7 +38,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// txtProjectName 控件。 /// @@ -49,7 +47,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectName; - + /// /// txtProjectCode 控件。 /// @@ -58,7 +56,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectCode; - + /// /// txtShortName 控件。 /// @@ -67,7 +65,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtShortName; - + /// /// drpProjectType 控件。 /// @@ -76,7 +74,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpProjectType; - + /// /// drpProjectState 控件。 /// @@ -85,7 +83,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpProjectState; - + /// /// txtStartDate 控件。 /// @@ -94,7 +92,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtStartDate; - + /// /// txtEndDate 控件。 /// @@ -103,7 +101,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtEndDate; - + /// /// txtContractNo 控件。 /// @@ -112,7 +110,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtContractNo; - + /// /// txtDuration 控件。 /// @@ -121,7 +119,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtDuration; - + /// /// drpUnit 控件。 /// @@ -130,7 +128,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnit; - + /// /// ckbIsForeign 控件。 /// @@ -139,7 +137,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.CheckBox ckbIsForeign; - + /// /// drpProjectManager 控件。 /// @@ -148,7 +146,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpProjectManager; - + /// /// drpConstructionManager 控件。 /// @@ -157,7 +155,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpConstructionManager; - + /// /// drpHSSEManager 控件。 /// @@ -166,7 +164,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpHSSEManager; - + /// /// txtProjectAddress 控件。 /// @@ -175,7 +173,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectAddress; - + /// /// txtWorkRange 控件。 /// @@ -184,7 +182,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtWorkRange; - + /// /// txtRemark 控件。 /// @@ -193,7 +191,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtRemark; - + /// /// txtProjectMoney 控件。 /// @@ -202,7 +200,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtProjectMoney; - + /// /// txtConstructionMoney 控件。 /// @@ -211,7 +209,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtConstructionMoney; - + /// /// txtTelephone 控件。 /// @@ -220,7 +218,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtTelephone; - + /// /// txtCountry 控件。 /// @@ -229,7 +227,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCountry; - + /// /// drpProvince 控件。 /// @@ -238,7 +236,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpProvince; - + /// /// txtCity 控件。 /// @@ -247,7 +245,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCity; - + /// /// txtMapCoordinates 控件。 /// @@ -256,7 +254,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtMapCoordinates; - + /// /// bottomPanel 控件。 /// @@ -265,7 +263,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ContentPanel bottomPanel; - + /// /// txtEnglishRemark 控件。 /// @@ -274,7 +272,25 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtEnglishRemark; - + + /// + /// txtProjectRealCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectRealCode; + + /// + /// TextBox2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox2; + /// /// Toolbar1 控件。 /// @@ -283,7 +299,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// ckIsUpTotalMonth 控件。 /// @@ -292,7 +308,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.CheckBox ckIsUpTotalMonth; - + /// /// btnSave 控件。 /// @@ -301,7 +317,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// btnClose 控件。 /// @@ -310,7 +326,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnClose; - + /// /// hdCompileMan 控件。 /// diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx index ad121eb2..efa3f13f 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx @@ -96,10 +96,20 @@ - + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.cs index d49a60c3..4be265fb 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.cs @@ -89,6 +89,7 @@ namespace FineUIPro.Web.ProjectData this.txtProvince.Text = project.Province; this.txtCity.Text = project.City; this.txtEnglishRemark.Text = project.EnglishRemark; + this.txtProjectRealCode.Text = project.ProjectRealCode; } } } diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.designer.cs index 0d7787aa..0ad6ae26 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.designer.cs @@ -264,6 +264,24 @@ namespace FineUIPro.Web.ProjectData { /// protected global::FineUIPro.Label lb1; + /// + /// txtProjectRealCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectRealCode; + + /// + /// TextBox2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox2; + /// /// Toolbar1 控件。 /// diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 2c91f400..9af3ae6e 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -23808,6 +23808,8 @@ namespace Model private string _EnglishRemark; + private string _ProjectRealCode; + private EntitySet _Accident_AccidentHandle; private EntitySet _Accident_AccidentPersonRecord; @@ -24224,6 +24226,8 @@ namespace Model partial void OnTelephoneChanged(); partial void OnEnglishRemarkChanging(string value); partial void OnEnglishRemarkChanged(); + partial void OnProjectRealCodeChanging(string value); + partial void OnProjectRealCodeChanged(); #endregion 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")] public EntitySet Accident_AccidentHandle {