From 5d4dddd465fe185a3930f7a38e45efd5a32f48f4 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Tue, 3 Jun 2025 11:26:24 +0800 Subject: [PATCH] =?UTF-8?q?20250603=20=E6=8E=92=E4=BA=A7=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SGGLDB_V2025-05-14-001_bwj.sql | 57 ++++ SGGL/BLL/Common/Const.cs | 5 + .../ProductionSchedulingPlanService.cs | 24 +- .../File/Excel/DataOut/排产计划导出模板.xlsx | Bin 0 -> 9565 bytes .../PreDesign/ProductionSchedulingPlan.aspx | 26 +- .../ProductionSchedulingPlan.aspx.cs | 273 ++++++++++++------ SGGL/Model/Model.cs | 163 ++++++++++- 7 files changed, 433 insertions(+), 115 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2025-05-14-001_bwj.sql create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataOut/排产计划导出模板.xlsx diff --git a/DataBase/版本日志/SGGLDB_V2025-05-14-001_bwj.sql b/DataBase/版本日志/SGGLDB_V2025-05-14-001_bwj.sql new file mode 100644 index 00000000..87bbe5db --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2025-05-14-001_bwj.sql @@ -0,0 +1,57 @@ + +CREATE VIEW [dbo].[View_HJGL_ProductionSchedulingPlanStatistics] +as +/************Ųƻͳ**********/ +SELECT distinct unitWork.UnitWorkId, +unitWork.UnitWorkCode, +unitWork.UnitWorkName, +unitWork.ProjectId, +pipeline.FlowingSection, +(case p.SteelType when '1' then '̼' when '2' then '' when '3' then '' when '4' then 'ͺϽ' when '5' then 'Ͻ' when '6' then 'ѺϽ' when '7' then '' end) as Material, +'<100' as Caliber, +isnull(weldJoint.Dia,0) as Dia +FROM WBS_UnitWork AS unitWork +LEFT JOIN (select FlowingSection,UnitWorkId from HJGL_Pipeline where PipeArea='1') as pipeline on pipeline.UnitWorkId = unitWork.UnitWorkId + +LEFT JOIN (select distinct Base_Material.SteelType,UnitWorkId from HJGL_WeldJoint + left join HJGL_Pipeline on HJGL_Pipeline.PipelineId = HJGL_WeldJoint.PipelineId + left join Base_Material on Base_Material.MaterialId = HJGL_WeldJoint.Material1Id + where PipeArea='1' and HJGL_WeldJoint.JointAttribute='Ԥƿ') as p on p.UnitWorkId = unitWork.UnitWorkId +-- +LEFT JOIN (select sum(Dia) as Dia,HJGL_Pipeline.UnitWorkId,HJGL_Pipeline.FlowingSection,Base_Material.SteelType,HJGL_WeldJoint.DNDia from HJGL_WeldJoint + left join HJGL_Pipeline on HJGL_Pipeline.PipelineId = HJGL_WeldJoint.PipelineId + left join Base_Material on Base_Material.MaterialId = HJGL_WeldJoint.Material1Id + where HJGL_Pipeline.PipeArea='1' and HJGL_WeldJoint.JointAttribute='Ԥƿ' + and cast(SUBSTRING(HJGL_WeldJoint.DNDia,CHARINDEX('N',HJGL_WeldJoint.DNDia)+1,len(HJGL_WeldJoint.DNDia)-charindex('N',HJGL_WeldJoint.DNDia)) as int)<100 + group by HJGL_Pipeline.UnitWorkId,HJGL_Pipeline.FlowingSection,Base_Material.SteelType,HJGL_WeldJoint.DNDia) as weldJoint on weldJoint.UnitWorkId =unitWork.UnitWorkId + and weldJoint.FlowingSection = pipeline.FlowingSection + +union + +SELECT distinct unitWork.UnitWorkId, +unitWork.UnitWorkCode, +unitWork.UnitWorkName, +unitWork.ProjectId, +pipeline.FlowingSection, +(case p.SteelType when '1' then '̼' when '2' then '' when '3' then '' when '4' then 'ͺϽ' when '5' then 'Ͻ' when '6' then 'ѺϽ' when '7' then '' end) as Material, +'100' as Caliber, +isnull(weldJoint.Dia,0) as Dia +FROM WBS_UnitWork AS unitWork +LEFT JOIN (select FlowingSection,UnitWorkId from HJGL_Pipeline where PipeArea='1') as pipeline on pipeline.UnitWorkId = unitWork.UnitWorkId + +LEFT JOIN (select distinct Base_Material.SteelType,UnitWorkId from HJGL_WeldJoint + left join HJGL_Pipeline on HJGL_Pipeline.PipelineId = HJGL_WeldJoint.PipelineId + left join Base_Material on Base_Material.MaterialId = HJGL_WeldJoint.Material1Id + where PipeArea='1' and HJGL_WeldJoint.JointAttribute='Ԥƿ') as p on p.UnitWorkId = unitWork.UnitWorkId + +LEFT JOIN (select sum(Dia) as Dia,HJGL_Pipeline.UnitWorkId,HJGL_Pipeline.FlowingSection,Base_Material.SteelType,HJGL_WeldJoint.DNDia from HJGL_WeldJoint + left join HJGL_Pipeline on HJGL_Pipeline.PipelineId = HJGL_WeldJoint.PipelineId + left join Base_Material on Base_Material.MaterialId = HJGL_WeldJoint.Material1Id + where HJGL_Pipeline.PipeArea='1' and HJGL_WeldJoint.JointAttribute='Ԥƿ' + and cast(SUBSTRING(HJGL_WeldJoint.DNDia,CHARINDEX('N',HJGL_WeldJoint.DNDia)+1,len(HJGL_WeldJoint.DNDia)-charindex('N',HJGL_WeldJoint.DNDia)) as int)>=100 + group by HJGL_Pipeline.UnitWorkId,HJGL_Pipeline.FlowingSection,Base_Material.SteelType,HJGL_WeldJoint.DNDia) as weldJoint on weldJoint.UnitWorkId =unitWork.UnitWorkId + and weldJoint.FlowingSection = pipeline.FlowingSection + +GO + + diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 5a9981a1..00cd10f3 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -4801,6 +4801,11 @@ namespace BLL /// public const string Pipeline_ComponentPath = "File\\Excel\\DataIn\\组件管理二维码信息导入.xlsx"; + /// + /// 排产计划导出模板 + /// + public const string HJGL_ProductionSchedulingPlanPath = "File\\Excel\\DataOut\\排产计划导出模板.xlsx"; + #region 焊接报表 /// diff --git a/SGGL/BLL/HJGL/PreDesign/ProductionSchedulingPlanService.cs b/SGGL/BLL/HJGL/PreDesign/ProductionSchedulingPlanService.cs index 878660bf..ae787f4c 100644 --- a/SGGL/BLL/HJGL/PreDesign/ProductionSchedulingPlanService.cs +++ b/SGGL/BLL/HJGL/PreDesign/ProductionSchedulingPlanService.cs @@ -23,22 +23,17 @@ namespace BLL return Funs.DB.HJGL_ProductionSchedulingPlan.FirstOrDefault(e => e.ProductionSchedulingPlanId == productionSchedulingPlanId); } - /// - /// 根据管线Id获取排产计划 - /// - /// - /// - /// - public static Model.HJGL_ProductionSchedulingPlan GetProductionSchedulingPlanByPipelineId(string projectId, string pipelineId) + + public static Model.HJGL_ProductionSchedulingPlan GetProductionSchedulingPlan(string loginProjectId, string flowingSection, string unitWorkName, string material, string caliber) { - return Funs.DB.HJGL_ProductionSchedulingPlan.FirstOrDefault(e => e.ProjectId == projectId && e.PipelineId == pipelineId); + return Funs.DB.HJGL_ProductionSchedulingPlan.FirstOrDefault(e => e.ProjectId == loginProjectId && e.FlowNum == flowingSection && e.MainItemName == unitWorkName && e.Caliber == caliber); } - /// - /// 增加排产计划 - /// - /// - public static void AddProductionSchedulingPlan(Model.HJGL_ProductionSchedulingPlan plan) + /// + /// 增加排产计划 + /// + /// + public static void AddProductionSchedulingPlan(Model.HJGL_ProductionSchedulingPlan plan) { SGGLDB db = Funs.DB; Model.HJGL_ProductionSchedulingPlan newPlan = new HJGL_ProductionSchedulingPlan(); @@ -83,7 +78,7 @@ namespace BLL newPlan.PlanStartDate = plan.PlanStartDate; newPlan.PlanEndDate = plan.PlanEndDate; newPlan.Days = plan.Days; - newPlan.AvgDailyWorkload = plan.Days; + newPlan.AvgDailyWorkload = plan.AvgDailyWorkload; try { db.SubmitChanges(System.Data.Linq.ConflictMode.ContinueOnConflict); @@ -120,5 +115,6 @@ namespace BLL db.SubmitChanges(); } } + } } diff --git a/SGGL/FineUIPro.Web/File/Excel/DataOut/排产计划导出模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataOut/排产计划导出模板.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..af9e36437101b17c292ac65a73fb6f30e5fc47e5 GIT binary patch literal 9565 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 literal 0 HcmV?d00001 diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx index 37679631..c6f83703 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx @@ -53,7 +53,7 @@ @@ -103,45 +103,41 @@ DataField="PriorityTotalDyne" SortField="PriorityTotalDyne" FieldType="Float" HeaderTextAlign="Center" TextAlign="Left" Width="120px"> - + - + - + - + - + - <%-- - - - - --%> + + + @@ -166,6 +162,10 @@ function reloadGrid() { __doPostBack(null, 'reloadGrid'); } + + function onGridDataLoad(event) { + this.mergeColumns(['FlowNum', 'MainItemName', 'Material', 'TotalDyne']); + } diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.cs index 45ea38ee..54a1c395 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.cs @@ -26,17 +26,6 @@ namespace FineUIPro.Web.HJGL.PreDesign { this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); this.InitTreeMenu();//加载树 - //HJGL_PipelineComponentService.InitMainItemDownList(drpState, true); - //HJGL_PipelineComponentService.InitMainItemDownProductionStateList(drpProductionState, true); - - //var pipeline = (from x in Funs.DB.HJGL_Pipeline - // where x.ProjectId == this.CurrUser.LoginProjectId - // select x.FlowingSection).Distinct().ToList(); - //this.drpFlowingSection.DataTextField = "Value"; - //this.drpFlowingSection.DataValueField = "Value"; - //this.drpFlowingSection.DataSource = pipeline; - //this.drpFlowingSection.DataBind(); - //Funs.FineUIPleaseSelect(drpFlowingSection); } } @@ -123,11 +112,12 @@ namespace FineUIPro.Web.HJGL.PreDesign { foreach (var q in unitWork2) { - int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == "1" && x.PipelineCode.Contains(txtPipelineCode.Text.Trim()) select x).Count(); + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == "1" && x.PipelineCode.Contains(txtPipelineCode.Text.Trim()) select x.FlowingSection).Distinct().Count(); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; - tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; + //tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; + tn2.Text = q.UnitWorkName; if (q.UnitWorkId == this.hdUnitWorkId.Text) { tn2.Expanded = true; @@ -155,42 +145,42 @@ namespace FineUIPro.Web.HJGL.PreDesign private void BindNodes(TreeNode node) { - List pipeline = new List(); - var pipelines = from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.PipeArea == "1" select x; - pipeline = (from x in pipelines - where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == node.NodeID && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) - orderby x.PipelineCode - select x).ToList(); - int pageindex = int.Parse(node.CommandName.Split('|')[0]); - int pageCount = int.Parse(node.CommandName.Split('|')[1]); - if (pageindex <= pageCount) + List flowingSection = new List(); + //List pipeline = new List(); + var list = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.PipeArea == "1" && x.UnitWorkId == node.NodeID && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) select x.FlowingSection).ToList(); + flowingSection = list.Where(x => !string.IsNullOrWhiteSpace(x) == true).Distinct().OrderBy(x => x).ToList(); + //int pageindex = int.Parse(node.CommandName.Split('|')[0]); + //int pageCount = int.Parse(node.CommandName.Split('|')[1]); + //if (pageindex <= pageCount) + //{ + // flowingSection = flowingSection.Skip(pageSize * (pageindex - 1)).Take(pageSize).ToList(); + foreach (var item in flowingSection) { - pipeline = pipeline.Skip(pageSize * (pageindex - 1)).Take(pageSize).ToList(); - foreach (var item in pipeline) - { - var comCount = (from x in Funs.DB.HJGL_Pipeline_Component where x.PipelineId == item.PipelineId select x).Count(); - TreeNode newNode = new TreeNode(); - newNode.Text = item.PipelineCode + "【" + comCount.ToString() + " " + "组件" + "】"; - newNode.ToolTip = "管线号【组件数】"; - newNode.CommandName = "管线"; - newNode.NodeID = item.PipelineId; - newNode.EnableClickEvent = true; - node.Nodes.Add(newNode); - } - if (pageindex < pageCount) - { - TreeNode newNode = new TreeNode(); - newNode.Text = "加载"; - newNode.NodeID = SQLHelper.GetNewID(); - newNode.CommandName = "加载"; - newNode.Icon = Icon.ArrowDown; - newNode.EnableClickEvent = true; - node.Nodes.Add(newNode); - } + //var comCount = (from x in Funs.DB.HJGL_Pipeline_Component where x.PipelineId == item.PipelineId select x).Count(); + TreeNode newNode = new TreeNode(); + //newNode.Text = item.PipelineCode + "【" + comCount.ToString() + " " + "组件" + "】"; + + newNode.Text = item; + newNode.ToolTip = "流水段"; + newNode.CommandName = "流水段"; + newNode.NodeID = SQLHelper.GetNewID(); + newNode.EnableClickEvent = true; + node.Nodes.Add(newNode); } - - + // if (pageindex < pageCount) + // { + // TreeNode newNode = new TreeNode(); + // newNode.Text = "加载"; + // newNode.NodeID = "加载"; + // //newNode.NodeID = SQLHelper.GetNewID(); + // newNode.CommandName = "加载"; + // newNode.Icon = Icon.ArrowDown; + // newNode.EnableClickEvent = true; + // node.Nodes.Add(newNode); + // } + //} } + #endregion protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e) { @@ -209,13 +199,9 @@ namespace FineUIPro.Web.HJGL.PreDesign /// protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) { - if (e.CommandName.Split('|').Length == 2) + if (e.CommandName == "流水段") { - this.hdUnitWorkId.Text = this.tvControlItem.SelectedNodeID; - } - else if (e.CommandName == "管线") - { - Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID); + Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByFlowingSection(this.tvControlItem.SelectedNode.Text); this.hdUnitWorkId.Text = string.Empty; if (pipeline != null) { @@ -223,14 +209,6 @@ namespace FineUIPro.Web.HJGL.PreDesign SaveProductionSchedulingPlan(); } } - else if (e.CommandName == "加载") - { - string CommandName = e.Node.ParentNode.CommandName; - e.Node.ParentNode.CommandName = (int.Parse(CommandName.Split('|')[0]) + 1) + "|" + int.Parse(CommandName.Split('|')[1]); - TreeNode treeNode = e.Node.ParentNode; - treeNode.Nodes.Remove(e.Node); - BindNodes(e.Node.ParentNode); - } this.BindGrid(); } @@ -242,27 +220,24 @@ namespace FineUIPro.Web.HJGL.PreDesign { if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) { - var schedulingPlan = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlanByPipelineId(this.CurrUser.LoginProjectId, this.tvControlItem.SelectedNodeID); - if (schedulingPlan == null) + List lists = (from x in Funs.DB.View_HJGL_ProductionSchedulingPlanStatistics.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.FlowingSection == this.tvControlItem.SelectedNode.Text) select x).ToList(); + foreach (var item in lists) { - Model.HJGL_ProductionSchedulingPlan newPlan = new HJGL_ProductionSchedulingPlan(); - newPlan.ProductionSchedulingPlanId = SQLHelper.GetNewID(typeof(Model.HJGL_ProductionSchedulingPlan)); - newPlan.ProjectId = this.CurrUser.LoginProjectId; - newPlan.PipelineId = this.tvControlItem.SelectedNodeID; - var pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID); - if (pipeline!=null) + var plan = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlan(this.CurrUser.LoginProjectId, item.FlowingSection, item.UnitWorkName, item.Material, item.Caliber); + if (plan == null) { - newPlan.FlowNum = pipeline.FlowingSection; - if (!string.IsNullOrEmpty(pipeline.UnitWorkId)) - { - newPlan.MainItemName = BLL.UnitWorkService.getUnitWorkByUnitWorkId(pipeline.UnitWorkId).UnitWorkName; - } - if (!string.IsNullOrEmpty(pipeline.PipingClassId)) - { - newPlan.Material = BLL.Base_PipingClassService.GetPipingClassByPipingClassId(pipeline.PipingClassId).SteelType; - } + Model.HJGL_ProductionSchedulingPlan newPlan = new HJGL_ProductionSchedulingPlan(); + newPlan.ProductionSchedulingPlanId = SQLHelper.GetNewID(typeof(Model.HJGL_ProductionSchedulingPlan)); + newPlan.ProjectId = this.CurrUser.LoginProjectId; + //newPlan.PipelineId = this.tvControlItem.SelectedNodeID; + newPlan.FlowNum = item.FlowingSection; + newPlan.MainItemName = item.UnitWorkName; + newPlan.Material = item.Material; + newPlan.Caliber = item.Caliber; + newPlan.Dain = item.Dia; + newPlan.TotalDyne = lists.Sum(x => x.Dia); + BLL.ProductionSchedulingPlanService.AddProductionSchedulingPlan(newPlan); } - BLL.ProductionSchedulingPlanService.AddProductionSchedulingPlan(newPlan); } } } @@ -289,23 +264,21 @@ namespace FineUIPro.Web.HJGL.PreDesign p.PlanStartDate, p.PlanEndDate, p.Days, - p.AvgDailyWorkload, - pipeline.UnitWorkId + p.AvgDailyWorkload FROM HJGL_ProductionSchedulingPlan p - left join HJGL_Pipeline as pipeline on pipeline.PipelineId = p.PipelineId WHERE 1=1 "; List listStr = new List(); if (tvControlItem.SelectedNode.CommandName.Split('|').Length == 2) { - strSql += " and pipeline.UnitWorkId =@UnitWorkId"; - listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID)); + strSql += " and p.MainItemName =@UnitWorkId"; + listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNode.Text)); } - else if (tvControlItem.SelectedNode.CommandName == "管线") + else if (tvControlItem.SelectedNode.CommandName == "流水段") { - strSql += " and p.PipelineId = @PipelineId "; - listStr.Add(new SqlParameter("@PipelineId", this.tvControlItem.SelectedNodeID)); + strSql += " and p.FlowNum = @FlowNum "; + listStr.Add(new SqlParameter("@FlowNum", this.tvControlItem.SelectedNode.Text)); } SqlParameter[] parameter = listStr.ToArray(); @@ -419,8 +392,134 @@ namespace FineUIPro.Web.HJGL.PreDesign #region 导出 protected void btnOut_Click(object sender, EventArgs e) { - + string rootPath = Server.MapPath("~/"); + string initTemplatePath = Const.HJGL_ProductionSchedulingPlanPath; + string uploadfilepath = string.Empty; + string newUrl = string.Empty; + uploadfilepath = rootPath + initTemplatePath; + var lists = (from x in Funs.DB.HJGL_ProductionSchedulingPlan + where x.ProjectId == this.CurrUser.LoginProjectId + select x); + + if (tvControlItem.SelectedNode.CommandName.Split('|').Length == 2) + { + lists = lists.Where(x => x.MainItemName == this.tvControlItem.SelectedNode.Text); + } + else if (tvControlItem.SelectedNode.CommandName == "流水段") + { + lists = lists.Where(x => x.FlowNum == this.tvControlItem.SelectedNode.Text); + } + + if (lists != null) + { + newUrl = uploadfilepath.Replace("排产计划导出模板", "排产计划（" + DateTime.Now.ToString("yyyyMMdd") + ")"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } + File.Copy(uploadfilepath, newUrl); + // 第一步：读取文件流 + NPOI.SS.UserModel.IWorkbook workbook; + using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read)) + { + workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream); + //workbook = new NPOI.HSSF.UserModel.HSSFWorkbook(stream); + } + // 创建单元格样式 + NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle(); + cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 + var font = workbook.CreateFont(); + font.FontHeightInPoints = 11; + cellStyle.SetFont(font); + // 第二步：创建新数据行 + NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0); + NPOI.SS.UserModel.IRow row = sheet.GetRow(0); + NPOI.SS.UserModel.ICell cell; + int i = 1; + foreach (var item in lists) + { + // 第二步：创建新数据行 + row = sheet.CreateRow(i); + // 添加数据 + cell = row.CreateCell(0); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.FlowNum);//流水段号 + + cell = row.CreateCell(1); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.MainItemName);//主项名称 + + cell = row.CreateCell(2); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.Material);//材质 + + cell = row.CreateCell(3); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.Caliber);//口径 + + cell = row.CreateCell(4); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.Dain.HasValue ? item.Dain.ToString() : "");//达因数 + + cell = row.CreateCell(5); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.TotalDyne.HasValue?item.TotalDyne.ToString():"");//总达因数 + + cell = row.CreateCell(6); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.TotalPriority);//总优先级 + + cell = row.CreateCell(7); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.PriorityTotalDyne.HasValue ? item.PriorityTotalDyne.ToString() : "");//优先级总达因 + + cell = row.CreateCell(8); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.PlanStartDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.PlanStartDate) : "");//计划开始时间 + + cell = row.CreateCell(9); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.PlanEndDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.PlanEndDate) : "");//计划结束时间 + + cell = row.CreateCell(10); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.Days.HasValue?item.Days.ToString():"");//天数 + + cell = row.CreateCell(11); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.AvgDailyWorkload.HasValue ? item.AvgDailyWorkload.ToString():"");//平均每天工作量 + + i++; + } + // 第三步：写入文件流 + using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write)) + { + workbook.Write(stream); + workbook.Close(); + } + string fileName = Path.GetFileName(newUrl); + FileInfo info = new FileInfo(newUrl); + long fileSize = info.Length; + Response.Clear(); + Response.ContentType = "application/x-zip-compressed"; + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.AddHeader("Content-Length", fileSize.ToString()); + Response.TransmitFile(newUrl, 0, fileSize); + Response.Flush(); + Response.Close(); + File.Delete(newUrl); + } + else + { + Alert.ShowInTop("当前无记录，无法导出！", MessageBoxIcon.Warning); + } } #endregion } diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 2a5f02a6..8ac734ad 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -6857,6 +6857,14 @@ namespace Model } } + public System.Data.Linq.Table View_HJGL_ProductionSchedulingPlanStatistics + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table View_HJGL_WeldingTask { get @@ -100308,7 +100316,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalPriority", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalPriority", DbType="NVarChar(50)")] public string TotalPriority { get @@ -286333,6 +286341,159 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_HJGL_ProductionSchedulingPlanStatistics")] + public partial class View_HJGL_ProductionSchedulingPlanStatistics + { + + private string _UnitWorkId; + + private string _UnitWorkCode; + + private string _UnitWorkName; + + private string _ProjectId; + + private string _FlowingSection; + + private string _Material; + + private string _Caliber; + + private decimal _Dia; + + public View_HJGL_ProductionSchedulingPlanStatistics() + { + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorkId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string UnitWorkId + { + get + { + return this._UnitWorkId; + } + set + { + if ((this._UnitWorkId != value)) + { + this._UnitWorkId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorkCode", DbType="NVarChar(10)")] + public string UnitWorkCode + { + get + { + return this._UnitWorkCode; + } + set + { + if ((this._UnitWorkCode != value)) + { + this._UnitWorkCode = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorkName", DbType="NVarChar(30)")] + public string UnitWorkName + { + get + { + return this._UnitWorkName; + } + set + { + if ((this._UnitWorkName != value)) + { + this._UnitWorkName = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this._ProjectId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FlowingSection", DbType="NVarChar(200)")] + public string FlowingSection + { + get + { + return this._FlowingSection; + } + set + { + if ((this._FlowingSection != value)) + { + this._FlowingSection = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Material", DbType="VarChar(8)")] + public string Material + { + get + { + return this._Material; + } + set + { + if ((this._Material != value)) + { + this._Material = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Caliber", DbType="VarChar(5) NOT NULL", CanBeNull=false)] + public string Caliber + { + get + { + return this._Caliber; + } + set + { + if ((this._Caliber != value)) + { + this._Caliber = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Dia", DbType="Decimal(38,3) NOT NULL")] + public decimal Dia + { + get + { + return this._Dia; + } + set + { + if ((this._Dia != value)) + { + this._Dia = value; + } + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_HJGL_WeldingTask")] public partial class View_HJGL_WeldingTask {