1

.vs/SGGL_SeDin_New/v17/DocumentLayout.backup.json

@@ -8,7 +8,7 @@
       "VerticalTabListWidth": 256,
       "DocumentGroups": [
         {
-          "DockedWidth": 200,
+          "DockedWidth": 217,
           "SelectedChildIndex": -1,
           "Children": [
             {

.vs/SGGL_SeDin_New/v17/DocumentLayout.json

@@ -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/BLL.csproj

@@ -57,7 +57,16 @@
       <HintPath>..\packages\EmitMapper.1.0.0\lib\EmitMapper.dll</HintPath>
     </Reference>
     <Reference Include="FastReport">
-      <HintPath>E:\工作\天辰施工平台\SGGL_TCC\SGGL\BLL\bin\Debug\FastReport.dll</HintPath>
+      <HintPath>..\FineUIPro\Reference BLL\FastReport.dll</HintPath>
+    </Reference>
+    <Reference Include="FastReport.Bars">
+      <HintPath>..\FineUIPro\Reference BLL\FastReport.Bars.dll</HintPath>
+    </Reference>
+    <Reference Include="FastReport.Compat">
+      <HintPath>..\FineUIPro\Reference BLL\FastReport.Compat.dll</HintPath>
+    </Reference>
+    <Reference Include="FastReport.Editor">
+      <HintPath>..\FineUIPro\Reference BLL\FastReport.Editor.dll</HintPath>
     </Reference>
     <Reference Include="FineUIPro, Version=6.3.0.0, Culture=neutral, PublicKeyToken=9cbe753c029f291a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

SGGL/BLL/Common/Funs.cs

@@ -1468,6 +1468,24 @@ namespace BLL
             return response.Content;
         }
 
+        public static string RequestGet(string Baseurl, Dictionary<string, string> Token)
+        {
+            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
+
+            var client = new RestClient(Baseurl);
+            client.Timeout = -1;
+            var request = new RestRequest(Method.GET);
+            foreach (var item in Token)
+            {
+                request.AddHeader(item.Key, item.Value);
+            }
+            request.AddHeader("ClientId", SysConstSetService.ClientId);
+            request.AddHeader("OperationCode", Baseurl.Substring(Baseurl.LastIndexOf("/", StringComparison.Ordinal) + 1));
+            IRestResponse response = client.Execute(request);
+            return response.Content;
+        }
+
+
         /// <summary>
         /// 根据星期几返回值
         /// </summary>

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/FineUIPro.Web.csproj

@@ -16804,7 +16804,7 @@
     </COMReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

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/ItemEndCheckEdit2.aspx.cs

@@ -1,4 +1,5 @@
 using BLL;
+using FineUIPro.Web.DataShow;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
@@ -210,7 +211,11 @@ namespace FineUIPro.Web.HJGL.TestPackage
         private void SaveData(string saveType)
         {
 
-            bool flag = true;
+            bool flag_A = true;
+            bool flag_B = true;
+            Model.Project_Sys_Set PressMustCheckBItem = BLL.Project_SysSetService.GetSysSetBySetId("10", this.CurrUser.LoginProjectId);
+            bool isMustCheckBItem = false;
+            isMustCheckBItem= (bool)PressMustCheckBItem?.IsAuto;//是否必须检查B项
             ///保存明细
             if (saveType == Const.BtnSubmit)
             {
@@ -223,7 +228,12 @@ namespace FineUIPro.Web.HJGL.TestPackage
                 {
                     if (item.ItemType == "A" && item.Result != "合格")
                     {
-                        flag = false;
+                        flag_A = false;
+                    }
+                    
+                    if (isMustCheckBItem && item.ItemType == "B" && item.Result != "合格")
+                    {
+                        flag_B = false;
                     }
                 }
                 if (saveType != Const.BtnSave)
@@ -238,11 +248,16 @@ namespace FineUIPro.Web.HJGL.TestPackage
                     }
                     if (State == Const.TestPackage_Complete || State == Const.TestPackage_Audit3)
                     {
-                        if (!flag)
+                        if (!flag_A)
                         {
                             Alert.ShowInTop("A项尾项尚未全部合格，请打回施工单位重新整改！", MessageBoxIcon.Warning);
                             return;
                         }
+                        if (!flag_B)
+                        {
+                            Alert.ShowInTop("B项尾项尚未全部合格，请打回施工单位重新整改！", MessageBoxIcon.Warning);
+                            return;
+                        }
                     }
                     Model.PTP_TestPackageApprove approve1 = BLL.TestPackageApproveService.GetTestPackageApproveById(this.ItemEndCheckListId);
                     if (approve1 != null && saveType == Const.BtnSubmit)
@@ -265,7 +280,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
                         var ItemEndCheckList = ItemEndCheckListService.GetItemEndCheckListByID(this.ItemEndCheckListId);
                         if (ItemEndCheckList != null)
                         {
-                            if (flag)
+                            if (flag_A)
                             {
                                 ItemEndCheckList.AOKState = 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

@@ -30,7 +30,7 @@
                             runat="server" BoxFlex="1" DataKeyNames="PTP_ID" AllowCellEditing="true"
                             EnableColumnLines="true" ClicksToEdit="2" DataIDField="PTP_ID" AllowSorting="true"
                             SortField="TestPackageNo" SortDirection="ASC" OnSort="Grid1_Sort" EnableTextSelection="True"
-                            AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true">
+                            AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"  EnableCheckBoxSelect="true">
                             <Toolbars>
                                 <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
                                     <Items>
@@ -49,16 +49,16 @@
                                 <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=""
+                                <%--<f:RenderField HeaderText="试压状态" ColumnID="" DataField="" SortField=""
                                     FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
-                                </f:RenderField>
+                                </f:RenderField>--%>
                                 <f:RenderField HeaderText="试压时间" ColumnID="TableDate" DataField="TableDate" SortField="TableDate"
                                     FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
                                 </f:RenderField>
-                                <f:RenderField HeaderText="试压结论" ColumnID="" DataField="" SortField=""
+                                <f:RenderField HeaderText="试压结论" ColumnID="FinishDef" DataField="FinishDef" SortField="FinishDef"
                                     FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
                                 </f:RenderField>
                                 <f:RenderField HeaderText="打印状态" ColumnID="PrintState" DataField="PrintState" SortField="PrintState"

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

@@ -171,6 +171,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
                                       t.UnitWorkId,
                                       t.TestPackageNo,
                                       t.TestPackageName,
+                                      t.FinishDef,
                                      (case when t.PrintState>0 then '第'+convert(varchar(10),t.PrintState)+'次打印' else '未打印' end) as PrintState,
                                       t.TableDate
                             from PTP_TestPackage t where t.ProjectId=@projectId";
@@ -245,179 +246,234 @@ namespace FineUIPro.Web.HJGL.TestPackage
         /// <param name="e"></param>
         protected void btnPrint_Click(object sender, EventArgs e)
         {
-            if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID))
+            var selectedRows = this.Grid1.SelectedRowIDArray;
-            {
+            if (selectedRows.Length==0)
-                this.PTP_ID = this.Grid1.SelectedRowID;
-                exportWord("1");
-            }
-            else
             {
                 Alert.ShowInTop("请选择一条试压包", MessageBoxIcon.Warning);
                 return;
             }
-        }
+            Dictionary<string, string> printFiles = new Dictionary<string, string>();
 
-        protected void exportWord(string type)
+            foreach (var ptp_id in selectedRows)
-        {
-            if (!string.IsNullOrEmpty(this.PTP_ID))
             {
-                //修改试压包打印状态
+                var item = exportWord(ptp_id);
-                var updateTestPackage = Funs.DB.PTP_TestPackage.FirstOrDefault(x => x.PTP_ID == this.PTP_ID);
+                printFiles.Add(item.FirstOrDefault().Key, item.FirstOrDefault().Value); 
-                if (updateTestPackage != null)
+            }
+            if (printFiles.Count>1)
+            {
+                string rootPath = Funs.RootPath;
+                string startPath = rootPath + "FileUpload\\试压包资料" + DateTime.Now.GetHashCode();
+                if (!Directory.Exists(startPath))
                 {
-                    if (updateTestPackage.PrintState.HasValue && updateTestPackage.PrintState > 0)
+                    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))
                     {
-                        updateTestPackage.PrintState = updateTestPackage.PrintState + 1;
+                        File.Copy(sourceFile, destFile, true);
-                    }
+                        File.Delete(sourceFile);
-                    else
-                    {
-                        updateTestPackage.PrintState = 1;
-                    }
-                    BLL.TestPackageEditService.UpdateTestPackagePrintState(updateTestPackage);
-
-                    string rootPath = Server.MapPath("~/");
-                    BLL.FastReportService.ResetData();
-
-                    if (this.drpPrintType.SelectedValue == "1")//pdf格式
-                    {
-                        ListItem[] list = new ListItem[10];
-                        list[0] = new ListItem("0", "File\\Fastreport\\JGZL\\管道试压包文件资料.frx");
-                        list[1] = new ListItem("1", "File\\Fastreport\\JGZL\\管道压力试验技术要求.frx");
-                        list[2] = new ListItem("2", "File\\Fastreport\\JGZL\\管道压力包文件资料目录.frx");
-                        list[3] = new ListItem("3", "File\\Fastreport\\JGZL\\管道系统压力试验条件确认记录.frx");
-                        list[4] = new ListItem("4", "File\\Fastreport\\JGZL\\管道试压包尾项清单.frx");
-                        list[5] = new ListItem("5", "File\\Fastreport\\JGZL\\管道系统压力试验记录.frx");
-                        list[6] = new ListItem("6", "File\\Fastreport\\JGZL\\管道材料材质标识检查记录.frx");
-                        list[7] = new ListItem("7", "File\\Fastreport\\JGZL\\管道焊接工作记录.frx");
-                        list[8] = new ListItem("8", "File\\Fastreport\\JGZL\\管道无损检测数量统计表.frx");
-                        list[9] = new ListItem("9", "File\\Fastreport\\JGZL\\无损检测结果汇总表.frx");
-
-                        List<Model.FastReportItem> FastReportItemList = new List<Model.FastReportItem>();
-                        foreach (var item in list)
-                        {
-                            FastReportItemList.Add(GetFastReportItem(updateTestPackage, item.Text));
-                        }
-
-                        var Path = Funs.RootPath + "FileUpload/" + this.PTP_ID + ".pdf";
-
-                        BLL.FastReportService.ExportMergeReport(FastReportItemList, Path, this.drpPrintType.SelectedValue);
-                        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("试压包资料.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);
-                    }
-                    else if (this.drpPrintType.SelectedValue == "2")//word格式
-                    {
-                        ListItem[] list = new ListItem[3];
-                        list[0] = new ListItem("0", "File\\Fastreport\\JGZL\\管道试压包文件资料.frx");
-                        list[1] = new ListItem("1", "File\\Fastreport\\JGZL\\管道压力试验技术要求.frx");
-                        list[2] = new ListItem("2", "File\\Fastreport\\JGZL\\管道压力包文件资料目录.frx");
-
-                        List<Model.FastReportItem> FastReportItemList = new List<Model.FastReportItem>();
-                        foreach (var item in list)
-                        {
-                            FastReportItemList.Add(GetFastReportItem(updateTestPackage, item.Text));
-                        }
-                        var PathA = Funs.RootPath + "FileUpload/" + this.PTP_ID + ".docx";
-                        BLL.FastReportService.ExportMergeReport(FastReportItemList, PathA, this.drpPrintType.SelectedValue);
-                        Aspose.Words.Document doc1 = new Aspose.Words.Document(PathA);
-
-                        ListItem[] list2 = new ListItem[1];
-                        list2[0] = new ListItem("3", "File\\Fastreport\\JGZL\\管道系统压力试验条件确认记录.frx");
-                        List<Model.FastReportItem> FastReportItemList2 = new List<Model.FastReportItem>();
-                        foreach (var item in list2)
-                        {
-                            FastReportItemList2.Add(GetFastReportItem(updateTestPackage, item.Text));
-                        }
-                        var PathB = Funs.RootPath + "FileUpload/" + this.PTP_ID + "2.docx";
-                        BLL.FastReportService.ExportMergeReport(FastReportItemList2, PathB, this.drpPrintType.SelectedValue);
-                        Aspose.Words.Document doc2 = new Aspose.Words.Document(PathB);
-
-                        // 合并 Word DOcx 文档
-                        doc1.AppendDocument(doc2, Aspose.Words.ImportFormatMode.KeepSourceFormatting);
-
-
-                        ListItem[] list3 = new ListItem[1];
-                        list3[0] = new ListItem("4", "File\\Fastreport\\JGZL\\管道试压包尾项清单.frx");
-                        List<Model.FastReportItem> FastReportItemList3 = new List<Model.FastReportItem>();
-                        foreach (var item in list3)
-                        {
-                            FastReportItemList3.Add(GetFastReportItem(updateTestPackage, item.Text));
-                        }
-                        var PathC = Funs.RootPath + "FileUpload/" + this.PTP_ID + "3.docx";
-                        BLL.FastReportService.ExportMergeReport(FastReportItemList3, PathC, this.drpPrintType.SelectedValue);
-                        Aspose.Words.Document doc3 = new Aspose.Words.Document(PathC);
-                        // 合并 Word DOcx 文档
-                        doc1.AppendDocument(doc3, Aspose.Words.ImportFormatMode.KeepSourceFormatting);
-
-                        ListItem[] list4 = new ListItem[2];
-                        list4[0] = new ListItem("5", "File\\Fastreport\\JGZL\\管道系统压力试验记录.frx");
-                        list4[1] = new ListItem("6", "File\\Fastreport\\JGZL\\管道材料材质标识检查记录.frx");
-                        List<Model.FastReportItem> FastReportItemList4 = new List<Model.FastReportItem>();
-                        foreach (var item in list4)
-                        {
-                            FastReportItemList4.Add(GetFastReportItem(updateTestPackage, item.Text));
-                        }
-                        var PathD = Funs.RootPath + "FileUpload/" + this.PTP_ID + "4.docx";
-                        BLL.FastReportService.ExportMergeReport(FastReportItemList4, PathD, this.drpPrintType.SelectedValue);
-                        Aspose.Words.Document doc4 = new Aspose.Words.Document(PathD);
-                        // 合并 Word DOcx 文档
-                        doc1.AppendDocument(doc4, Aspose.Words.ImportFormatMode.KeepSourceFormatting);
-
-                        ListItem[] list5 = new ListItem[3];
-                        list5[0] = new ListItem("7", "File\\Fastreport\\JGZL\\管道焊接工作记录.frx");
-                        list5[1] = new ListItem("8", "File\\Fastreport\\JGZL\\管道无损检测数量统计表.frx");
-                        list5[2] = new ListItem("9", "File\\Fastreport\\JGZL\\无损检测结果汇总表.frx");
-                        List<Model.FastReportItem> FastReportItemList5 = new List<Model.FastReportItem>();
-                        foreach (var item in list5)
-                        {
-                            FastReportItemList5.Add(GetFastReportItem(updateTestPackage, item.Text));
-                        }
-                        var PathE = Funs.RootPath + "FileUpload/" + this.PTP_ID + "5.docx";
-                        BLL.FastReportService.ExportMergeReport(FastReportItemList5, PathE, this.drpPrintType.SelectedValue);
-                        Aspose.Words.Document doc5 = new Aspose.Words.Document(PathE);
-                        // 合并 Word DOcx 文档
-                        doc1.AppendDocument(doc5, Aspose.Words.ImportFormatMode.KeepSourceFormatting);
-
-                        //将合并的文档保存为 DOCX 文件
-                        doc1.Save(Funs.RootPath + "FileUpload/doc.docx");
-
-                        var Path = Funs.RootPath + "FileUpload/doc.docx";
-                        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("交工资料.docx", 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(PathA);
-                        File.Delete(PathB);
-                        File.Delete(PathC);
-                        File.Delete(PathD);
-                        File.Delete(PathE);
                     }
                 }
+                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 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);
+            string exportName = updateTestPackage?.TestPackageNo; //导出文件名称
+            if (updateTestPackage != null)
+            {
+                if (updateTestPackage.PrintState.HasValue && updateTestPackage.PrintState > 0)
+                {
+                    updateTestPackage.PrintState = updateTestPackage.PrintState + 1;
+                }
+                else
+                {
+                    updateTestPackage.PrintState = 1;
+                }
+                BLL.TestPackageEditService.UpdateTestPackagePrintState(updateTestPackage);
+
+                string rootPath = Server.MapPath("~/");
+                BLL.FastReportService.ResetData();
+
+                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");
+                    list[2] = new ListItem("2", "File\\Fastreport\\JGZL\\管道压力包文件资料目录.frx");
+                    list[3] = new ListItem("3", "File\\Fastreport\\JGZL\\管道系统压力试验条件确认记录.frx");
+                    list[4] = new ListItem("4", "File\\Fastreport\\JGZL\\管道试压包尾项清单.frx");
+                    list[5] = new ListItem("5", "File\\Fastreport\\JGZL\\管道系统压力试验记录.frx");
+                    list[6] = new ListItem("6", "File\\Fastreport\\JGZL\\管道材料材质标识检查记录.frx");
+                    list[7] = new ListItem("7", "File\\Fastreport\\JGZL\\管道焊接工作记录.frx");
+                    list[8] = new ListItem("8", "File\\Fastreport\\JGZL\\管道无损检测数量统计表.frx");
+                    list[9] = new ListItem("9", "File\\Fastreport\\JGZL\\无损检测结果汇总表.frx");
+
+                    List<Model.FastReportItem> FastReportItemList = new List<Model.FastReportItem>();
+                    foreach (var item in list)
+                    {
+                        FastReportItemList.Add(GetFastReportItem(updateTestPackage, item.Text, ptp_id));
+                    }
+
+                    string Path = Funs.RootPath + "FileUpload/" + ptp_id + ".pdf";
+
+                    BLL.FastReportService.ExportMergeReport(FastReportItemList, Path, this.drpPrintType.SelectedValue);
+                    keyValuePairs.Add(Path, exportName);
+                   /* 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);*/
+                }
+                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");
+                    list[2] = new ListItem("2", "File\\Fastreport\\JGZL\\管道压力包文件资料目录.frx");
+
+                    List<Model.FastReportItem> FastReportItemList = new List<Model.FastReportItem>();
+                    foreach (var item in list)
+                    {
+                        FastReportItemList.Add(GetFastReportItem(updateTestPackage, item.Text, ptp_id));
+                    }
+                    var PathA = Funs.RootPath + "FileUpload/" + ptp_id + ".docx";
+                    BLL.FastReportService.ExportMergeReport(FastReportItemList, PathA, this.drpPrintType.SelectedValue);
+                    Aspose.Words.Document doc1 = new Aspose.Words.Document(PathA);
+
+                    ListItem[] list2 = new ListItem[1];
+                    list2[0] = new ListItem("3", "File\\Fastreport\\JGZL\\管道系统压力试验条件确认记录.frx");
+                    List<Model.FastReportItem> FastReportItemList2 = new List<Model.FastReportItem>();
+                    foreach (var item in list2)
+                    {
+                        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);
+                    Aspose.Words.Document doc2 = new Aspose.Words.Document(PathB);
+
+                    // 合并 Word DOcx 文档
+                    doc1.AppendDocument(doc2, Aspose.Words.ImportFormatMode.KeepSourceFormatting);
+
+
+                    ListItem[] list3 = new ListItem[1];
+                    list3[0] = new ListItem("4", "File\\Fastreport\\JGZL\\管道试压包尾项清单.frx");
+                    List<Model.FastReportItem> FastReportItemList3 = new List<Model.FastReportItem>();
+                    foreach (var item in list3)
+                    {
+                        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);
+                    Aspose.Words.Document doc3 = new Aspose.Words.Document(PathC);
+                    // 合并 Word DOcx 文档
+                    doc1.AppendDocument(doc3, Aspose.Words.ImportFormatMode.KeepSourceFormatting);
+
+                    ListItem[] list4 = new ListItem[2];
+                    list4[0] = new ListItem("5", "File\\Fastreport\\JGZL\\管道系统压力试验记录.frx");
+                    list4[1] = new ListItem("6", "File\\Fastreport\\JGZL\\管道材料材质标识检查记录.frx");
+                    List<Model.FastReportItem> FastReportItemList4 = new List<Model.FastReportItem>();
+                    foreach (var item in list4)
+                    {
+                        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);
+                    Aspose.Words.Document doc4 = new Aspose.Words.Document(PathD);
+                    // 合并 Word DOcx 文档
+                    doc1.AppendDocument(doc4, Aspose.Words.ImportFormatMode.KeepSourceFormatting);
+
+                    ListItem[] list5 = new ListItem[3];
+                    list5[0] = new ListItem("7", "File\\Fastreport\\JGZL\\管道焊接工作记录.frx");
+                    list5[1] = new ListItem("8", "File\\Fastreport\\JGZL\\管道无损检测数量统计表.frx");
+                    list5[2] = new ListItem("9", "File\\Fastreport\\JGZL\\无损检测结果汇总表.frx");
+                    List<Model.FastReportItem> FastReportItemList5 = new List<Model.FastReportItem>();
+                    foreach (var item in list5)
+                    {
+                        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);
+                    Aspose.Words.Document doc5 = new Aspose.Words.Document(PathE);
+                    // 合并 Word DOcx 文档
+                    doc1.AppendDocument(doc5, Aspose.Words.ImportFormatMode.KeepSourceFormatting);
+
+                    //将合并的文档保存为 DOCX 文件
+                    var Path = Funs.RootPath + "FileUpload/"+ ptp_id + "Result.docx";
+                    doc1.Save(Path);
+
+                    keyValuePairs.Add(Path, exportName); 
+
+                   /* 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(exportName + ".docx", 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(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();
@@ -482,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);
@@ -524,9 +580,9 @@ namespace FineUIPro.Web.HJGL.TestPackage
                         string sql = @"SELECT ptpPipe.PT_PipeId, 
                                               ptpPipe.PTP_ID, 
                                               ptpPipe.PipelineId, 
-                                              ptpPipe.DesignPress, --设计压力
+                                              IsoInfo.DesignPress, --设计压力
-                                              ptpPipe.DesignTemperature, --设计温度
+                                              IsoInfo.DesignTemperature, --设计温度
-                                              ptpPipe.TestPressure, --试验压力
+                                              IsoInfo.TestPressure, --试验压力
                                               IsoInfo.PipelineCode,--管道编号/单线号
                                               testMedium.MediumName,--试验介质
                                               testPackage.AmbientTemperature,--试验环境温度
@@ -538,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);
@@ -595,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);
@@ -635,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];
@@ -658,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
@@ -731,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];
@@ -936,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>
@@ -72,9 +72,13 @@
                                         </f:Toolbar>
                                     </Toolbars>
                                     <Columns>
-                                        <f:RenderField HeaderText="管线编号" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"
+                                        <f:WindowField ColumnID="myWindowField1" Width="160px" WindowID="Window1" HeaderText="管线编号"
+                                            Text="编辑" ToolTip="编辑" DataTextFormatString="{0}" DataIFrameUrlFields="PipelineId" DataTextField="PipelineCode"
+                                            DataIFrameUrlFormatString="../WeldingManage/PipelineEdit.aspx?PipelineId={0}" DataWindowTitleField="PipelineCode"
+                                            DataWindowTitleFormatString="编辑 - {0}" />
+                                        <%--<f:RenderField HeaderText="管线编号" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"
                                             FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="160px">
-                                        </f:RenderField>
+                                        </f:RenderField>--%>
                                         <f:RenderField HeaderText="设计压力Mpa(g)" ColumnID="DesignPress" DataField="DesignPress" SortField="DesignPress"
                                             FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
                                         </f:RenderField>

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

@@ -279,7 +279,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
             this.PageInfoLoad(); ///页面输入保存信息
             string strSql = @" SELECT ptpPipe.PT_PipeId, ptpPipe.PTP_ID, ptpPipe.PipelineId, IsoInfo.DesignPress, 
                                IsoInfo.DesignTemperature, ptpPipe.AmbientTemperature, ptpPipe.TestMedium, 
-                               ptpPipe.TestMediumTemperature, ptpPipe.TestPressure, ptpPipe.HoldingTime,IsoInfo.PipelineCode,testMedium.MediumName
+                               ptpPipe.TestMediumTemperature, IsoInfo.TestPressure, ptpPipe.HoldingTime,IsoInfo.PipelineCode,testMedium.MediumName
                                FROM dbo.PTP_PipelineList AS ptpPipe 
                                LEFT JOIN dbo.HJGL_Pipeline AS IsoInfo ON  ptpPipe.PipelineId = IsoInfo.PipelineId
 							   LEFT JOIN dbo.Base_TestMedium  AS testMedium ON testMedium.TestMediumId = IsoInfo.TestMedium

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

@@ -25,6 +25,8 @@
                         <f:ToolbarFill runat="server"></f:ToolbarFill>
                         <f:HiddenField ID="hdFileName" runat="server">
                         </f:HiddenField>
+                        <f:Button ID="btnDownLoadLine" runat="server" Icon="ApplicationGo" ToolTip="下载模板(附加未试压管线信息)" Text="下载模板(附加管线信息)" OnClick="btnDownLoadLine_Click">
+                        </f:Button>
                         <f:Button ID="btnDownLoad" runat="server" Icon="ApplicationGo" ToolTip="下载模板" Text="下载模板" OnClick="btnDownLoad_Click">
                         </f:Button>
                         <%--<f:Label ID="lbVersion" runat="server" Label="当前版本："></f:Label>--%>
@@ -64,14 +66,14 @@
                                     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"
                                     FieldType="String" HeaderText="管线号" HeaderTextAlign="Center"
                                     TextAlign="Left">
                                 </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="TestPressure" DataField="TestPressure" SortField="TestPressure"
+                                <f:RenderField Width="100px" ColumnID="AdjustTestPressure" DataField="AdjustTestPressure" SortField="AdjustTestPressure"
                                     FieldType="String" HeaderText="调整试验压力" HeaderTextAlign="Center"
                                     TextAlign="Left">
                                 </f:RenderField>
@@ -97,51 +99,6 @@
                         </f:Grid>
                     </Items>
                 </f:FormRow>
-                <%--<f:FormRow>
-                    <Items>
-                          <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="历史记录" IsFluid="true"
-                                    EnableCollapse="false" runat="server" BoxFlex="1" DataKeyNames="DesignBasisDataImportId"
-                                    AllowColumnLocking="true" EnableColumnLines="true" DataIDField="DesignBasisDataImportId"
-                                    AllowSorting="true" SortField="CreateDate" SortDirection="ASC"   EnableMultiSelect="false"
-                                    IsDatabasePaging="false" PageSize="15" >
-                              <Toolbars>
-                                  <f:Toolbar runat="server">
-                                      <Items>
-                                          <f:DropDownList runat="server" ID="drpVersion" Label="恢复版本至" ></f:DropDownList>
-                                          <f:Button runat="server" ID="btnRestore" Text="确定" OnClick="btnRestore_Click"> </f:Button>
-                                      </Items>
-                                  </f:Toolbar>
-                              </Toolbars>
-                                    <Columns>
-                                        <f:RowNumberField EnablePagingNumber="true" HeaderText="编号"
-                                            Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
-                                        <f:RenderField HeaderText="名称" ColumnID="FileName"
-                                            DataField="FileName" SortField="FileName" FieldType="String" HeaderTextAlign="Center"
-                                            TextAlign="Left" Width="90px">
-                                        </f:RenderField>
-                                        <f:RenderField HeaderText="版本" ColumnID="Version"
-                                            DataField="Version" SortField="Version" FieldType="String" HeaderTextAlign="Center"
-                                            TextAlign="Left" Width="100px">
-                                        </f:RenderField>
-                                        <f:RenderField HeaderText="导入类型" ColumnID="ImportType"
-                                            DataField="ImportType" SortField="ImportType" FieldType="String" HeaderTextAlign="Center"
-                                            TextAlign="Left" Width="100px">
-                                        </f:RenderField>
-                                        <f:RenderField Width="200px" ColumnID="UserName" DataField="UserName" SortField="UserName"
-                                            FieldType="String" HeaderText="更新人" HeaderTextAlign="Center"
-                                            TextAlign="Left">
-                                        </f:RenderField>
-                                        <f:RenderField HeaderText="更新日期" ColumnID="CreateDate"
-                                            DataField="CreateDate" SortField="CreateDate" FieldType="String" HeaderTextAlign="Center"
-                                            TextAlign="Left" Width="90px">
-                                        </f:RenderField>
-                                        <f:RenderField Width="200px" ColumnID="Remark" DataField="Remark" FieldType="String"
-                                            HeaderText="更新原因" HeaderTextAlign="Center" TextAlign="Right">
-                                        </f:RenderField>
-                                    </Columns>
-                                </f:Grid>
-                    </Items>
-                </f:FormRow>--%>
             </Rows>
         </f:Form>
     </form>

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

@@ -1,9 +1,11 @@
 using BLL;
+using FineUIPro.Web.ProjectData;
 using MiniExcelLibs;
+using NPOI.POIFS.Crypt.Dsig;
 using System;
 using System.Collections.Generic;
-using System.Data.SqlClient;
 using System.Data;
+using System.Data.SqlClient;
 using System.IO;
 using System.Linq;
 using System.Web;
@@ -58,52 +60,11 @@ namespace FineUIPro.Web.HJGL.TestPackage
                     PipelineList.Clear();
                 }
                 errorInfos = string.Empty;
-                //lbVersion.Text = BLL.HJGL_DesignBasisDataImportService.GetNowVersionByUnitWorkId(Request.Params["UnitWorkId"], DataClassification).ToString();
+
-                //BindGrid2();
             }
         }
         #endregion
 
-        //void BindGrid2()
-        //{
-        //    string strSql = @" select  Import.DesignBasisDataImportId
-        //                              ,Import.ProjectId
-        //                              ,Import.UnitWorkId
-	       //                           ,(Case Import.ImportType when '0' then '补充导入'
-	       //                              when '1' then '更新导入' end) as ImportType
-        //                              ,Import.FileName
-        //                              ,Import.FilePath
-        //                              ,Import.DataClassification
-        //                              ,Import.FileType
-        //                              ,Import.FileSize
-        //                              ,Import.FileId
-        //                              ,Import.Version
-        //                              ,Import.Remark
-        //                              ,Import.CreateMan
-        //                              ,Import.CreateDate
-	       //                           , Users.PersonName
-        //                        from HJGL_DesignBasisDataImport as  Import 
-        //                        left join Person_Persons as Users on Users.PersonId=Import.CreateMan
-        //                        where Import.UnitWorkId=@UnitWorkId and Import.ProjectId=@ProjectId and  Import.DataClassification=@DataClassification 
-        //                        order by Import.CreateDate";
-        //    List<SqlParameter> listStr = new List<SqlParameter>();
-        //    listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
-        //    listStr.Add(new SqlParameter("@UnitWorkId", Request.Params["UnitWorkId"]));
-        //    //listStr.Add(new SqlParameter("@DataClassification", DataClassification));
-        //    SqlParameter[] parameter = listStr.ToArray();
-        //    DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-
-        //    // 2.获取当前分页数据
-        //    //var table = this.GetPagedDataTable(Grid1, tb1);
-        //    Grid2.RecordCount = tb.Rows.Count;
-        //    tb = GetFilteredTable(Grid2.FilteredData, tb);
-        //    var table = this.GetPagedDataTable(Grid2, tb);
-        //    Grid2.DataSource = table;
-        //    Grid2.DataBind();
-        //    drpVersion.DataSource = BLL.HJGL_DesignBasisDataImportService.GetListVersionByUnitWorkId(Request.Params["UnitWorkId"], DataClassification);
-        //    drpVersion.DataBind();
-
-        //}
         #region 审核
         /// <summary>
         /// 审核
@@ -207,7 +168,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
             //  string result = string.Empty;
             List<string> result = new List<string>();
             //pds = BLL.Funs.FilterBlankLines(pds);
-            if (count < 5)
+            if (count < 11)
             {
                 responeData.code = 0;
                 responeData.message = "导入Excel格式错误！Excel只有" + count.ToString().Trim() + "列";
@@ -255,7 +216,15 @@ namespace FineUIPro.Web.HJGL.TestPackage
                     }
                     if (pds[i].C != null)
                     {
-                        string col2 = pds[i].C.ToString();
+                        pipeline.AdjustTestPressure = pds[i].C.ToString();//调整试验压力
+                    }
+                    if (pds[i].D != null)
+                    {
+                        pipeline.Remark = pds[i].D.ToString(); //备注
+                    }
+                    if (pds[i].E != null) //管线号
+                    {
+                        string col2 = pds[i].E.ToString();
                         if (string.IsNullOrEmpty(col2))
                         {
                             result.Add("第" + (i + 1).ToString() + "行," + "管线号" + "," + "此项为必填项！" + "|");
@@ -286,14 +255,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
                     {
                         result.Add("第" + (i + 1).ToString() + "行," + "管线号" + "," + "此项为必填项！" + "|");
                     }
-                    if (pds[i].D != null)
+                   
-                    {
-                        pipeline.AdjustTestPressure = pds[i].D.ToString();
-                    }
-                    if (pds[i].E != null)
-                    {
-                        pipeline.Remark = pds[i].E.ToString();
-                    }                    
                     pipeline.Tabler = this.CurrUser.PersonId;
                     pipeline.TableDate = DateTime.Now;
 
@@ -395,51 +357,12 @@ namespace FineUIPro.Web.HJGL.TestPackage
 
                 if (DrpType.SelectedValue == "1")//更新导入
                 {
-                    //BLL.PipelineMatService.DeletePipeLineMatByUnitWorkId(unitworkId);//删除原有管线对应材料
-                    //BLL.WeldJointService.DeleteWeldJointByUnitWorkId(unitworkId);////删除原有管线对应焊口
-                    //BLL.PipelineService.DeletePipelineByUnitworkId(unitworkId);//删除原有管线
                     AddView_TestPackage_PipelineList(PipelineList);//导入数据
-
-                    //Model.HJGL_DesignBasisDataImport hJGL_DesignBasisDataImport = new Model.HJGL_DesignBasisDataImport();
-                    //hJGL_DesignBasisDataImport.DesignBasisDataImportId = SQLHelper.GetNewID();
-                    //hJGL_DesignBasisDataImport.ProjectId = this.CurrUser.LoginProjectId;
-                    //hJGL_DesignBasisDataImport.UnitWorkId = unitworkId;
-                    //hJGL_DesignBasisDataImport.ImportType = "1";
-                    //hJGL_DesignBasisDataImport.DataClassification = DataClassification;
-                    //hJGL_DesignBasisDataImport.FileName = FileName;
-                    //hJGL_DesignBasisDataImport.FilePath = filePath.Replace(rootPath, "");
-                    //hJGL_DesignBasisDataImport.FileType = BLL.HJGL_DesignBasisDataImportService.GetFileType(FileName);
-                    //hJGL_DesignBasisDataImport.Version = BLL.HJGL_DesignBasisDataImportService.GetNewVersionByUnitWorkId(unitworkId, DataClassification);
-                    //hJGL_DesignBasisDataImport.Remark = txtRemark.Text;
-                    //hJGL_DesignBasisDataImport.CreateMan = this.CurrUser.PersonId;
-                    //hJGL_DesignBasisDataImport.CreateDate = DateTime.Now.ToString("yyyy-MM-dd HH-mm-ss");
-                    //BLL.HJGL_DesignBasisDataImportService.AddHJGL_DesignBasisDataImport(hJGL_DesignBasisDataImport);
-
-                    //BLL.HJGL_DesignBasisDataImportVerSionLogService.UpdateVersion(this.CurrUser.LoginProjectId, unitworkId, (decimal)hJGL_DesignBasisDataImport.Version, DataClassification);
-
-
                 }
                 else   //补充导入
                 {
                     AddView_TestPackage_PipelineList(PipelineList);
 
-                    //Model.HJGL_DesignBasisDataImport hJGL_DesignBasisDataImport = new Model.HJGL_DesignBasisDataImport();
-                    //hJGL_DesignBasisDataImport.DesignBasisDataImportId = SQLHelper.GetNewID();
-                    //hJGL_DesignBasisDataImport.ProjectId = this.CurrUser.LoginProjectId;
-                    //hJGL_DesignBasisDataImport.UnitWorkId = unitworkId;
-                    //hJGL_DesignBasisDataImport.ImportType = "0";
-                    //hJGL_DesignBasisDataImport.DataClassification = DataClassification;
-                    //hJGL_DesignBasisDataImport.FileName = FileName;
-                    //hJGL_DesignBasisDataImport.FilePath = filePath.Replace(rootPath, ""); ;
-                    //hJGL_DesignBasisDataImport.FileType = BLL.HJGL_DesignBasisDataImportService.GetFileType(FileName);
-                    //hJGL_DesignBasisDataImport.Version = BLL.HJGL_DesignBasisDataImportService.GetNowVersionByUnitWorkId(unitworkId, DataClassification);
-                    //hJGL_DesignBasisDataImport.Remark = txtRemark.Text;
-                    //hJGL_DesignBasisDataImport.CreateMan = this.CurrUser.PersonId;
-                    //hJGL_DesignBasisDataImport.CreateDate = DateTime.Now.ToString("yyyy-MM-dd HH-mm-ss");
-                    //BLL.HJGL_DesignBasisDataImportService.AddHJGL_DesignBasisDataImport(hJGL_DesignBasisDataImport);
-
-                    //BLL.HJGL_DesignBasisDataImportVerSionLogService.UpdateVersion(this.CurrUser.LoginProjectId, unitworkId, (decimal)hJGL_DesignBasisDataImport.Version, DataClassification);
-
                 }
 
                 ShowNotify("导入成功！", MessageBoxIcon.Success);
@@ -562,85 +485,9 @@ namespace FineUIPro.Web.HJGL.TestPackage
             {
                 BLL.TestPackageEditService.AddPipelineLists(pipelineList_add);
             }
-            //Model.SGGLDB db2 = Funs.DB;
-            //List<Model.PTP_PipelineList> delJoints = new List<Model.PTP_PipelineList>();
-            //var allWeldJoints2 = from x in db2.PTP_PipelineList
-            //                     join y in db2.PTP_TestPackage on x.PTP_ID equals y.PTP_ID
-            //                     where y.UnitWorkId == Request.Params["UnitWorkId"]
-            //                     select x;
-            //foreach (var pipelineCode in pipelineCodes)
-            //{
-            //    var pipelineWeldJointCodes = weldJoints.Where(x => x.PTP_ID == pipelineCode).Select(x => x.PipelineId).ToList();
-            //    var q = allWeldJoints2.Where(x => x.PTP_ID == pipelineCode && !pipelineWeldJointCodes.Contains(x.PipelineId)).ToList();
-            //    delJoints.AddRange(q);
-            //}
-            //if (delJoints.Count() > 0)
-            //{
-            //    try
-            //    {
-            //        db2.PTP_PipelineList.DeleteAllOnSubmit(delJoints);
-            //        db2.SubmitChanges();
-            //    }
-            //    catch (Exception)
-            //    {
-            //        string weldJointCodes = string.Empty;
-            //        foreach (var item in delJoints)
-            //        {
-            //            weldJointCodes += item.PipelineId + ",";
-            //        }
-            //        Alert.ShowInParent(weldJointCodes, MessageBoxIcon.Warning);
-            //    }
-            //}
         }
         #endregion
 
-        /// <summary>
-        /// 恢复版本
-        /// </summary>
-        /// <param name="unitworkId"></param>
-        /// <param name="version"></param>
-        private void RestoreVersion(string unitworkId, decimal version)
-        {
-            //var model = BLL.HJGL_DesignBasisDataImportService.GetDataByUnitWorkIdAndVersion(unitworkId, version, DataClassification);
-            //if (model != null && model.Count > 0)
-            //{
-            //    foreach (var item in model)
-            //    {
-
-            //        string rootPath = Server.MapPath("~/");
-            //        // initFullPath = rootPath + initPath;
-            //        string filePath = rootPath + item.FilePath;
-            //        ImportXlsToData(filePath);
-            //        BLL.PipelineMatService.DeletePipeLineMatByUnitWorkId(unitworkId);//删除原有管线对应材料
-            //        BLL.WeldJointService.DeleteWeldJointByUnitWorkId(unitworkId);////删除原有管线对应焊口
-            //        BLL.PipelineService.DeletePipelineByUnitworkId(unitworkId);//删除原有管线
-            //        AddView_HJGL_WeldJoint(PipelineList);//导入数据
-            //        PipelineList.Clear();
-
-            //    }
-            //    BLL.HJGL_DesignBasisDataImportVerSionLogService.UpdateVersion(this.CurrUser.LoginProjectId, unitworkId, version, DataClassification);
-            //    PipelineService.RestPipelineAndJoints(this.CurrUser.LoginProjectId);
-
-            //    ShowNotify("恢复成功！");
-
-            //}
-
-
-        }
-
-        protected void btnRestore_Click(object sender, EventArgs e)
-        {
-            //if (string.IsNullOrEmpty(drpVersion.SelectedValue))
-            //{
-            //    ShowNotify("请选择版本");
-            //}
-            //else
-            //{
-            //    PageContext.RegisterStartupScript(Confirm.GetShowReference("确定恢复至该版本吗？", String.Empty, MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "Confirm_Restore"), PageManager1.GetCustomEventReference("Confirm_Cancel")));
-
-            //}
-
-        }
         #region 下载模板
         /// <summary>
         /// 下载模板按钮
@@ -651,7 +498,10 @@ namespace FineUIPro.Web.HJGL.TestPackage
         {
             PageContext.RegisterStartupScript(Confirm.GetShowReference("确定下载导入模板吗？", String.Empty, MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "Confirm_OK"), PageManager1.GetCustomEventReference("Confirm_Cancel")));
         }
-
+        protected void btnDownLoadLine_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Confirm.GetShowReference("确定下载导入模板吗？", String.Empty, MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "DownLine_Confirm_OK"), PageManager1.GetCustomEventReference("Confirm_Cancel")));
+        }
         /// <summary>
         /// 下载导入模板
         /// </summary>
@@ -659,31 +509,59 @@ namespace FineUIPro.Web.HJGL.TestPackage
         /// <param name="e"></param>
         protected void PageManager1_CustomEvent(object sender, CustomEventArgs e)
         {
-            if (e.EventArgument == "Confirm_OK")
+            string rootPath = Server.MapPath("~/");
+            string uploadfilepath = rootPath + Const.TestPackageTemplateUrl;
+            string path = uploadfilepath.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx");
+            string fileName = Path.GetFileName(uploadfilepath);
+            if (e.EventArgument == "DownLine_Confirm_OK")
             {
-                string rootPath = Server.MapPath("~/");
+                string UnitWorkId = Request.Params["UnitWorkId"];
-                string uploadfilepath = rootPath + Const.TestPackageTemplateUrl;
+                var queryList = from x in Funs.DB.View_HJGL_Pipeline
-                string filePath = Const.TestPackageTemplateUrl;
+                            join y in  Funs.DB.PTP_PipelineList on x.PipelineId equals y.PipelineId into yGroup
-                string fileName = Path.GetFileName(filePath);
+                            from y in yGroup.DefaultIfEmpty()
-                FileInfo info = new FileInfo(uploadfilepath);
+                            where x.UnitWorkId == UnitWorkId && y==null
-                long fileSize = info.Length;
+                            select new
-                Response.ClearContent();
+                            {
-                Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+                                x.PipelineId,
-                Response.ContentType = "excel/plain";
+                                x.PipelineCode,
-                Response.ContentEncoding = System.Text.Encoding.UTF8;
+                                x.PipingClassCode,
-                Response.AddHeader("Content-Length", fileSize.ToString().Trim());
+                                x.MediumName,
-                Response.TransmitFile(uploadfilepath, 0, fileSize);
+                                x.DesignPress,
-                Response.End();
+                                x.DesignTemperature,
+                                x.TestMediumCode,
+                                x.TestPressure
+                            };
+
+                var value = new
+                {
+                    model = queryList.ToList()
+                };
+                MiniExcel.SaveAsByTemplate(path, uploadfilepath, value);
             }
-            //else if (e.EventArgument == "Confirm_Restore")
+            else if (e.EventArgument == "Confirm_OK")
-            //{
+            {
-            //    var unitworkid = Request.Params["UnitWorkId"];
+                var value = new
-            //    decimal version = decimal.Parse(drpVersion.SelectedValue);
+                {
-            //    RestoreVersion(unitworkid, version);
+                    model = ""
-            //}
+                };
+                MiniExcel.SaveAsByTemplate(path, uploadfilepath, value); 
+            }
+            FileInfo info = new FileInfo(path);
+            long fileSize = info.Length;
+            System.Web.HttpContext.Current.Response.ClearContent();
+            System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+            System.Web.HttpContext.Current.Response.ContentType = "excel/plain";
+            System.Web.HttpContext.Current.Response.ContentEncoding = System.Text.Encoding.UTF8;
+            System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString().Trim());
+            System.Web.HttpContext.Current.Response.TransmitFile(path, 0, fileSize);
+            System.Web.HttpContext.Current.Response.Flush(); 
+            File.Delete(path);
+            System.Web.HttpContext.Current.Response.End();
+
+
         }
         #endregion
-      
+
         #region 分页选择下拉改变事件
         /// <summary>
         /// 分页选择下拉改变事件

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

@@ -77,6 +77,15 @@ namespace FineUIPro.Web.HJGL.TestPackage
         /// </remarks>
         protected global::FineUIPro.HiddenField hdFileName;
 
+        /// <summary>
+        /// btnDownLoadLine 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnDownLoadLine;
+
         /// <summary>
         /// btnDownLoad 控件。
         /// </summary>

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>
@@ -45,7 +45,7 @@
                             <Items>
                                 <f:ToolbarFill ID="ToolbarFill1" runat="server">
                                 </f:ToolbarFill>
-                                <f:HiddenField ID="hdPipelinesId" runat="server"></f:HiddenField>
+                                <f:TextBox ID="hdPipelinesId" runat="server" Hidden="true"></f:TextBox>
                                 <f:Button ID="btnFind" Text="查询" ToolTip="查找符合条件的管线" ValidateForms="SimpleForm1" Icon="Find" runat="server" OnClick="btnFind_Click">
                                 </f:Button>
                                 <f:Button ID="btnSave" Text="保存" ToolTip="保存试压包信息" ValidateForms="SimpleForm1" Icon="SystemSave" runat="server" OnClick="btnSave_Click">
@@ -77,10 +77,10 @@
                                 </f:RenderField>
                                 <f:RenderField HeaderText="压力试验压力Mpa(g)" ColumnID="TestPressure" DataField="TestPressure" SortField="TestPressure"
                                     FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="110px">
-                                    <Editor>
+                                  <%--  <Editor>
                                         <f:NumberBox ID="NumberBox1" Required="true" runat="server">
                                         </f:NumberBox>
-                                    </Editor>
+                                    </Editor>--%>
                                 </f:RenderField>
                             </Columns>
                             <Listeners>

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

@@ -148,7 +148,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
                                      LEFT JOIN dbo.PTP_PipelineList AS IsoList ON  IsoList.PipelineId = IsoInfo.PipelineId
                                      WHERE IsoInfo.ProjectId= @ProjectId";
             List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
             if (!string.IsNullOrEmpty(this.PTP_ID))
             {
                 strSql += " AND (IsoList.PTP_ID IS NULL OR IsoList.PTP_ID = @PTP_ID)";
@@ -270,7 +270,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
                     ShowNotify("此施压包已审核不能修改！", MessageBoxIcon.Warning);
                     return;
                 }
-
+                
                 Model.PTP_TestPackage testPackage = new Model.PTP_TestPackage();
                 testPackage.ProjectId = this.CurrUser.LoginProjectId;
                 if (this.drpUnitWork.SelectedValue != BLL.Const._Null)

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

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HJGL.TestPackage {
+namespace FineUIPro.Web.HJGL.TestPackage
-    
+{
-    
+
-    public partial class TestPackageItemEdit {
+
-        
+    public partial class TestPackageItemEdit
+    {
+
         /// <summary>
         /// Head1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-        
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// panelCenterRegion 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel panelCenterRegion;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// txtTestPackageNo 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtTestPackageNo;
-        
+
         /// <summary>
         /// txtTestPackageName 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtTestPackageName;
-        
+
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-        
+
         /// <summary>
         /// drpUnitWork 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnitWork;
-        
+
         /// <summary>
         /// txtRemark 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtRemark;
-        
+
         /// <summary>
         /// txtadjustTestPressure 控件。
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtadjustTestPressure;
-        
+
         /// <summary>
         /// panel3 控件。
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel panel3;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// hdPipelinesId 控件。
         /// </summary>
@@ -154,8 +156,8 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hdPipelinesId;
+        protected global::FineUIPro.TextBox hdPipelinesId;
-        
+
         /// <summary>
         /// btnFind 控件。
         /// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnFind;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// panel2 控件。
         /// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel panel2;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -191,16 +193,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
-        /// <summary>
-        /// NumberBox1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox NumberBox1;
-        
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -209,7 +202,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -218,7 +211,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -227,7 +220,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -236,7 +229,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -245,7 +238,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx

@@ -173,6 +173,10 @@
                                                    DataField="JointAttribute" SortField="JointAttribute" FieldType="String" HeaderTextAlign="Center"
                                                    TextAlign="Left" Width="100px">
                                     </f:RenderField>
+                                    <f:RenderField HeaderText="焊接位置" ColumnID="WeldingLocationCode"
+                                        DataField="WeldingLocationCode" SortField="WeldingLocationCode" FieldType="String" HeaderTextAlign="Center"
+                                        TextAlign="Left" Width="100px">
+                                    </f:RenderField>
                                 </Columns>
                                 <Listeners>
                                     <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs

@@ -192,7 +192,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 string strSql = @"SELECT WeldingDailyId,WeldJointId,PipelineCode,WeldJointCode,
                                          BackingWelderCode,CoverWelderCode,Material1Code,Material2Code,
                                          Dia,DNDia,Thickness,WeldTypeCode,WeldingMethodCode,WeldingWireCode,WeldingMode,
-	                                     WeldingRodCode,Size,JointAttribute,CoverWelderTeamGroupName,BackingWelderTeamGroupName
+	                                     WeldingRodCode,Size,JointAttribute,CoverWelderTeamGroupName,BackingWelderTeamGroupName,WeldingLocationCode
 
                                   FROM dbo.View_HJGL_WeldJoint
                                    WHERE WeldingDailyId=@WeldingDailyId";

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx

@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeldReportEdit.aspx.cs"
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeldingLocationId.aspx.cs"
     Inherits="FineUIPro.Web.WeldingProcess.WeldingManage.WeldReportEdit" %>
 
 <!DOCTYPE html>
@@ -142,6 +142,15 @@
                                         </f:DropDownList>
                                     </Editor>
                                 </f:RenderField>
+                                <f:RenderField HeaderText="焊接位置" ColumnID="WeldingLocationId"
+                                    DataField="WeldingLocationId" FieldType="String" RendererFunction="render_user"
+                                    HeaderTextAlign="Center" TextAlign="Center" Width="150px">
+                                    <Editor>
+                                        <f:DropDownList ID="drpWeldingLocationId" EnableEdit="true" Required="true" runat="server"
+                                            ShowRedStar="true">
+                                        </f:DropDownList>
+                                    </Editor>
+                                </f:RenderField>
                                 <%-- <f:RenderField HeaderText="盖面焊工" ColumnID="CoverWelderCode"
                                     DataField="CoverWelderCode" FieldType="String" HeaderTextAlign="Center"
                                     TextAlign="Left" Width="110px">
@@ -238,8 +247,11 @@
         var gridClientID = '<%= Grid1.ClientID %>';
         var drpCoverWelderIdClientID = '<%= drpCoverWelderId.ClientID %>';
         var drpBackingWelderIdClientID = '<%= drpBackingWelderId.ClientID %>';
+        var drpWeldingLocationClientID = '<%= drpWeldingLocationId.ClientID %>';
 
-
+        function render_user(value) {
+            return F(drpWeldingLocationClientID).getTextByValue(value);
+        }
         function onGridBeforeEdit(event, value, params) {
             var grid = F(gridClientID);
             var canWelder = grid.getCellValue(params.rowId, 'CanWelderCode');

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs

@@ -140,6 +140,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         {
             BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
             BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWork, this.CurrUser.LoginProjectId, true);
+            Base_WeldingLocationServie.InitWeldingLocationDropDownList(this.drpWeldingLocationId,true);
             var report = BLL.WeldingDailyService.GetPipeline_WeldingDailyByWeldingDailyId(this.WeldingDailyId);
 
             if (report != null)
@@ -519,6 +520,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                         if (newWeldJoint != null)
                         {
                             newWeldJoint.JointAttribute = values.Value<string>("JointAttribute");
+                            newWeldJoint.WeldingLocationId = values.Value<string>("WeldingLocationId");
                             var coverWelderCode = (from x in Funs.DB.SitePerson_Person
                                                    where x.ProjectId == CurrUser.LoginProjectId &&
                                                          x.WelderCode == values.Value<string>("CoverWelderCode")

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.WeldingProcess.WeldingManage {
+namespace FineUIPro.Web.WeldingProcess.WeldingManage
-    
+{
-    
+
-    public partial class WeldReportEdit {
+
-        
+    public partial class WeldReportEdit
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// panelCenterRegion 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel panelCenterRegion;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// hdItemsString 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdItemsString;
-        
+
         /// <summary>
         /// hdTablerId 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdTablerId;
-        
+
         /// <summary>
         /// drpJointAttribute 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpJointAttribute;
-        
+
         /// <summary>
         /// txtPipelineCode 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtPipelineCode;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// btnAccept 控件。
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAccept;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// txtWeldingDailyCode 控件。
         /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtWeldingDailyCode;
-        
+
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-        
+
         /// <summary>
         /// drpUnitWork 控件。
         /// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnitWork;
-        
+
         /// <summary>
         /// txtWeldingDate 控件。
         /// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtWeldingDate;
-        
+
         /// <summary>
         /// txtTabler 控件。
         /// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtTabler;
-        
+
         /// <summary>
         /// txtTableDate 控件。
         /// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtTableDate;
-        
+
         /// <summary>
         /// txtRemark 控件。
         /// </summary>
@@ -191,7 +193,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtRemark;
-        
+
         /// <summary>
         /// lbAmount 控件。
         /// </summary>
@@ -200,7 +202,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label lbAmount;
-        
+
         /// <summary>
         /// btnSelectWelder 控件。
         /// </summary>
@@ -209,7 +211,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSelectWelder;
-        
+
         /// <summary>
         /// drpCanWelder 控件。
         /// </summary>
@@ -218,7 +220,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCanWelder;
-        
+
         /// <summary>
         /// btnSaveWelder 控件。
         /// </summary>
@@ -227,7 +229,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSaveWelder;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -236,7 +238,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// lbPipeArea 控件。
         /// </summary>
@@ -245,7 +247,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lbPipeArea;
-        
+
         /// <summary>
         /// drpCoverWelderId 控件。
         /// </summary>
@@ -254,7 +256,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCoverWelderId;
-        
+
         /// <summary>
         /// drpBackingWelderId 控件。
         /// </summary>
@@ -263,7 +265,16 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpBackingWelderId;
-        
+
+        /// <summary>
+        /// drpWeldingLocationId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpWeldingLocationId;
+
         /// <summary>
         /// drpJointAttribute2 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageEdit.aspx

@@ -42,7 +42,7 @@
                         </f:TextBox>
                         <f:TextBox ID="txtGetCost" runat="server" Label="已支付的HSE费用(元)" LabelWidth="180px"  Readonly="true">
                         </f:TextBox>
-                        <f:NumberBox ID="txtSumMoney" runat="server" Label="本次申请费用(元)" LabelWidth="180px" MinValue="0" NoDecimal="false" NoNegative="true" DecimalPrecision="2" Required="true" ShowRedStar="true" Increment="0.01"></f:NumberBox>
+                        <f:NumberBox ID="txtSumMoney" runat="server" Label="本次申请费用(元)" LabelWidth="180px" MinValue="0" NoDecimal="false" NoNegative="true" DecimalPrecision="2" Required="true" ShowRedStar="true" Increment="0.01" Hidden="true"></f:NumberBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>

SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx

@@ -45,6 +45,12 @@
                                                 </f:RadioButtonList>
                                             </Items>
                                         </f:FormRow>
+                                        <f:FormRow>
+                                            <Items>
+                                                <f:CheckBox ID="ckPressMustCheckBItem" runat="server" Label="压力试验尾项条件" Text="必须B项整改完成" LabelWidth="200">
+                                                </f:CheckBox>
+                                            </Items> 
+                                        </f:FormRow>
                                         <f:FormRow>
                                             <Items>
                                                 <f:CheckBox ID="ckbDayReport" runat="server" Label="焊接日报编号" Text="是否自动生成" LabelWidth="200">

SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.cs

@@ -59,6 +59,34 @@ namespace FineUIPro.Web.common.ProjectSet
             Model.Project_Sys_Set thickness = BLL.Project_SysSetService.GetSysSetBySetId("7", projectId);
             Model.Project_Sys_Set pressUnit = BLL.Project_SysSetService.GetSysSetBySetId("8", projectId);
             Model.Project_Sys_Set AvevaNetUrl = BLL.Project_SysSetService.GetSysSetBySetId("9", projectId);
+            Model.Project_Sys_Set PressMustCheckBItem = BLL.Project_SysSetService.GetSysSetBySetId("10", projectId);
+            if (PressMustCheckBItem != null)
+            {
+                if (this.ckPressMustCheckBItem.Checked)
+                {
+                    PressMustCheckBItem.IsAuto = true;
+                }
+                else
+                {
+                    PressMustCheckBItem.IsAuto = false;
+                }
+                BLL.Project_SysSetService.UpdateSet(PressMustCheckBItem);
+            }
+            else
+            {
+                Model.Project_Sys_Set newPressMustCheckBItem = new Model.Project_Sys_Set();
+                newPressMustCheckBItem.SetId = "10";
+                newPressMustCheckBItem.ProjectId = projectId;
+                if (this.ckPressMustCheckBItem.Checked)
+                {
+                    newPressMustCheckBItem.IsAuto = true;
+                }
+                else
+                {
+                    newPressMustCheckBItem.IsAuto = false;
+                }
+                BLL.Project_SysSetService.AddSet(newPressMustCheckBItem);
+            }
             if (jointB != null)
             {
                 if (this.ckbJointB.Checked)
@@ -550,6 +578,17 @@ namespace FineUIPro.Web.common.ProjectSet
 
                         this.AvevaNetUrl.Text = s.SetValue;
                     }
+                    else if (s.SetId == "10")
+                    { 
+                        if (s.IsAuto == true)
+                        {
+                            this.ckPressMustCheckBItem.Checked = true;
+                        }
+                        else
+                        {
+                            this.ckPressMustCheckBItem.Checked = false;
+                        }
+                    }
                 }
             }
             //颜色模型设置

SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.designer.cs

@@ -104,6 +104,15 @@ namespace FineUIPro.Web.common.ProjectSet
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rblPressUnit;
 
+        /// <summary>
+        /// ckPressMustCheckBItem 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox ckPressMustCheckBItem;
+
         /// <summary>
         /// ckbDayReport 控件。
         /// </summary>

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" />