焊接管理修改

.vs/SGGL_SeDin_New/v17/DocumentLayout.json

@@ -8,7 +8,7 @@
       "VerticalTabListWidth": 256,
       "DocumentGroups": [
         {
-          "DockedWidth": 217,
+          "DockedWidth": 200,
           "SelectedChildIndex": -1,
           "Children": [
             {
@@ -70,10 +70,6 @@
             {
               "$type": "Bookmark",
               "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
             }
           ]
         }

DataBase/版本日志/SGGLDB_V2025-08-28-001-lpf.sql

@@ -0,0 +1,6 @@
+    alter table HJGL_TrainNumberManage add
+    ReceiveDate         datetime;
+go
+update HJGL_PackagingManage set TypeInt=10 where TypeInt is null
+update Sys_Menu set MenuName='车次管理' ,SortIndex='50' where MenuId='EEC0D060-C15E-4D25-B015-C2B91F735DAC'
+update Sys_Menu set MenuName='发货管理' ,SortIndex='60' where MenuId='25DED954-10C9-47CC-99F2-C44FDE9E0A81'

SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs

@@ -94,16 +94,12 @@ namespace BLL
         public static string GetMinPlanStartDate(string PackagingManageId)
         {
             string PlanStartDate = "";
-            DataTable tb = BLL.HJGL_PackagingmanageService.GetPackagingDetailById(PackagingManageId);
+            var tb = GetPackagingDetailById(PackagingManageId);
-            if (tb == null || tb.Rows.Count == 0)
+            if (tb == null || tb.Count == 0)
             {
                 return PlanStartDate;
             }
-            var dtTable = tb.AsEnumerable().OrderBy(o => o["PlanStartDate"]).CopyToDataTable();
+            PlanStartDate = tb.OrderBy(x => x.PlanStartDate).FirstOrDefault()?.PlanStartDate.ToString();
-            if (dtTable.Rows != null && dtTable.Rows.Count > 0)
-            {
-                PlanStartDate = dtTable.Rows[0]["PlanStartDate"].ToString();
-            }
             return PlanStartDate;
         }
 
@@ -172,7 +168,7 @@ namespace BLL
         /// </summary>
         /// <param name="PackagingManageId"></param>
         /// <returns></returns>
-        public static DataTable GetPackagingDetailById(string PackagingManageId)
+       /* public static DataTable GetPackagingDetailById(string PackagingManageId)
         {
             DataTable tb = new DataTable();
             var model = GetHJGL_PackagingManageById(PackagingManageId);
@@ -191,8 +187,54 @@ namespace BLL
                 tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             }
             return tb;
-        }
+        }*/
+        public static List<Model.PackagingManagePrintOutput> GetPackagingDetailById(string PackagingManageId)
+        {
+            var model = GetHJGL_PackagingManageById(PackagingManageId);
+            var result = new List<Model.PackagingManagePrintOutput>();
+            if (string.IsNullOrEmpty(model.PipelineComponentId))
+                return new List<Model.PackagingManagePrintOutput>();
 
+            var PipelineComponentIds = model.PipelineComponentId.Split(',');
+
+            if (model.TypeInt == (int)HJGL_PackagingmanageService.TypeInt.预制组件)
+            {
+                var query = from com in Funs.DB.HJGL_Pipeline_Component
+                            join pipe in Funs.DB.HJGL_Pipeline on com.PipelineId equals pipe.PipelineId into pipeGroup
+                            from pipe in pipeGroup.DefaultIfEmpty()
+                            join unitwork in Funs.DB.WBS_UnitWork on pipe.UnitWorkId equals unitwork.UnitWorkId into unitworkGroup
+                            from unitwork in unitworkGroup.DefaultIfEmpty()
+                            where PipelineComponentIds.Contains(com.PipelineComponentId)
+                            orderby com.PipelineComponentCode
+                            select new Model.PackagingManagePrintOutput
+                            {
+                                PipelineComponentId = com.PipelineComponentId,
+                                PipelineComponentCode = com.PipelineComponentCode,
+                                PlanStartDate = pipe != null && pipe.PlanStartDate != null ? pipe.PlanStartDate : DateTime.Now,
+                                UnitWorkName = unitwork != null ? unitwork.UnitWorkName : "",
+                                num = "1",
+                                CU = "个",
+                                FlowingSection = pipe != null ? pipe.FlowingSection : ""
+                            };
+                result = query.ToList();
+            }
+            else
+            {
+                var query = HJGLPackagingmanagedetailService.GetPackagingData(PackagingManageId).ToList();
+                var detailList = from x in query
+                                 select new Model.PackagingManagePrintOutput
+                                 {
+                                     PipelineComponentId = x.Id,
+                                     PipelineComponentCode = x.MaterialCode,
+                                     num = x.Number.ToString(),
+                                     CU = x.MaterialUnit,
+                                     UnitWorkName = x.UnitWorkId == null ? "" : UnitWorkService.GetNameById(x.UnitWorkId),
+                                     FlowingSection = x.FlowingSection,
+                                 };
+                result = detailList.ToList();
+            }
+            return result;
+        }
         /// <summary>
         /// 根据项目号获取包装编号历史记录
         /// </summary>

SGGL/BLL/HJGL/PreDesign/TrainNumberManageService.cs

@@ -87,38 +87,6 @@ namespace BLL
             return (pagedData, totalCount);
         }
 
-        /// <summary>
-        /// 获取分页列表
-        /// </summary>
-        /// <param name="table"></param>
-        /// <param name="grid1"></param>
-        /// <returns></returns>
-        public static IEnumerable GetListData(Model.HJGL_TrainNumberManage table, Grid grid1)
-        {
-            var q = GetByQueryModle(table);
-            Count = q.Count();
-            if (Count == 0)
-            {
-                return null;
-            }
-            q = q.Skip(grid1.PageSize * grid1.PageIndex).Take(grid1.PageSize);
-            // q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
-            return from x in q
-                   select new
-                   {
-                       x.Id,
-                       x.TrainNumber,
-                       x.ProjectId,
-                       x.State,
-                       x.DriverName,
-                       x.DriverPhone,
-                       x.LicensePlateNumber,
-                       x.ContactName,
-                       x.ContactPhone,
-                       x.Remark,
-                   };
-        }
-
         public static Model.HJGL_TrainNumberManage GetModelById(string Id)
         {
             return Funs.DB.HJGL_TrainNumberManage.FirstOrDefault(x => x.Id == Id);
@@ -150,6 +118,7 @@ namespace BLL
                 ContactName = newtable.ContactName,
                 ContactPhone = newtable.ContactPhone,
                 Remark = newtable.Remark,
+                ReceiveDate=newtable.ReceiveDate,
             };
             Funs.DB.HJGL_TrainNumberManage.InsertOnSubmit(table);
             Funs.DB.SubmitChanges();
@@ -170,6 +139,7 @@ namespace BLL
                 table.ContactName = newtable.ContactName;
                 table.ContactPhone = newtable.ContactPhone;
                 table.Remark = newtable.Remark;
+                table.ReceiveDate = newtable.ReceiveDate;
                 Funs.DB.SubmitChanges();
             }
         }

SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx.cs

@@ -32,40 +32,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
         /// 绑定数据
         /// </summary>
         private void BindGrid()
-        {
+        { 
-            //  string strSql = @"select    pack.PackagingManageId,
-            //                              pack.PackagingCode,  
-            //                        com.PipelineComponentCode,
-            //                        unit.UnitWorkName,
-            //                        pipe.PlanStartDate,
-            //                        pack.ProjectId,
-            //                        pack.StackingPosition,
-            //                        pack.State,
-            //                              pack.ContactName,
-            //                              pack.ContactPhone,
-            //pack.ReceiveDate,
-            //person.PersonName
-            //                      from HJGL_PackagingManage as pack
-            //                      left join HJGL_Pipeline_Component com on com.PipelineComponentId=pack.PipelineComponentId
-            //                      left join HJGL_Pipeline pipe on pipe.PipelineId =com.PipelineId
-            //                      left join WBS_UnitWork unit on  pipe.UnitWorkId=unit.UnitWorkId
-            //                      left join Person_Persons person on pack.ReceiveMan=person.PersonId 
-            //                      WHERE pack.ProjectId = @ProjectId ";
-            //  List<SqlParameter> listStr = new List<SqlParameter>();
-            //  listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
-            //  if (!string.IsNullOrEmpty(this.txtPackagingCode.Text.Trim()))
-            //  {
-            //      strSql += " AND pack.PackagingCode LIKE @PackagingCode";
-            //      listStr.Add(new SqlParameter("@PackagingCode", "%" + this.txtPackagingCode.Text.Trim() + "%"));
-            //  }
-            //  SqlParameter[] parameter = listStr.ToArray();
-            //  DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-
-            //Grid1.RecordCount = tb.Rows.Count;
-            //tb = GetFilteredTable(Grid1.FilteredData, tb);
-            //var table = this.GetPagedDataTable(Grid1, tb);
-            //Grid1.DataSource = table;
-            //Grid1.DataBind();
             var list = BLL.HJGL_PackagingmanageService.GetPackagingManageList(this.CurrUser.LoginProjectId, this.txtPackagingCode.Text.Trim(), this.Grid1.PageIndex, this.Grid1.PageSize);
             Grid1.RecordCount = list.Total;
             Grid1.DataSource = list.Data;
@@ -341,7 +308,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
                 ShowNotify("请选择要打印的项", MessageBoxIcon.Warning);
                 return;
             }
-            DataTable tb = BLL.HJGL_PackagingmanageService.GetPackagingDetailById(Id);
+            DataTable tb = LINQToDataTable(BLL.HJGL_PackagingmanageService.GetPackagingDetailById(Id));
             if (tb.Rows.Count > 0)
             {
                 var model = HJGL_PackagingmanageService.GetHJGL_PackagingManageById(Id);

SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageView.aspx.cs

@@ -47,7 +47,12 @@ namespace FineUIPro.Web.HJGL.PreDesign
         {
             var pack = HJGL_PackagingmanageService.GetHJGL_PackagingManageById(PackagingManageId);
             if (pack == null) return;
-            if (pack.TypeInt == (int)HJGL_PackagingmanageService.TypeInt.预制组件)
+            var detailList= HJGL_PackagingmanageService.GetPackagingDetailById(PackagingManageId);
+            Grid1.RecordCount = detailList.Count();
+            Grid1.DataSource = detailList;
+            Grid1.DataBind();
+
+           /* if (pack.TypeInt == (int)HJGL_PackagingmanageService.TypeInt.预制组件)
             {
                 DataTable tb = BLL.HJGL_PackagingmanageService.GetPackagingDetailById(PackagingManageId);
 
@@ -73,9 +78,9 @@ namespace FineUIPro.Web.HJGL.PreDesign
                 Grid1.RecordCount = detailList.Count();  
                 Grid1.DataSource = detailList;
                 Grid1.DataBind();
-            } 
+            }*/
-
            
+
         }
         #endregion
 

SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx

@@ -75,6 +75,9 @@
                         <f:RenderField Width="150px" ColumnID="ContactPhone" DataField="ContactPhone" SortField="ContactPhone"
                             FieldType="String" HeaderText="联系人电话" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
+                        <f:RenderField Width="110px" ColumnID="ReceiveDate" DataField="ReceiveDate" FieldType="String"
+                            HeaderText="接收时间" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
                         <f:RenderField Width="150px" ColumnID="Remark" DataField="Remark" SortField="Remark"
                             FieldType="String" HeaderText="备注" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>

SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx.cs

@@ -1,6 +1,9 @@
 using BLL;
+using MiniExcelLibs;
 using System;
 using System.Collections.Generic;
+using System.Data;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Web;
@@ -11,7 +14,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
 {
 	public partial class TrainNumberManager : PageBase
 	{
-
+        public static List<Model.HJGL_TrainNumberManage> hJGL_TrainNumberManages=new List<Model.HJGL_TrainNumberManage>();
         protected void Page_Load(object sender, EventArgs e)
         {
             if (!IsPostBack)
@@ -35,6 +38,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
             Grid1.RecordCount = tb.Total; 
             Grid1.DataSource = tb.Data;
             Grid1.DataBind();
+            hJGL_TrainNumberManages= tb.Data;
         }
         #endregion
 
@@ -187,7 +191,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
                 }
             }
         }
-        #endregion        
+        #endregion
 
         #region 导出按钮
         /// 导出按钮
@@ -196,17 +200,39 @@ namespace FineUIPro.Web.HJGL.PreDesign
         /// <param name="e"></param>
         protected void btnOut_Click(object sender, EventArgs e)
         {
-            Response.ClearContent();
+            if (hJGL_TrainNumberManages != null)
-            string filename = Funs.GetNewFileName();
+            {
-            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("发货管理" + filename, System.Text.Encoding.UTF8) + ".xls");
+                var q = hJGL_TrainNumberManages
-            Response.ContentType = "application/excel";
+                    .Select((x, index) => new
-            Response.ContentEncoding = System.Text.Encoding.UTF8;
+                    {
-            this.Grid1.PageSize = 500;
+                        序号 = index + 1, // 自增序号，从 1 开始
-            this.BindGrid();
+                        车次 = x.TrainNumber,
-            Response.Write(GetGridTableHtml(Grid1));
+                        驾驶员姓名 = x.DriverName,
-            Response.End();
+                        驾驶员电话 = x.DriverPhone,
-        }
+                        车牌号 = x.LicensePlateNumber,
+                        联系人姓名 = x.ContactName,
+                        联系人电话 = x.ContactPhone,
+                        备注 = x.Remark
+                    });
 
+                string path = Funs.RootPath + @"File\Excel\Temp\TrainNumberManager.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}", DateTime.Now) + ".xlsx";
+                FileInfo info = new FileInfo(path);
+                long fileSize = info.Length;
+                System.Web.HttpContext.Current.Response.Clear();
+                System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed";
+                System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+                System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString());
+                System.Web.HttpContext.Current.Response.TransmitFile(path, 0, fileSize);
+                System.Web.HttpContext.Current.Response.Flush();
+                System.Web.HttpContext.Current.Response.Close();
+                File.Delete(path);
+            }
+        }
         /// <summary>
         /// 导出方法
         /// </summary>
@@ -257,17 +283,50 @@ namespace FineUIPro.Web.HJGL.PreDesign
 
         protected void btnPrint_Click(object sender, EventArgs e)
         {
-            if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID))
+            string Id = this.Grid1.SelectedRowID;
+            Pring(Id);
+        }
+
+        private void Pring(string Id)
+        {
+            BLL.FastReportService.ResetData();
+            if (string.IsNullOrEmpty(Id))
             {
-                string id = Grid1.SelectedRowID;
+
-                string url = "TrainNumberManagerPrint.aspx?TrainNumberId={0}";
+                ShowNotify("请选择要打印的项", MessageBoxIcon.Warning);
-                PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format(url, id, "打印 - ")));
-            }
-            else
-            {
-                Alert.ShowInTop("请选择要打印的数据", MessageBoxIcon.Warning);
                 return;
             }
+            DataTable tb = LINQToDataTable(HJGL_PackagingmanageService.GetPackagingManage(Id));
+            if (tb.Rows.Count > 0)
+            {
+                var model = TrainNumberManageService.GetModelById(Id); 
+                Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
+                keyValuePairs.Add("ProjectName", ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId));
+                keyValuePairs.Add("TrainNumber", model.TrainNumber);
+                keyValuePairs.Add("Remark", model.Remark);
+                keyValuePairs.Add("ContactName", model.ContactName );
+                keyValuePairs.Add("ContactPhone", model.ContactPhone);
+                keyValuePairs.Add("ID", "TrainNumberManager$" + model.Id);
+                DataRow dataRow = tb.NewRow();
+                dataRow["PackagingCode"] = "合计：" + 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)));
+
+                }
+            }
         }
+
     }
 }

SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx

@@ -62,7 +62,7 @@
                             </Toolbars>
                             <Columns>
                                 <f:RenderField Width="120px" ColumnID="TestPackageNo" DataField="TestPackageNo"
-                                    HeaderTextAlign="Center" HeaderText="试压包编号" TextAlign="Left">
+                                    HeaderTextAlign="Center" HeaderText="试压包号" TextAlign="Left">
                                 </f:RenderField>
                                 <f:RenderField Width="120px" ColumnID="TestPackageName" DataField="TestPackageName"
                                     HeaderTextAlign="Center" HeaderText="试压包名称" TextAlign="Left" ExpandUnusedSpace="true">

SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx

@@ -67,9 +67,9 @@
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
                             <Items>
-                                <f:Label ID="txtTestPackageNo" Label="系统号" runat="server"  LabelAlign="Right">
+                                <f:Label ID="txtTestPackageNo" Label="试压包号" runat="server"  LabelAlign="Right">
                                 </f:Label>
-                                <f:Label ID="txtTestPackageName" Label="系统名称" runat="server"  LabelAlign="Right">
+                                <f:Label ID="txtTestPackageName" Label="试压包名称" runat="server"  LabelAlign="Right">
                                 </f:Label>
                                 <f:Label ID="txtRemark" Label="备注" runat="server"  LabelAlign="Right">
                                 </f:Label>

SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx

@@ -72,9 +72,9 @@
                             <Rows>
                                  <f:FormRow>
                                     <Items>
-                                        <f:Label ID="txtTestPackageNo" Label="系统号" runat="server" LabelWidth="130px">
+                                        <f:Label ID="txtTestPackageNo" Label="试压包号" runat="server" LabelWidth="130px">
                                         </f:Label>
-                                        <f:Label ID="txtTestPackageName" Label="系统名称" runat="server" LabelWidth="130px">
+                                        <f:Label ID="txtTestPackageName" Label="试压包名称" runat="server" LabelWidth="130px">
                                         </f:Label>
                                         <f:Label ID="txtadjustTestPressure" Label="调整试验压力" runat="server" LabelWidth="130px">
                                         </f:Label>

SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageData.aspx

@@ -49,7 +49,7 @@
                                 <f:RenderField HeaderText="试压包号" ColumnID="TestPackageNo" DataField="TestPackageNo" SortField="TestPackageNo"
                                     FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="160px">
                                 </f:RenderField>
-                                <f:RenderField HeaderText="试压名称" ColumnID="TestPackageName" DataField="TestPackageName" SortField="TestPackageName"
+                                <f:RenderField HeaderText="试压包名称" ColumnID="TestPackageName" DataField="TestPackageName" SortField="TestPackageName"
                                     FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
                                 </f:RenderField>
                                 <%--<f:RenderField HeaderText="试压状态" ColumnID="" DataField="" SortField=""

SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageData.aspx.cs

@@ -252,19 +252,67 @@ namespace FineUIPro.Web.HJGL.TestPackage
                 Alert.ShowInTop("请选择一条试压包", MessageBoxIcon.Warning);
                 return;
             }
+            Dictionary<string, string> printFiles = new Dictionary<string, string>();
+
             foreach (var ptp_id in selectedRows)
             {
-                exportWord(ptp_id);
+                var item = exportWord(ptp_id);
-
+                printFiles.Add(item.FirstOrDefault().Key, item.FirstOrDefault().Value); 
-            } 
+            }
+            if (printFiles.Count>1)
+            {
+                string rootPath = Funs.RootPath;
+                string startPath = rootPath + "FileUpload\\试压包资料" + DateTime.Now.GetHashCode();
+                if (!Directory.Exists(startPath))
+                {
+                    Directory.CreateDirectory(startPath);
+                }
+                string zipPath = rootPath + "FileUpload\\试压包资料" + DateTime.Now.GetHashCode() + ".zip";
+                foreach (var item in printFiles)
+                {
+                    var sourceFile = item.Key;
+                    var destFile = startPath + "\\" + item.Value;
+                    if (File.Exists(sourceFile))
+                    {
+                        File.Copy(sourceFile, destFile, true);
+                        File.Delete(sourceFile);
+                    }
+                }
+                System.IO.Compression.ZipFile.CreateFromDirectory(startPath, zipPath);
+                FileInfo info = new FileInfo(zipPath);
+                long fileSize = info.Length;
+                System.Web.HttpContext.Current.Response.Clear();
+                System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed";
+                System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode("试压包资料.zip", System.Text.Encoding.UTF8));
+                System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString());
+                System.Web.HttpContext.Current.Response.TransmitFile(zipPath, 0, fileSize);
+                System.Web.HttpContext.Current.Response.Flush();
+                System.Web.HttpContext.Current.Response.Close();
+                Funs.DeleteDir(startPath);
+                File.Delete(zipPath);
+            }
+            else
+            {
+                FileInfo info = new FileInfo(printFiles.FirstOrDefault().Key);
+                long fileSize = info.Length;
+                System.Web.HttpContext.Current.Response.Clear();
+                System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed";
+                System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(printFiles.FirstOrDefault().Value, System.Text.Encoding.UTF8));
+                System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString());
+                System.Web.HttpContext.Current.Response.TransmitFile(printFiles.FirstOrDefault().Key, 0, fileSize);
+                System.Web.HttpContext.Current.Response.Flush();
+                System.Web.HttpContext.Current.Response.Close();
+            }   
+            
         }
 
-        protected void exportWord(string ptp_id)
+        protected Dictionary<string,string> exportWord(string ptp_id)
         {
+            Dictionary<string,string> keyValuePairs = new Dictionary<string,string>();
             if (string.IsNullOrEmpty(ptp_id))
             {
                 Alert.ShowInTop("请选择要打印的单据!", MessageBoxIcon.Warning);
-                return;
+                return null;
             }
             //修改试压包打印状态
             var updateTestPackage = Funs.DB.PTP_TestPackage.FirstOrDefault(x => x.PTP_ID == ptp_id);
@@ -286,6 +334,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
 
                 if (this.drpPrintType.SelectedValue == "1")//pdf格式
                 {
+                    exportName+=".pdf";
                     ListItem[] list = new ListItem[10];
                     list[0] = new ListItem("0", "File\\Fastreport\\JGZL\\管道试压包文件资料.frx");
                     list[1] = new ListItem("1", "File\\Fastreport\\JGZL\\管道压力试验技术要求.frx");
@@ -301,26 +350,28 @@ namespace FineUIPro.Web.HJGL.TestPackage
                     List<Model.FastReportItem> FastReportItemList = new List<Model.FastReportItem>();
                     foreach (var item in list)
                     {
-                        FastReportItemList.Add(GetFastReportItem(updateTestPackage, item.Text));
+                        FastReportItemList.Add(GetFastReportItem(updateTestPackage, item.Text, ptp_id));
                     }
 
-                    var Path = Funs.RootPath + "FileUpload/" + ptp_id + ".pdf";
+                    string Path = Funs.RootPath + "FileUpload/" + ptp_id + ".pdf";
 
                     BLL.FastReportService.ExportMergeReport(FastReportItemList, Path, this.drpPrintType.SelectedValue);
-                    FileInfo info = new FileInfo(Path);
+                    keyValuePairs.Add(Path, exportName);
-                    long fileSize = info.Length;
+                   /* FileInfo info = new FileInfo(Path);
-
+                    long fileSize = info.Length; 
                     System.Web.HttpContext.Current.Response.Clear();
+                    System.Web.HttpContext.Current.Response.ClearHeaders();
                     System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed";
                     System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(exportName + ".pdf", System.Text.Encoding.UTF8));
                     System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString());
                     System.Web.HttpContext.Current.Response.TransmitFile(Path, 0, fileSize);
                     System.Web.HttpContext.Current.Response.Flush();
                     System.Web.HttpContext.Current.Response.Close();
-                    File.Delete(Path);
+                    File.Delete(Path);*/
                 }
                 else if (this.drpPrintType.SelectedValue == "2")//word格式
                 {
+                    exportName += ".docx"; 
                     ListItem[] list = new ListItem[3];
                     list[0] = new ListItem("0", "File\\Fastreport\\JGZL\\管道试压包文件资料.frx");
                     list[1] = new ListItem("1", "File\\Fastreport\\JGZL\\管道压力试验技术要求.frx");
@@ -329,7 +380,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
                     List<Model.FastReportItem> FastReportItemList = new List<Model.FastReportItem>();
                     foreach (var item in list)
                     {
-                        FastReportItemList.Add(GetFastReportItem(updateTestPackage, item.Text));
+                        FastReportItemList.Add(GetFastReportItem(updateTestPackage, item.Text, ptp_id));
                     }
                     var PathA = Funs.RootPath + "FileUpload/" + ptp_id + ".docx";
                     BLL.FastReportService.ExportMergeReport(FastReportItemList, PathA, this.drpPrintType.SelectedValue);
@@ -340,7 +391,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
                     List<Model.FastReportItem> FastReportItemList2 = new List<Model.FastReportItem>();
                     foreach (var item in list2)
                     {
-                        FastReportItemList2.Add(GetFastReportItem(updateTestPackage, item.Text));
+                        FastReportItemList2.Add(GetFastReportItem(updateTestPackage, item.Text, ptp_id));
                     }
                     var PathB = Funs.RootPath + "FileUpload/" + ptp_id + "2.docx";
                     BLL.FastReportService.ExportMergeReport(FastReportItemList2, PathB, this.drpPrintType.SelectedValue);
@@ -355,7 +406,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
                     List<Model.FastReportItem> FastReportItemList3 = new List<Model.FastReportItem>();
                     foreach (var item in list3)
                     {
-                        FastReportItemList3.Add(GetFastReportItem(updateTestPackage, item.Text));
+                        FastReportItemList3.Add(GetFastReportItem(updateTestPackage, item.Text, ptp_id));
                     }
                     var PathC = Funs.RootPath + "FileUpload/" + ptp_id + "3.docx";
                     BLL.FastReportService.ExportMergeReport(FastReportItemList3, PathC, this.drpPrintType.SelectedValue);
@@ -369,7 +420,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
                     List<Model.FastReportItem> FastReportItemList4 = new List<Model.FastReportItem>();
                     foreach (var item in list4)
                     {
-                        FastReportItemList4.Add(GetFastReportItem(updateTestPackage, item.Text));
+                        FastReportItemList4.Add(GetFastReportItem(updateTestPackage, item.Text, ptp_id));
                     }
                     var PathD = Funs.RootPath + "FileUpload/" + ptp_id + "4.docx";
                     BLL.FastReportService.ExportMergeReport(FastReportItemList4, PathD, this.drpPrintType.SelectedValue);
@@ -384,7 +435,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
                     List<Model.FastReportItem> FastReportItemList5 = new List<Model.FastReportItem>();
                     foreach (var item in list5)
                     {
-                        FastReportItemList5.Add(GetFastReportItem(updateTestPackage, item.Text));
+                        FastReportItemList5.Add(GetFastReportItem(updateTestPackage, item.Text, ptp_id));
                     }
                     var PathE = Funs.RootPath + "FileUpload/" + ptp_id + "5.docx";
                     BLL.FastReportService.ExportMergeReport(FastReportItemList5, PathE, this.drpPrintType.SelectedValue);
@@ -393,10 +444,12 @@ namespace FineUIPro.Web.HJGL.TestPackage
                     doc1.AppendDocument(doc5, Aspose.Words.ImportFormatMode.KeepSourceFormatting);
 
                     //将合并的文档保存为 DOCX 文件
-                    doc1.Save(Funs.RootPath + "FileUpload/doc.docx");
+                    var Path = Funs.RootPath + "FileUpload/"+ ptp_id + "Result.docx";
+                    doc1.Save(Path);
 
-                    var Path = Funs.RootPath + "FileUpload/doc.docx";
+                    keyValuePairs.Add(Path, exportName); 
-                    FileInfo info = new FileInfo(Path);
+
+                   /* FileInfo info = new FileInfo(Path);
                     long fileSize = info.Length;
 
                     System.Web.HttpContext.Current.Response.Clear();
@@ -405,20 +458,22 @@ namespace FineUIPro.Web.HJGL.TestPackage
                     System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString());
                     System.Web.HttpContext.Current.Response.TransmitFile(Path, 0, fileSize);
                     System.Web.HttpContext.Current.Response.Flush();
-                    System.Web.HttpContext.Current.Response.Close();
+                    System.Web.HttpContext.Current.Response.Close();*/
-                    File.Delete(Path);
+                    //File.Delete(Path);
                     File.Delete(PathA);
                     File.Delete(PathB);
                     File.Delete(PathC);
                     File.Delete(PathD);
                     File.Delete(PathE);
                 }
+
             }
+            return keyValuePairs;
 
         }
 
 
-        protected Model.FastReportItem GetFastReportItem(Model.PTP_TestPackage updateTestPackage, string printType)
+        protected Model.FastReportItem GetFastReportItem(Model.PTP_TestPackage updateTestPackage, string printType, string ptp_id)
         {
             string initTemplatePath = "";
             Model.FastReportItem fastReportItem = new Model.FastReportItem();
@@ -483,7 +538,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
                                         where PTP_ItemEndCheckList.PTP_ID=@ptp_id";
                         List<SqlParameter> listStr = new List<SqlParameter>
                                     {
-                                        new SqlParameter("@ptp_id", this.PTP_ID),
+                                        new SqlParameter("@ptp_id", ptp_id),
                                     };
                         SqlParameter[] parameter = listStr.ToArray();
                         DataTable tb = SQLHelper.GetDataTableRunText(sql, parameter);
@@ -539,7 +594,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
                                         where ptpPipe.PTP_ID=@ptp_id";
                         List<SqlParameter> listStr = new List<SqlParameter>
                                     {
-                                        new SqlParameter("@ptp_id", this.PTP_ID),
+                                        new SqlParameter("@ptp_id", ptp_id),
                                     };
                         SqlParameter[] parameter = listStr.ToArray();
                         DataTable tb = SQLHelper.GetDataTableRunText(sql, parameter);
@@ -596,7 +651,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
                                         where PTP_ID=@ptp_id";
                         List<SqlParameter> listStr = new List<SqlParameter>
                                     {
-                                        new SqlParameter("@ptp_id", this.PTP_ID),
+                                        new SqlParameter("@ptp_id", ptp_id),
                                     };
                         SqlParameter[] parameter = listStr.ToArray();
                         DataTable tb = SQLHelper.GetDataTableRunText(sql, parameter);
@@ -636,7 +691,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
                     break;
                 case "7"://管道焊接工作记录
                     {
-                        var iosList = BLL.TestPackageEditService.GetPipeLineListByPTP_ID(this.PTP_ID);
+                        var iosList = BLL.TestPackageEditService.GetPipeLineListByPTP_ID(ptp_id);
                         if (iosList.Count > 0)
                         {
                             var q = iosList[0];
@@ -659,11 +714,13 @@ namespace FineUIPro.Web.HJGL.TestPackage
 	                                        else material1.MaterialCode end) as MaterialCode, --材质
 	                                        weldJoint.WeldingLocationId,--焊接位置
 	                                        weldingMethod.WeldingMethodCode,--焊接方法
-                                            (case when consumables1.ConsumablesName is not null then 
+                                                                     (case
-	                                                case when consumables2.ConsumablesName is not null and consumables1.ConsumablesName<>consumables2.ConsumablesName
+                                    when consumables1.ConsumablesName is not null then
-	                                                then consumables1.ConsumablesName+'+'+consumables2.ConsumablesName
+                                        case
-	                                                else consumables2.ConsumablesName end 
+                                            when consumables2.ConsumablesName is not null and  consumables1.ConsumablesName <> consumables2.ConsumablesName
-	                                        else consumables1.ConsumablesName end) as WeldingMaterial,--焊材牌号
+                                                then consumables1.ConsumablesName + '+' + consumables2.ConsumablesName
+                                            else consumables1.ConsumablesName end
+                                    else consumables2.ConsumablesName end)         as WeldingMaterial,--焊材牌号
 	                                        convert(varchar(10),weldingDaily.WeldingDate,111) as WeldingDate --焊接日期
                                     from HJGL_WeldJoint as weldJoint
                                     left join HJGL_Pipeline as pipeline on pipeline.PipelineId = weldJoint.PipelineId
@@ -732,7 +789,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
                     break;
                 case "8"://管道无损检测数量统计表
                     {
-                        var iosList = BLL.TestPackageEditService.GetPipeLineListByPTP_ID(this.PTP_ID);
+                        var iosList = BLL.TestPackageEditService.GetPipeLineListByPTP_ID(ptp_id);
                         if (iosList.Count > 0)
                         {
                             var q = iosList[0];
@@ -937,7 +994,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
                     break;
                 case "9"://无损检测结果汇总表
                     {
-                        var iosList = BLL.TestPackageEditService.GetPipeLineListByPTP_ID(this.PTP_ID);
+                        var iosList = BLL.TestPackageEditService.GetPipeLineListByPTP_ID(ptp_id);
                         if (iosList.Count > 0)
                         {
                             var q = iosList[0];

SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageData.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HJGL.TestPackage {
+namespace FineUIPro.Web.HJGL.TestPackage
-    
+{
-    
+
-    public partial class TestPackageData {
+
-        
+    public partial class TestPackageData
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// panelLeftRegion 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel panelLeftRegion;
-        
+
         /// <summary>
         /// tvControlItem 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tree tvControlItem;
-        
+
         /// <summary>
         /// hdPTP_ID 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdPTP_ID;
-        
+
         /// <summary>
         /// Panel2 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel2;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtTestPackageNo 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtTestPackageNo;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// drpPrintType 控件。
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpPrintType;
-        
+
         /// <summary>
         /// btnPrint 控件。
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnPrint;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>

SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx

@@ -60,9 +60,9 @@
                                     <Toolbars>
                                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
                                             <Items>
-                                                <f:Label ID="txtTestPackageNo" Label="系统号" runat="server" LabelWidth="130px">
+                                                <f:Label ID="txtTestPackageNo" Label="试压包号" runat="server" LabelWidth="130px">
                                                 </f:Label>
-                                                <f:Label ID="txtTestPackageName" Label="系统名称" runat="server" LabelWidth="130px">
+                                                <f:Label ID="txtTestPackageName" Label="试压包名称" runat="server" LabelWidth="130px">
                                                 </f:Label>
                                                 <f:Label ID="txtRemark" Label="备注" runat="server" LabelWidth="130px">
                                                 </f:Label>

SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx

@@ -66,7 +66,7 @@
                                     TextAlign="Left">
                                 </f:RenderField>
                                 <f:RenderField Width="200px" ColumnID="TestPackageName" DataField="TestPackageName" SortField="TestPackageName"
-                                    FieldType="String" HeaderText="系统名称" HeaderTextAlign="Center"
+                                    FieldType="String" HeaderText="试压包名称" HeaderTextAlign="Center"
                                     TextAlign="Left">
                                 </f:RenderField>
                                 <f:RenderField Width="330px" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"

SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx

@@ -20,7 +20,7 @@
                                     <Items>
                                         <f:TextBox ID="txtTestPackageNo" Label="试压包号" ShowRedStar="true" Required="true" runat="server" FocusOnPageLoad="true" LabelWidth="120px">
                                         </f:TextBox>
-                                        <f:TextBox ID="txtTestPackageName" Label="系统名称" runat="server" LabelWidth="120px">
+                                        <f:TextBox ID="txtTestPackageName" Label="试压包名称" runat="server" LabelWidth="120px">
                                         </f:TextBox>
                                         <f:DropDownList runat="server" ID="drpUnit" Label ="单位名称"></f:DropDownList>
                                         <f:DropDownList runat="server" ID="drpUnitWork" Label ="单位工程"></f:DropDownList>

SGGL/Model/HJGL/PackagingManagePrintOutput.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    public  class PackagingManagePrintOutput
+    {
+        public string PipelineComponentId { get; set; }
+        public string PipelineComponentCode { get; set; }
+        public DateTime? PlanStartDate { get; set; }
+        public string UnitWorkName { get; set; }
+        public string num { get; set; }
+        public string CU { get; set; }
+        public string FlowingSection { get; set; }
+    }
+}

SGGL/Model/Model.cs

@@ -103845,6 +103845,8 @@ namespace Model
 		
 		private string _Remark;
 		
+		private System.Nullable<System.DateTime> _ReceiveDate;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -103869,6 +103871,8 @@ namespace Model
     partial void OnContactPhoneChanged();
     partial void OnRemarkChanging(string value);
     partial void OnRemarkChanged();
+    partial void OnReceiveDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnReceiveDateChanged();
     #endregion
 		
 		public HJGL_TrainNumberManage()
@@ -104076,6 +104080,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReceiveDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> ReceiveDate
+		{
+			get
+			{
+				return this._ReceiveDate;
+			}
+			set
+			{
+				if ((this._ReceiveDate != value))
+				{
+					this.OnReceiveDateChanging(value);
+					this.SendPropertyChanging();
+					this._ReceiveDate = value;
+					this.SendPropertyChanged("ReceiveDate");
+					this.OnReceiveDateChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;

SGGL/Model/Model.csproj

@@ -235,6 +235,7 @@
     <Compile Include="HJGL\3DParameter.cs" />
     <Compile Include="HJGL\MaterialStockItem.cs" />
     <Compile Include="APIItem\HJGL\PackagingManageItem.cs" />
+    <Compile Include="HJGL\PackagingManagePrintOutput.cs" />
     <Compile Include="HJGL\PipelineComponentPrintDto.cs" />
     <Compile Include="HJGL\PipeLineIdCodeItem.cs" />
     <Compile Include="HJGL\PipelinePrefabricatedComponentsItem.cs" />