From be011ed6a3e7dd144c09710e1b06c7159ee2abd2 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Wed, 23 Jul 2025 13:27:58 +0800 Subject: [PATCH] =?UTF-8?q?20250723=20=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8E=82?= =?UTF-8?q?=E9=A2=84=E5=88=B6=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SGGLDB_V2025-07-23-001-bwj.sql | 10 ++ .../HJGLPackagingmanagedetailService.cs | 6 +- .../HJGL/PreDesign/PackagingManageService .cs | 2 +- .../ProductionSchedulingPlanService.cs | 33 +++++++ SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx | 47 +++++---- .../HJGL/PreDesign/InstallList.aspx | 6 +- .../HJGL/PreDesign/InstallList.aspx.cs | 10 +- .../HJGL/PreDesign/PackagingManage.aspx | 12 +-- .../HJGL/PreDesign/PackagingManage.aspx.cs | 82 +++++++++------- .../HJGL/PreDesign/PackagingManageEdit.aspx | 4 +- .../HJGL/PreDesign/PackagingManageView.aspx | 3 + .../PreDesign/PackagingManageView.aspx.cs | 3 +- .../PreDesign/ProductionSchedulingPlan.aspx | 4 +- .../ProductionSchedulingPlan.aspx.cs | 98 +++++++++---------- .../HJGL/PreDesign/TrainNumberManager.aspx | 4 +- SGGL/FineUIPro.Web/common/Menu_DigData.xml | 63 ++++++++++-- SGGL/FineUIPro.Web/common/Menu_HJGL.xml | 7 +- SGGL/FineUIPro.Web/common/Menu_HTGL.xml | 6 +- SGGL/FineUIPro.Web/common/Menu_JDGL.xml | 6 +- SGGL/FineUIPro.Web/common/Menu_PHTGL.xml | 2 +- SGGL/FineUIPro.Web/common/Menu_ZHGL.xml | 42 -------- SGGL/FineUIPro.Web/indexProject.aspx | 2 +- .../PipelinePrefabricatedComponentsItem.cs | 1 + 23 files changed, 265 insertions(+), 188 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2025-07-23-001-bwj.sql diff --git a/DataBase/版本日志/SGGLDB_V2025-07-23-001-bwj.sql b/DataBase/版本日志/SGGLDB_V2025-07-23-001-bwj.sql new file mode 100644 index 00000000..9936db78 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2025-07-23-001-bwj.sql @@ -0,0 +1,10 @@ + +update Sys_Menu set SortIndex='15' where MenuId='53948077-B51D-4FF3-BFB0-AB4E27C42875'--Ųƻ +update Sys_Menu set SortIndex='40' where MenuId='BD9C587E-17C2-49F1-82AE-A05117E41D89'--װ嵥 +update Sys_Menu set SortIndex='50' where MenuId='EEC0D060-C15E-4D25-B015-C2B91F735DAC'--ι +update Sys_Menu set SortIndex='60' where MenuId='25DED954-10C9-47CC-99F2-C44FDE9E0A81'-- +go + +update Sys_Menu set MenuName='װ' where MenuId='25DED954-10C9-47CC-99F2-C44FDE9E0A81'--Ϊװ +update Sys_Menu set MenuName='' where MenuId='EEC0D060-C15E-4D25-B015-C2B91F735DAC'--ιΪ +go \ No newline at end of file diff --git a/SGGL/BLL/HJGL/PreDesign/HJGLPackagingmanagedetailService.cs b/SGGL/BLL/HJGL/PreDesign/HJGLPackagingmanagedetailService.cs index 7f2a10b4..a1d29f42 100644 --- a/SGGL/BLL/HJGL/PreDesign/HJGLPackagingmanagedetailService.cs +++ b/SGGL/BLL/HJGL/PreDesign/HJGLPackagingmanagedetailService.cs @@ -134,7 +134,7 @@ namespace BLL var result = new List(); if (pack.TypeInt == (int)HJGL_PackagingmanageService.TypeInt.预制散件) { - var q = from detail in Funs.DB.HJGL_PackagingManageDetail + var q = from detail in Funs.DB.HJGL_PackagingManageDetail join lib in Funs.DB.HJGL_MaterialCodeLib on detail.MaterialCode equals lib.MaterialCode into libJoin from libItem in libJoin.DefaultIfEmpty() join line in Funs.DB.HJGL_Pipeline on detail.PipelineId equals line.PipelineId into lineJoin @@ -152,7 +152,8 @@ namespace BLL Number = detail.Number, PipelineId = lineItem.PipelineId, PipelineCode = lineItem.PipelineCode, - UnitWorkId=lineItem.UnitWorkId, + UnitWorkId = lineItem.UnitWorkId, + FlowingSection = lineItem.FlowingSection, }; result= q.ToList(); @@ -177,6 +178,7 @@ namespace BLL Number = detail.Number, PipelineId = lineItem.PipelineId, PipelineCode = lineItem.PipelineCode, + FlowingSection = lineItem.FlowingSection, }; result = q.ToList(); diff --git a/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs b/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs index c6062033..1ed47ed5 100644 --- a/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs +++ b/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs @@ -179,7 +179,7 @@ namespace BLL if (!string.IsNullOrEmpty(model.PipelineComponentId)) { var PipelineComponentIds = model.PipelineComponentId.Split(','); - string strSql = @"select com.PipelineComponentId, com.PipelineComponentCode,isnull(pipe.PlanStartDate,getdate()) as PlanStartDate,unitwork.UnitWorkName,'1' as num ,'个' as CU + string strSql = @"select com.PipelineComponentId, com.PipelineComponentCode,isnull(pipe.PlanStartDate,getdate()) as PlanStartDate,unitwork.UnitWorkName,'1' as num ,'个' as CU,pipe.FlowingSection from HJGL_Pipeline_Component com left join HJGL_Pipeline pipe on com.PipelineId=pipe.PipelineId left join WBS_UnitWork unitwork on pipe.UnitWorkId=unitwork.UnitWorkId diff --git a/SGGL/BLL/HJGL/PreDesign/ProductionSchedulingPlanService.cs b/SGGL/BLL/HJGL/PreDesign/ProductionSchedulingPlanService.cs index 740c97ea..6ace3fb8 100644 --- a/SGGL/BLL/HJGL/PreDesign/ProductionSchedulingPlanService.cs +++ b/SGGL/BLL/HJGL/PreDesign/ProductionSchedulingPlanService.cs @@ -122,5 +122,38 @@ namespace BLL } } + /// + /// 根据单位工程删除排产计划 + /// + /// + /// + public static void DeleteProductionSchedulingPlanByUnitWork(string projectId,string unitWorkName) + { + SGGLDB db = Funs.DB; + var q = (from x in db.HJGL_ProductionSchedulingPlan where x.ProjectId == projectId && x.MainItemName == unitWorkName select x).ToList(); + if (q.Count > 0) + { + db.HJGL_ProductionSchedulingPlan.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } + } + + /// + /// 根据单位工程、流水号删除排产计划 + /// + /// + /// + /// + public static void DeleteProductionSchedulingPlanByUnitWorkIdAndFlowNum(string projectId, string unitWorkName, string flowNum) + { + SGGLDB db = Funs.DB; + var q = (from x in db.HJGL_ProductionSchedulingPlan where x.ProjectId == projectId && x.MainItemName == unitWorkName && x.FlowNum == flowNum select x).ToList(); + if (q.Count > 0) + { + db.HJGL_ProductionSchedulingPlan.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } + } + } } diff --git a/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx b/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx index 5ca4de20..4c9590c3 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -42,7 +42,7 @@ namespace FastReport } - + @@ -50,6 +50,7 @@ namespace FastReport + @@ -58,12 +59,12 @@ namespace FastReport - - + + - + - + @@ -76,59 +77,65 @@ namespace FastReport - + - + - - + + + + - + - + - - + + + + - - + + - + - - + + + + - + diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx index 607a9290..f0d30be4 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx @@ -19,8 +19,8 @@ - + @@ -71,7 +71,7 @@ ("FlowingSection") }); string path = Funs.RootPath + @"File\Excel\Temp\PrePipelineInstallList.xlsx"; - path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HHmm}", DateTime.Now) + ".xlsx"); + path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd}", DateTime.Now) + ".xlsx"); MiniExcel.SaveAs(path, q); - string fileName = $"安装清单（{(string.Format("{0:yyyy-MM-dd-HHmm}", DateTime.Now))}）.xlsx"; + string fileName = $"安装清单-" + this.tvControlItem.SelectedNode.Text + "-" + string.Format("{0:yyyy-MM-dd}", DateTime.Now) + ".xlsx"; FileInfo info = new FileInfo(path); long fileSize = info.Length; System.Web.HttpContext.Current.Response.Clear(); diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx index e0c6536d..e3923b78 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx @@ -40,17 +40,17 @@ - + FieldType="String" HeaderText="货物类型" HeaderTextAlign="Center" TextAlign="Center"> <%-- --%> + HeaderText="预制工作包" HeaderTextAlign="Center" TextAlign="Center"> @@ -64,7 +64,7 @@ - - + --%> @@ -107,7 +107,7 @@ - diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx.cs index 562bbcdb..0b7ce614 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx.cs @@ -308,16 +308,21 @@ namespace FineUIPro.Web.HJGL.PreDesign } protected void btnOutPrint_Click(object sender, EventArgs e) { - string Id = this.Grid1.SelectedRowID; - var model = HJGL_PackagingmanageService.GetHJGL_PackagingManageById(Id); - var PipelineComponent = model.PipelineComponentId.Split(','); - foreach (var item in PipelineComponent) + if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID)) { - HJGL_PipelineComponentService.UpdateOutState(item, model.PackagingCode); + string Id = this.Grid1.SelectedRowID; + var model = HJGL_PackagingmanageService.GetHJGL_PackagingManageById(Id); + if (model != null) + { + var PipelineComponent = model.PipelineComponentId.Split(','); + foreach (var item in PipelineComponent) + { + HJGL_PipelineComponentService.UpdateOutState(item, model.PackagingCode); + } + HJGL_PackagingmanageService.PutOutOrder(Id); + Pring(Id); + } } - HJGL_PackagingmanageService.PutOutOrder(Id); - Pring(Id); - } private void Pring(string Id) { @@ -329,38 +334,41 @@ namespace FineUIPro.Web.HJGL.PreDesign return; } DataTable tb = BLL.HJGL_PackagingmanageService.GetPackagingDetailById(Id); - var model = HJGL_PackagingmanageService.GetHJGL_PackagingManageById(Id); - - var dtTable = tb.AsEnumerable().OrderBy(o => o["PlanStartDate"]).CopyToDataTable(); - string PlanStartDate = ""; - if (dtTable.Rows != null && dtTable.Rows.Count > 0) + if (tb.Rows.Count > 0) { - PlanStartDate = dtTable.Rows[0]["PlanStartDate"].ToString(); - } - Dictionary keyValuePairs = new Dictionary(); - keyValuePairs.Add("ProjectName", ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId)); - keyValuePairs.Add("PackagingCode", model.PackagingCode); - keyValuePairs.Add("PlanStartDate", PlanStartDate); - keyValuePairs.Add("StackingPosition", model.StackingPosition); - keyValuePairs.Add("ContactName", model.ContactName + "| " + model.ContactPhone); - keyValuePairs.Add("ID", "PackagingManage$" + model.PackagingManageId); - DataRow dataRow = tb.NewRow(); - dataRow["num"] = "合计：" + tb.Rows.Count; - tb.Rows.Add(dataRow); - if (tb != null) - { - tb.TableName = "Data"; - } - BLL.FastReportService.AddFastreportTable(tb); - BLL.FastReportService.AddFastreportParameter(keyValuePairs); - string initTemplatePath = ""; - string rootPath = Server.MapPath("~/"); - initTemplatePath = "File\\Fastreport\\装箱单.frx"; + var model = HJGL_PackagingmanageService.GetHJGL_PackagingManageById(Id); - if (File.Exists(rootPath + initTemplatePath)) - { - PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("~/Controls/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); + var dtTable = tb.AsEnumerable().OrderBy(o => o["PlanStartDate"]).CopyToDataTable(); + string PlanStartDate = ""; + if (dtTable.Rows != null && dtTable.Rows.Count > 0) + { + PlanStartDate = dtTable.Rows[0]["PlanStartDate"].ToString(); + } + Dictionary keyValuePairs = new Dictionary(); + keyValuePairs.Add("ProjectName", ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId)); + keyValuePairs.Add("PackagingCode", model.PackagingCode); + keyValuePairs.Add("PlanStartDate", PlanStartDate); + keyValuePairs.Add("StackingPosition", model.StackingPosition); + keyValuePairs.Add("ContactName", model.ContactName + "| " + model.ContactPhone); + keyValuePairs.Add("ID", "PackagingManage$" + model.PackagingManageId); + DataRow dataRow = tb.NewRow(); + dataRow["num"] = "合计：" + tb.Rows.Count; + tb.Rows.Add(dataRow); + if (tb != null) + { + tb.TableName = "Data"; + } + BLL.FastReportService.AddFastreportTable(tb); + BLL.FastReportService.AddFastreportParameter(keyValuePairs); + string initTemplatePath = ""; + string rootPath = Server.MapPath("~/"); + initTemplatePath = "File\\Fastreport\\装箱单.frx"; + if (File.Exists(rootPath + initTemplatePath)) + { + PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("~/Controls/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); + + } } } #endregion diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx index 147a8c7e..40266dbd 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx @@ -17,7 +17,7 @@ - @@ -45,7 +45,7 @@ - + + diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageView.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageView.aspx.cs index bab5b46e..51b03139 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageView.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageView.aspx.cs @@ -67,7 +67,8 @@ namespace FineUIPro.Web.HJGL.PreDesign PipelineComponentCode = x.MaterialCode, num = x.Number, CU = x.MaterialUnit, - UnitWorkName = x.UnitWorkId == null ? "" : UnitWorkService.GetNameById(x.UnitWorkId) + UnitWorkName = x.UnitWorkId == null ? "" : UnitWorkService.GetNameById(x.UnitWorkId), + x.FlowingSection, }; Grid1.RecordCount = detailList.Count(); Grid1.DataSource = detailList; diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx index 7af24a42..db3ff54e 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx @@ -64,10 +64,10 @@ DataField="FlowNum" SortField="FlowNum" FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px"> - - + --%> diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.cs index e12f8d35..b0c57b6e 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.cs @@ -251,11 +251,10 @@ namespace FineUIPro.Web.HJGL.PreDesign SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunProc("Sp_ProductionSchedulingPlanStatistics", parameter); + //删除原有数据 + BLL.ProductionSchedulingPlanService.DeleteProductionSchedulingPlanByUnitWorkIdAndFlowNum(this.CurrUser.LoginProjectId,this.tvControlItem.SelectedNode.ParentNode.Text, this.tvControlItem.SelectedNode.Text); for (int i = 0; i < tb.Rows.Count; i++) { - //decimal totalDia = 0; - //totalDia += Convert.ToDecimal(tb.Rows[i]["Dia"].ToString());//总达因 - var plan = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlan(this.CurrUser.LoginProjectId, tb.Rows[i]["FlowingSection"].ToString(), tb.Rows[i]["UnitWorkId"].ToString(), tb.Rows[i]["Material"].ToString(), tb.Rows[i]["Caliber"].ToString()); if (plan == null) { @@ -296,7 +295,8 @@ namespace FineUIPro.Web.HJGL.PreDesign SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunProc("Sp_ProductionSchedulingPlanStatistics", parameter); - + //删除原有数据 + BLL.ProductionSchedulingPlanService.DeleteProductionSchedulingPlanByUnitWork(this.CurrUser.LoginProjectId, this.tvControlItem.SelectedNode.Text); for (int i = 0; i < tb.Rows.Count; i++) { var plan = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlan(this.CurrUser.LoginProjectId, tb.Rows[i]["FlowingSection"].ToString(), tb.Rows[i]["UnitWorkId"].ToString(), tb.Rows[i]["Material"].ToString(), tb.Rows[i]["Caliber"].ToString()); @@ -319,51 +319,51 @@ namespace FineUIPro.Web.HJGL.PreDesign } } } - else if (this.tvControlItem.SelectedNodeID == "1" || this.tvControlItem.SelectedNodeID == "2") - { - List listStr = new List(); - listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); - if (!string.IsNullOrEmpty(this.hdUnitWorkId.Text)) - { - listStr.Add(new SqlParameter("@unitWorkId", this.hdUnitWorkId.Text)); - } - else - { - listStr.Add(new SqlParameter("@unitWorkId", null)); - } - if (!string.IsNullOrEmpty(this.txtSize.Text.Trim())) - { - listStr.Add(new SqlParameter("@caliber", this.txtSize.Text.Trim())); - } + //else if (this.tvControlItem.SelectedNodeID == "1" || this.tvControlItem.SelectedNodeID == "2") + //{ + // List listStr = new List(); + // listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); + // if (!string.IsNullOrEmpty(this.hdUnitWorkId.Text)) + // { + // listStr.Add(new SqlParameter("@unitWorkId", this.hdUnitWorkId.Text)); + // } + // else + // { + // listStr.Add(new SqlParameter("@unitWorkId", null)); + // } + // if (!string.IsNullOrEmpty(this.txtSize.Text.Trim())) + // { + // listStr.Add(new SqlParameter("@caliber", this.txtSize.Text.Trim())); + // } - SqlParameter[] parameter = listStr.ToArray(); - DataTable tb = SQLHelper.GetDataTableRunProc("Sp_ProductionSchedulingPlanStatistics", parameter); + // SqlParameter[] parameter = listStr.ToArray(); + // DataTable tb = SQLHelper.GetDataTableRunProc("Sp_ProductionSchedulingPlanStatistics", parameter); - for (int i = 0; i < tb.Rows.Count; i++) - { - if (!string.IsNullOrEmpty(tb.Rows[i]["FlowingSection"].ToString())) - { - var plan = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlan(this.CurrUser.LoginProjectId, tb.Rows[i]["FlowingSection"].ToString(), tb.Rows[i]["UnitWorkId"].ToString(), tb.Rows[i]["Material"].ToString(), tb.Rows[i]["Caliber"].ToString()); - if (plan == null) - { - Model.HJGL_ProductionSchedulingPlan newPlan = new HJGL_ProductionSchedulingPlan(); - newPlan.ProductionSchedulingPlanId = SQLHelper.GetNewID(typeof(Model.HJGL_ProductionSchedulingPlan)); - newPlan.ProjectId = this.CurrUser.LoginProjectId; - newPlan.PipelineId = tb.Rows[i]["UnitWorkId"].ToString();//装置ID - newPlan.FlowNum = tb.Rows[i]["FlowingSection"].ToString(); - newPlan.MainItemName = tb.Rows[i]["UnitWorkName"].ToString(); - newPlan.Material = tb.Rows[i]["Material"].ToString(); - newPlan.Caliber = tb.Rows[i]["Caliber"].ToString(); - newPlan.Dain = Funs.GetNewDecimalOrZero(tb.Rows[i]["Dia"].ToString()); - newPlan.TotalDyne = Funs.GetNewDecimalOrZero(tb.Rows[i]["TotalDia"].ToString()); - newPlan.CompletedCount = Funs.GetNewIntOrZero(tb.Rows[i]["cTotalCount"].ToString()); - newPlan.CompletedRate = Funs.GetNewDecimalOrZero(tb.Rows[i]["rate"].ToString()); - newPlan.TotalCompletedRate = Funs.GetNewDecimalOrZero(tb.Rows[i]["Srate"].ToString()); - BLL.ProductionSchedulingPlanService.AddProductionSchedulingPlan(newPlan); - } - } - } - } + // for (int i = 0; i < tb.Rows.Count; i++) + // { + // if (!string.IsNullOrEmpty(tb.Rows[i]["FlowingSection"].ToString())) + // { + // var plan = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlan(this.CurrUser.LoginProjectId, tb.Rows[i]["FlowingSection"].ToString(), tb.Rows[i]["UnitWorkId"].ToString(), tb.Rows[i]["Material"].ToString(), tb.Rows[i]["Caliber"].ToString()); + // if (plan == null) + // { + // Model.HJGL_ProductionSchedulingPlan newPlan = new HJGL_ProductionSchedulingPlan(); + // newPlan.ProductionSchedulingPlanId = SQLHelper.GetNewID(typeof(Model.HJGL_ProductionSchedulingPlan)); + // newPlan.ProjectId = this.CurrUser.LoginProjectId; + // newPlan.PipelineId = tb.Rows[i]["UnitWorkId"].ToString();//装置ID + // newPlan.FlowNum = tb.Rows[i]["FlowingSection"].ToString(); + // newPlan.MainItemName = tb.Rows[i]["UnitWorkName"].ToString(); + // newPlan.Material = tb.Rows[i]["Material"].ToString(); + // newPlan.Caliber = tb.Rows[i]["Caliber"].ToString(); + // newPlan.Dain = Funs.GetNewDecimalOrZero(tb.Rows[i]["Dia"].ToString()); + // newPlan.TotalDyne = Funs.GetNewDecimalOrZero(tb.Rows[i]["TotalDia"].ToString()); + // newPlan.CompletedCount = Funs.GetNewIntOrZero(tb.Rows[i]["cTotalCount"].ToString()); + // newPlan.CompletedRate = Funs.GetNewDecimalOrZero(tb.Rows[i]["rate"].ToString()); + // newPlan.TotalCompletedRate = Funs.GetNewDecimalOrZero(tb.Rows[i]["Srate"].ToString()); + // BLL.ProductionSchedulingPlanService.AddProductionSchedulingPlan(newPlan); + // } + // } + // } + //} } } #endregion @@ -551,7 +551,7 @@ namespace FineUIPro.Web.HJGL.PreDesign if (lists != null) { - newUrl = uploadfilepath.Replace("排产计划导出模板", "排产计划（" + DateTime.Now.ToString("yyyyMMdd") + ")"); + newUrl = uploadfilepath.Replace("排产计划导出模板", "排产计划-" + this.tvControlItem.SelectedNode.Text + "-" + DateTime.Now.ToString("yyyyMMdd")); if (File.Exists(newUrl)) { File.Delete(newUrl); @@ -707,7 +707,7 @@ namespace FineUIPro.Web.HJGL.PreDesign SaveProductionSchedulingPlan(); } } - else + else //建筑工程/安装工程 { var unitWorkList = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx index 63716924..1c8223ef 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx @@ -77,7 +77,7 @@ - + @@ -106,7 +106,7 @@ Title="编辑" EnableIFrame="true" Height="650px" Width="1200px"> - diff --git a/SGGL/FineUIPro.Web/common/Menu_DigData.xml b/SGGL/FineUIPro.Web/common/Menu_DigData.xml index b532a9bb..bb7a7a34 100644 --- a/SGGL/FineUIPro.Web/common/Menu_DigData.xml +++ b/SGGL/FineUIPro.Web/common/Menu_DigData.xml @@ -1,9 +1,51 @@  - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16,12 +58,15 @@ + + + - - - - - + + + + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml index 8e91c0a5..0b732783 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml @@ -11,13 +11,12 @@ - + - - - + + diff --git a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml index 95eeab91..129ab5fd 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml @@ -1,8 +1,8 @@  - - - + + + diff --git a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml index 8d4aa005..fd6a0762 100644 --- a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml @@ -1,7 +1,11 @@  - + + + + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml b/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml index 56efca63..53b0bd32 100644 --- a/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml @@ -4,10 +4,10 @@ - + diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml index f8700001..39daa18b 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml @@ -54,49 +54,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SGGL/FineUIPro.Web/indexProject.aspx b/SGGL/FineUIPro.Web/indexProject.aspx index a3e8ba58..00a2029d 100644 --- a/SGGL/FineUIPro.Web/indexProject.aspx +++ b/SGGL/FineUIPro.Web/indexProject.aspx @@ -247,7 +247,7 @@
  • -
    • diff --git a/SGGL/Model/HJGL/PipelinePrefabricatedComponentsItem.cs b/SGGL/Model/HJGL/PipelinePrefabricatedComponentsItem.cs index 788eb820..742e0a67 100644 --- a/SGGL/Model/HJGL/PipelinePrefabricatedComponentsItem.cs +++ b/SGGL/Model/HJGL/PipelinePrefabricatedComponentsItem.cs @@ -24,5 +24,6 @@ namespace Model public string PipelineCode { get; set; } public string UnitWorkId { get; set; } public string ProjectId { get; set; } + public string FlowingSection { get; set; } } }