diff --git a/.vs/SGGL_SeDin_New/v17/.wsuo b/.vs/SGGL_SeDin_New/v17/.wsuo index 7f596900..c92d44ad 100644 Binary files a/.vs/SGGL_SeDin_New/v17/.wsuo and b/.vs/SGGL_SeDin_New/v17/.wsuo differ diff --git a/.vs/SGGL_SeDin_New/v17/DocumentLayout.backup.json b/.vs/SGGL_SeDin_New/v17/DocumentLayout.backup.json index 4cf91a0b..d1ae1f9c 100644 --- a/.vs/SGGL_SeDin_New/v17/DocumentLayout.backup.json +++ b/.vs/SGGL_SeDin_New/v17/DocumentLayout.backup.json @@ -8,7 +8,7 @@ "VerticalTabListWidth": 256, "DocumentGroups": [ { - "DockedWidth": 200, + "DockedWidth": 217, "SelectedChildIndex": -1, "Children": [ { diff --git a/.vs/SGGL_SeDin_New/v17/DocumentLayout.json b/.vs/SGGL_SeDin_New/v17/DocumentLayout.json index 4cf91a0b..75ab69a7 100644 --- a/.vs/SGGL_SeDin_New/v17/DocumentLayout.json +++ b/.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}" } ] } diff --git a/DataBase/版本日志/SGGLDB_V2025-08-28-001-lpf.sql b/DataBase/版本日志/SGGLDB_V2025-08-28-001-lpf.sql new file mode 100644 index 00000000..2e52a609 --- /dev/null +++ b/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' \ No newline at end of file diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 516e0284..0c153ad3 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -57,7 +57,16 @@ ..\packages\EmitMapper.1.0.0\lib\EmitMapper.dll - E:\工作\天辰施工平台\SGGL_TCC\SGGL\BLL\bin\Debug\FastReport.dll + ..\FineUIPro\Reference BLL\FastReport.dll + + + ..\FineUIPro\Reference BLL\FastReport.Bars.dll + + + ..\FineUIPro\Reference BLL\FastReport.Compat.dll + + + ..\FineUIPro\Reference BLL\FastReport.Editor.dll False diff --git a/SGGL/BLL/Common/Funs.cs b/SGGL/BLL/Common/Funs.cs index ac8c7aa8..99275b8c 100644 --- a/SGGL/BLL/Common/Funs.cs +++ b/SGGL/BLL/Common/Funs.cs @@ -1468,6 +1468,24 @@ namespace BLL return response.Content; } + public static string RequestGet(string Baseurl, Dictionary 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; + } + + /// /// ڼֵ /// diff --git a/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs b/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs index f2ee57c6..242e88bb 100644 --- a/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs +++ b/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); - if (tb == null || tb.Rows.Count == 0) + var tb = GetPackagingDetailById(PackagingManageId); + if (tb == null || tb.Count == 0) { return PlanStartDate; } - var dtTable = tb.AsEnumerable().OrderBy(o => o["PlanStartDate"]).CopyToDataTable(); - if (dtTable.Rows != null && dtTable.Rows.Count > 0) - { - PlanStartDate = dtTable.Rows[0]["PlanStartDate"].ToString(); - } + PlanStartDate = tb.OrderBy(x => x.PlanStartDate).FirstOrDefault()?.PlanStartDate.ToString(); return PlanStartDate; } @@ -172,7 +168,7 @@ namespace BLL /// /// /// - 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 GetPackagingDetailById(string PackagingManageId) + { + var model = GetHJGL_PackagingManageById(PackagingManageId); + var result = new List(); + if (string.IsNullOrEmpty(model.PipelineComponentId)) + return new List(); + 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; + } /// /// 根据项目号获取包装编号历史记录 /// diff --git a/SGGL/BLL/HJGL/PreDesign/TrainNumberManageService.cs b/SGGL/BLL/HJGL/PreDesign/TrainNumberManageService.cs index acb3a45f..1f4ec522 100644 --- a/SGGL/BLL/HJGL/PreDesign/TrainNumberManageService.cs +++ b/SGGL/BLL/HJGL/PreDesign/TrainNumberManageService.cs @@ -87,38 +87,6 @@ namespace BLL return (pagedData, totalCount); } - /// - /// 获取分页列表 - /// - /// - /// - /// - 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(); } } diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/试压包导入模版.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/试压包导入模版.xlsx index 8eee13d8..3319b5d8 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/试压包导入模版.xlsx and b/SGGL/FineUIPro.Web/File/Excel/DataIn/试压包导入模版.xlsx differ diff --git a/SGGL/FineUIPro.Web/File/Fastreport/发货单.frx b/SGGL/FineUIPro.Web/File/Fastreport/发货单.frx new file mode 100644 index 00000000..83bbfb4b --- /dev/null +++ b/SGGL/FineUIPro.Web/File/Fastreport/发货单.frx @@ -0,0 +1,123 @@ + + + using System; +using System.Collections; +using System.Collections.Generic; +using System.ComponentModel; +using System.Windows.Forms; +using System.Drawing; +using System.Data; +using FastReport; +using FastReport.Data; +using FastReport.Dialog; +using FastReport.Barcode; +using FastReport.Table; +using FastReport.Utils; + +namespace FastReport +{ + public class ReportScript + { + public int x; + + private void Table2_ManualBuild(object sender, EventArgs e) + { + DataSourceBase rowData = Report.GetDataSource("Data"); + // init the data source + rowData.Init(); + x=0; + // now enumerate the data source and print the table body + while (rowData.HasMoreRows) + { + x++; + // print the table body + Table_Data.PrintRow(0); + Table_Data.PrintColumns(); + + // go next data source row + rowData.Next(); + } + } + } +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx b/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx index 124997e3..48e59e9e 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -42,7 +42,7 @@ namespace FastReport } - + @@ -62,7 +62,7 @@ namespace FastReport - + diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 7c91181a..fab89a72 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -16804,7 +16804,7 @@ - + diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx.cs index 31f06ce4..083ab0a8 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx.cs @@ -32,40 +32,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 绑定数据 /// 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 listStr = new List(); - // 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); diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageView.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageView.aspx.cs index 51b03139..7df62d97 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageView.aspx.cs +++ b/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 diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx index 2aea6e55..abd202d5 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx @@ -75,6 +75,9 @@ + + diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx.cs index fab1b868..c86b1e1a 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx.cs +++ b/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 hJGL_TrainNumberManages=new List(); 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 /// protected void btnOut_Click(object sender, EventArgs e) { - Response.ClearContent(); - string filename = Funs.GetNewFileName(); - Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("发货管理" + filename, System.Text.Encoding.UTF8) + ".xls"); - Response.ContentType = "application/excel"; - Response.ContentEncoding = System.Text.Encoding.UTF8; - this.Grid1.PageSize = 500; - this.BindGrid(); - Response.Write(GetGridTableHtml(Grid1)); - Response.End(); - } + if (hJGL_TrainNumberManages != null) + { + var q = hJGL_TrainNumberManages + .Select((x, index) => new + { + 序号 = index + 1, // 自增序号，从 1 开始 + 车次 = x.TrainNumber, + 驾驶员姓名 = x.DriverName, + 驾驶员电话 = 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); + } + } /// /// 导出方法 /// @@ -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}"; - PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format(url, id, "打印 - "))); - } - else - { - Alert.ShowInTop("请选择要打印的数据", MessageBoxIcon.Warning); + + ShowNotify("请选择要打印的项", MessageBoxIcon.Warning); return; } + DataTable tb = LINQToDataTable(HJGL_PackagingmanageService.GetPackagingManage(Id)); + if (tb.Rows.Count > 0) + { + var model = TrainNumberManageService.GetModelById(Id); + Dictionary keyValuePairs = new Dictionary(); + 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))); + + } + } } + } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx b/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx index 33fe1cfc..602fbe1e 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx @@ -62,7 +62,7 @@ + HeaderTextAlign="Center" HeaderText="试压包号" TextAlign="Left"> diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheckEdit2.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheckEdit2.aspx.cs index 199b362b..b81fe5d1 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheckEdit2.aspx.cs +++ b/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; } diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx index 2dae47b0..5b476249 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx @@ -67,9 +67,9 @@ - + - + diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx index 0037daf8..c30c758c 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx @@ -72,9 +72,9 @@ - + - + diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs index 900817fe..13658910 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs @@ -1,822 +1,909 @@ -using BLL; using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; using System.Linq; using System.Web; - namespace FineUIPro.Web.HJGL.TestPackage { public partial class TestPackageComplete : PageBase { #region 定义项 - /// - /// 试压包主键 - /// - public string PTP_ID - { - get - { - return (string)ViewState["PTP_ID"]; - } - set - { - ViewState["PTP_ID"] = value; - } - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #endregion - #region 加载页面 /// /// 加载页面 /// /// /// protected void Page_Load(object sender, EventArgs e) { if (!IsPostBack) { - this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); this.PTP_ID = string.Empty; - Model.Project_Sys_Set pressUnit = BLL.Project_SysSetService.GetSysSetBySetId("8", this.CurrUser.LoginProjectId); - if (pressUnit != null && pressUnit.SetValue == "2") - { - this.Grid1.Columns[1].HeaderText = "设计压力kpa(g)"; - this.Grid1.Columns[4].HeaderText = "压力试验压力kpa(g)"; - } this.InitTreeMenu();//加载树 - } } #endregion #region 加载树装置-单位-工作区 - /// - /// 加载树 - /// - private void InitTreeMenu() - { - this.tvControlItem.Nodes.Clear(); - - TreeNode rootNode1 = new TreeNode(); - rootNode1.NodeID = "1"; - rootNode1.Text = "建筑工程"; - rootNode1.CommandName = "建筑工程"; - rootNode1.Selectable = false; - this.tvControlItem.Nodes.Add(rootNode1); - - TreeNode rootNode2 = new TreeNode(); - rootNode2.NodeID = "2"; - rootNode2.Text = "安装工程"; - rootNode2.CommandName = "安装工程"; - rootNode2.Expanded = true; - this.tvControlItem.Nodes.Add(rootNode2); - var pUnits = (from x in Funs.DB.Project_ProjectUnit where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList(); - // 获取当前用户所在单位 - var currUnit = pUnits.FirstOrDefault(x => x.UnitId == this.CurrUser.UnitId); - - var unitWorkList = (from x in Funs.DB.WBS_UnitWork - where x.ProjectId == this.CurrUser.LoginProjectId - && x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null - select x).ToList(); - List testPackageLists = new List(); - if (!string.IsNullOrEmpty(this.txtCode.Text.Trim())) - { - testPackageLists = (from x in Funs.DB.PTP_TestPackage - where x.ProjectId == this.CurrUser.LoginProjectId - && x.TestPackageNo.Contains(this.txtCode.Text.Trim()) - select x).ToList(); - } - else - { - testPackageLists = (from x in Funs.DB.PTP_TestPackage - where x.ProjectId == this.CurrUser.LoginProjectId - select x).ToList(); - } - List unitWork1 = null; - List unitWork2 = null; - - //// 当前为施工单位，只能操作本单位的数据 - //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - //{ - // unitWork1 = (from x in unitWorkList - // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - // select x).ToList(); - // unitWork2 = (from x in unitWorkList - // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - // select x).ToList(); - //} - //else - //{ - unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); - unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - //} - - if (unitWork1.Count() > 0) - { - foreach (var q in unitWork1) - { - int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); - TreeNode tn1 = new TreeNode(); - tn1.NodeID = q.UnitWorkId; - tn1.Text = q.UnitWorkName; - tn1.ToolTip = "施工单位：" + unitNamesUnitIds; - tn1.CommandName = "单位工程"; - rootNode1.Nodes.Add(tn1); - var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); - BindNodes(tn1, testPackageUnitList); - } - } - if (unitWork2.Count() > 0) - { - foreach (var q in unitWork2) - { - int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); - TreeNode tn2 = new TreeNode(); - tn2.NodeID = q.UnitWorkId; - tn2.Text = q.UnitWorkName; - tn2.ToolTip = "施工单位：" + unitNamesUnitIds; - tn2.CommandName = "单位工程"; - rootNode2.Nodes.Add(tn2); - var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); - BindNodes(tn2, testPackageUnitList); - } - } - } - #endregion #region 绑定树节点 - /// - /// 绑定树节点 - /// - /// - private void BindNodes(TreeNode node, List testPackageUnitList) - { - if (node.CommandName == "单位工程") - { - var dReports = from x in testPackageUnitList - where x.AduditDate.HasValue - orderby x.TestPackageNo descending - select x; - var totalList = from x in Funs.DB.PTP_ItemEndCheckList select x; - foreach (var item in dReports) - { - var list = from x in totalList where x.PTP_ID == item.PTP_ID select x; - var notCompleteAlist = from x in totalList - where x.PTP_ID == item.PTP_ID && x.AOKState == null - select x; - - if (list.Count() > 0 && notCompleteAlist.Count() == 0) //不存在A类尾项未整改完成记录 - { - TreeNode newNode = new TreeNode(); - if (!string.IsNullOrEmpty(item.TestPackageNo)) - { - newNode.Text = item.TestPackageNo; - } - else - { - newNode.Text = "未知"; - } - //if (!item.AduditDate.HasValue || string.IsNullOrEmpty(item.Auditer)) - //{ - // newNode.Text = "" + newNode.Text + ""; - // node.Text = "" + node.Text + ""; - //} - newNode.NodeID = item.PTP_ID; - newNode.EnableClickEvent = true; - newNode.CommandName = "TestPackage"; - node.Nodes.Add(newNode); - } - } - } - } - - #endregion - - #region 点击TreeView - /// - /// 点击TreeView - /// - /// - /// - protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) - { - this.PTP_ID = tvControlItem.SelectedNodeID; - this.BindGrid(); - } - - #endregion - #region 数据绑定 - /// - /// 数据绑定 - /// - private void BindGrid() - { - this.SetTextTemp(); - this.PageInfoLoad(); ///页面输入保存信息 - string strSql = @" SELECT ptpPipe.PT_PipeId, ptpPipe.PTP_ID, ptpPipe.PipelineId, ptpPipe.DesignPress, - ptpPipe.DesignTemperature, ptpPipe.AmbientTemperature, ptpPipe.TestMedium, - ptpPipe.TestMediumTemperature, ptpPipe.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 - WHERE ptpPipe.PTP_ID=@PTP_ID"; - List listStr = new List(); - listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); - listStr.Add(new SqlParameter("@PTP_ID", this.PTP_ID)); - SqlParameter[] parameter = listStr.ToArray(); - DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); - // 2.获取当前分页数据 - //var table = this.GetPagedDataTable(Grid1, tb1); - Grid1.RecordCount = tb.Rows.Count; - var table = this.GetPagedDataTable(Grid1, tb); - Grid1.DataSource = table; - Grid1.DataBind(); - } - - #region 加载页面输入保存信息 - /// - /// 加载页面输入保存信息 - /// - private void PageInfoLoad() - { - var testPackageManage = BLL.TestPackageEditService.GetTestPackageByID(this.PTP_ID); - if (testPackageManage != null) - { - this.txtTestPackageNo.Text = testPackageManage.TestPackageNo; - this.txtTestPackageName.Text = testPackageManage.TestPackageName; - this.txtadjustTestPressure.Text = testPackageManage.AdjustTestPressure; - this.txtAmbientTemperature.Text = testPackageManage.AmbientTemperature.ToString(); - this.txtFinishDef.Text = testPackageManage.FinishDef; - this.txtHoldingTime.Text = testPackageManage.HoldingTime.ToString(); - this.txtTestDate.Text = testPackageManage.TestDate?.ToString("yyyy-MM-dd"); - this.txtTestMediumTemperature.Text = testPackageManage.TestMediumTemperature.ToString(); - } - } - #endregion - - #region 清空页面输入信息 - /// - /// 清空页面输入信息 - /// - private void SetTextTemp() - { - this.txtadjustTestPressure.Text = string.Empty; - this.txtAmbientTemperature.Text = string.Empty; - this.txtFinishDef.Text = string.Empty; - this.txtHoldingTime.Text = string.Empty; - this.txtTestDate.Text = string.Empty; - this.txtTestMediumTemperature.Text = string.Empty; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #endregion - #endregion - #region 分页排序 - #region 页索引改变事件 /// /// 页索引改变事件 /// /// /// protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) { BindGrid(); } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #endregion - #region 排序 /// /// 排序 /// /// /// protected void Grid1_Sort(object sender, GridSortEventArgs e) { BindGrid(); } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #endregion - #region 分页选择下拉改变事件 /// /// 分页选择下拉改变事件 /// /// /// protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) { Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); BindGrid(); } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #endregion - #endregion - - #region 关闭弹出窗口及刷新页面 /// /// 关闭弹出窗口 /// /// /// protected void Window1_Close(object sender, WindowCloseEventArgs e) { this.PTP_ID = this.hdPTP_ID.Text; this.BindGrid(); this.InitTreeMenu(); this.hdPTP_ID.Text = string.Empty; } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /// /// 查询 /// /// /// protected void Tree_TextChanged(object sender, EventArgs e) { this.InitTreeMenu(); this.BindGrid(); } - - #endregion - - protected void btnMenuModify_Click(object sender, EventArgs e) - { - PageContext.RegisterStartupScript(Window1.GetSaveStateReference(this.hdPTP_ID.ClientID) + Window1.GetShowReference(String.Format("TestPackageCompleteEdit.aspx?PTP_ID={0}", this.tvControlItem.SelectedNodeID, "操作 - "))); - } - - protected void btnPrinter_Click(object sender, EventArgs e) - { - string PTP_ID = this.tvControlItem.SelectedNodeID; - var p = BLL.TestPackageEditService.GetTestPackageByID(PTP_ID); - if (p != null) - { - string varValue = string.Empty; - var project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId); - if (project != null) - { - varValue = project.ProjectName; - var unitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(p.UnitWorkId); - if (unitWork != null) - { - varValue = varValue + "|" + unitWork.UnitWorkName; - } - if (!string.IsNullOrEmpty(p.TestPackageName)) - { - varValue = varValue + "|" + p.TestPackageName; - } - if (!string.IsNullOrEmpty(p.TestPackageNo)) - { - varValue = varValue + "|" + p.TestPackageNo; - } - if (!string.IsNullOrEmpty(p.FinishDef)) - { - varValue = varValue + "|" + p.FinishDef; - } - } - if (!string.IsNullOrEmpty(varValue)) - { - varValue = HttpUtility.UrlEncodeUnicode(varValue); - } - PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("../../ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId={3}", BLL.Const.HJGL_TestPackageRecordReportId, PTP_ID, varValue, this.CurrUser.LoginProjectId))); - } - else - { - ShowNotify("请选择试压包！", MessageBoxIcon.Warning); - return; - } - } - - #region 查询 - /// - /// 查询 - /// - /// - /// - protected void txtCode_TextChanged(object sender, EventArgs e) - { - InitTreeMenu(); - } - #endregion - } } \ No newline at end of file +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Web; + +namespace FineUIPro.Web.HJGL.TestPackage +{ + public partial class TestPackageComplete : PageBase + { + #region 定义项 + /// + /// 试压包主键 + /// + public string PTP_ID + { + get + { + return (string)ViewState["PTP_ID"]; + } + set + { + ViewState["PTP_ID"] = value; + } + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #endregion + + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + this.PTP_ID = string.Empty; + Model.Project_Sys_Set pressUnit = BLL.Project_SysSetService.GetSysSetBySetId("8", this.CurrUser.LoginProjectId); + if (pressUnit != null && pressUnit.SetValue == "2") + { + this.Grid1.Columns[1].HeaderText = "设计压力kpa(g)"; + this.Grid1.Columns[4].HeaderText = "压力试验压力kpa(g)"; + } + this.InitTreeMenu();//加载树 + } + } + #endregion + + #region 加载树装置-单位-工作区 + /// + /// 加载树 + /// + private void InitTreeMenu() + { + this.tvControlItem.Nodes.Clear(); + + TreeNode rootNode1 = new TreeNode(); + rootNode1.NodeID = "1"; + rootNode1.Text = "建筑工程"; + rootNode1.CommandName = "建筑工程"; + rootNode1.Selectable = false; + this.tvControlItem.Nodes.Add(rootNode1); + + TreeNode rootNode2 = new TreeNode(); + rootNode2.NodeID = "2"; + rootNode2.Text = "安装工程"; + rootNode2.CommandName = "安装工程"; + rootNode2.Expanded = true; + this.tvControlItem.Nodes.Add(rootNode2); + var pUnits = (from x in Funs.DB.Project_ProjectUnit where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList(); + // 获取当前用户所在单位 + var currUnit = pUnits.FirstOrDefault(x => x.UnitId == this.CurrUser.UnitId); + + var unitWorkList = (from x in Funs.DB.WBS_UnitWork + where x.ProjectId == this.CurrUser.LoginProjectId + && x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null + select x).ToList(); + List testPackageLists = new List(); + if (!string.IsNullOrEmpty(this.txtCode.Text.Trim())) + { + testPackageLists = (from x in Funs.DB.PTP_TestPackage + where x.ProjectId == this.CurrUser.LoginProjectId + && x.TestPackageNo.Contains(this.txtCode.Text.Trim()) + select x).ToList(); + } + else + { + testPackageLists = (from x in Funs.DB.PTP_TestPackage + where x.ProjectId == this.CurrUser.LoginProjectId + select x).ToList(); + } + List unitWork1 = null; + List unitWork2 = null; + + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ + unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); + unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); + //} + + if (unitWork1.Count() > 0) + { + foreach (var q in unitWork1) + { + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); + TreeNode tn1 = new TreeNode(); + tn1.NodeID = q.UnitWorkId; + tn1.Text = q.UnitWorkName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; + tn1.CommandName = "单位工程"; + rootNode1.Nodes.Add(tn1); + var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); + BindNodes(tn1, testPackageUnitList); + } + } + if (unitWork2.Count() > 0) + { + foreach (var q in unitWork2) + { + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); + TreeNode tn2 = new TreeNode(); + tn2.NodeID = q.UnitWorkId; + tn2.Text = q.UnitWorkName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; + tn2.CommandName = "单位工程"; + rootNode2.Nodes.Add(tn2); + var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); + BindNodes(tn2, testPackageUnitList); + } + } + } + #endregion + + #region 绑定树节点 + /// + /// 绑定树节点 + /// + /// + private void BindNodes(TreeNode node, List testPackageUnitList) + { + if (node.CommandName == "单位工程") + { + var dReports = from x in testPackageUnitList + where x.AduditDate.HasValue + orderby x.TestPackageNo descending + select x; + var totalList = from x in Funs.DB.PTP_ItemEndCheckList select x; + foreach (var item in dReports) + { + var list = from x in totalList where x.PTP_ID == item.PTP_ID select x; + var notCompleteAlist = from x in totalList + where x.PTP_ID == item.PTP_ID && x.AOKState == null + select x; + + if (list.Count() > 0 && notCompleteAlist.Count() == 0) //不存在A类尾项未整改完成记录 + { + TreeNode newNode = new TreeNode(); + if (!string.IsNullOrEmpty(item.TestPackageNo)) + { + newNode.Text = item.TestPackageNo; + } + else + { + newNode.Text = "未知"; + } + //if (!item.AduditDate.HasValue || string.IsNullOrEmpty(item.Auditer)) + //{ + // newNode.Text = "" + newNode.Text + ""; + // node.Text = "" + node.Text + ""; + //} + newNode.NodeID = item.PTP_ID; + newNode.EnableClickEvent = true; + newNode.CommandName = "TestPackage"; + node.Nodes.Add(newNode); + } + } + } + } + + #endregion + + #region 点击TreeView + /// + /// 点击TreeView + /// + /// + /// + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + this.PTP_ID = tvControlItem.SelectedNodeID; + this.BindGrid(); + } + + #endregion + + #region 数据绑定 + /// + /// 数据绑定 + /// + private void BindGrid() + { + this.SetTextTemp(); + this.PageInfoLoad(); ///页面输入保存信息 + string strSql = @" SELECT ptpPipe.PT_PipeId, ptpPipe.PTP_ID, ptpPipe.PipelineId, ptpPipe.DesignPress, + ptpPipe.DesignTemperature, ptpPipe.AmbientTemperature, ptpPipe.TestMedium, + ptpPipe.TestMediumTemperature, ptpPipe.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 + WHERE ptpPipe.PTP_ID=@PTP_ID"; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@PTP_ID", this.PTP_ID)); + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + // 2.获取当前分页数据 + //var table = this.GetPagedDataTable(Grid1, tb1); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + #region 加载页面输入保存信息 + /// + /// 加载页面输入保存信息 + /// + private void PageInfoLoad() + { + var testPackageManage = BLL.TestPackageEditService.GetTestPackageByID(this.PTP_ID); + if (testPackageManage != null) + { + this.txtTestPackageNo.Text = testPackageManage.TestPackageNo; + this.txtTestPackageName.Text = testPackageManage.TestPackageName; + this.txtadjustTestPressure.Text = testPackageManage.AdjustTestPressure; + this.txtAmbientTemperature.Text = testPackageManage.AmbientTemperature.ToString(); + this.txtFinishDef.Text = testPackageManage.FinishDef; + this.txtHoldingTime.Text = testPackageManage.HoldingTime.ToString(); + this.txtTestDate.Text = testPackageManage.TestDate?.ToString("yyyy-MM-dd"); + this.txtTestMediumTemperature.Text = testPackageManage.TestMediumTemperature.ToString(); + } + } + #endregion + + #region 清空页面输入信息 + /// + /// 清空页面输入信息 + /// + private void SetTextTemp() + { + this.txtadjustTestPressure.Text = string.Empty; + this.txtAmbientTemperature.Text = string.Empty; + this.txtFinishDef.Text = string.Empty; + this.txtHoldingTime.Text = string.Empty; + this.txtTestDate.Text = string.Empty; + this.txtTestMediumTemperature.Text = string.Empty; + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #endregion + #endregion + + #region 分页排序 + + #region 页索引改变事件 + /// + /// 页索引改变事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #endregion + + #region 排序 + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #endregion + + #region 分页选择下拉改变事件 + /// + /// 分页选择下拉改变事件 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #endregion + + #endregion + + + #region 关闭弹出窗口及刷新页面 + /// + /// 关闭弹出窗口 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + this.PTP_ID = this.hdPTP_ID.Text; + this.BindGrid(); + this.InitTreeMenu(); + this.hdPTP_ID.Text = string.Empty; + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /// + /// 查询 + /// + /// + /// + protected void Tree_TextChanged(object sender, EventArgs e) + { + this.InitTreeMenu(); + this.BindGrid(); + } + + #endregion + + + protected void btnMenuModify_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window1.GetSaveStateReference(this.hdPTP_ID.ClientID) + Window1.GetShowReference(String.Format("TestPackageCompleteEdit.aspx?PTP_ID={0}", this.tvControlItem.SelectedNodeID, "操作 - "))); + } + + protected void btnPrinter_Click(object sender, EventArgs e) + { + string PTP_ID = this.tvControlItem.SelectedNodeID; + var p = BLL.TestPackageEditService.GetTestPackageByID(PTP_ID); + if (p != null) + { + string varValue = string.Empty; + var project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId); + if (project != null) + { + varValue = project.ProjectName; + var unitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(p.UnitWorkId); + if (unitWork != null) + { + varValue = varValue + "|" + unitWork.UnitWorkName; + } + if (!string.IsNullOrEmpty(p.TestPackageName)) + { + varValue = varValue + "|" + p.TestPackageName; + } + if (!string.IsNullOrEmpty(p.TestPackageNo)) + { + varValue = varValue + "|" + p.TestPackageNo; + } + if (!string.IsNullOrEmpty(p.FinishDef)) + { + varValue = varValue + "|" + p.FinishDef; + } + } + if (!string.IsNullOrEmpty(varValue)) + { + varValue = HttpUtility.UrlEncodeUnicode(varValue); + } + PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("../../ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId={3}", BLL.Const.HJGL_TestPackageRecordReportId, PTP_ID, varValue, this.CurrUser.LoginProjectId))); + } + else + { + ShowNotify("请选择试压包！", MessageBoxIcon.Warning); + return; + } + } + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void txtCode_TextChanged(object sender, EventArgs e) + { + InitTreeMenu(); + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageData.aspx b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageData.aspx index c05f9df3..3b29f2c8 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageData.aspx +++ b/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"> @@ -49,16 +49,16 @@ - - - + --%> - 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 /// protected void btnPrint_Click(object sender, EventArgs e) { - if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID)) - { - this.PTP_ID = this.Grid1.SelectedRowID; - exportWord("1"); - } - else + var selectedRows = this.Grid1.SelectedRowIDArray; + if (selectedRows.Length==0) { Alert.ShowInTop("请选择一条试压包", MessageBoxIcon.Warning); return; } - } + Dictionary printFiles = new Dictionary(); - protected void exportWord(string type) - { - if (!string.IsNullOrEmpty(this.PTP_ID)) + foreach (var ptp_id in selectedRows) { - //修改试压包打印状态 - var updateTestPackage = Funs.DB.PTP_TestPackage.FirstOrDefault(x => x.PTP_ID == this.PTP_ID); - if (updateTestPackage != null) + var item = exportWord(ptp_id); + printFiles.Add(item.FirstOrDefault().Key, item.FirstOrDefault().Value); + } + if (printFiles.Count>1) + { + string rootPath = Funs.RootPath; + string startPath = rootPath + "FileUpload\\试压包资料" + DateTime.Now.GetHashCode(); + if (!Directory.Exists(startPath)) { - 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; - } - 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 FastReportItemList = new List(); - 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 FastReportItemList = new List(); - 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 FastReportItemList2 = new List(); - 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 FastReportItemList3 = new List(); - 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 FastReportItemList4 = new List(); - 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 FastReportItemList5 = new List(); - 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); + File.Copy(sourceFile, destFile, true); + File.Delete(sourceFile); } } + System.IO.Compression.ZipFile.CreateFromDirectory(startPath, zipPath); + FileInfo info = new FileInfo(zipPath); + long fileSize = info.Length; + System.Web.HttpContext.Current.Response.Clear(); + System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed"; + System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode("试压包资料.zip", System.Text.Encoding.UTF8)); + System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString()); + System.Web.HttpContext.Current.Response.TransmitFile(zipPath, 0, fileSize); + System.Web.HttpContext.Current.Response.Flush(); + System.Web.HttpContext.Current.Response.Close(); + Funs.DeleteDir(startPath); + File.Delete(zipPath); } else + { + FileInfo info = new FileInfo(printFiles.FirstOrDefault().Key); + long fileSize = info.Length; + System.Web.HttpContext.Current.Response.Clear(); + System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed"; + System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(printFiles.FirstOrDefault().Value, System.Text.Encoding.UTF8)); + System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString()); + System.Web.HttpContext.Current.Response.TransmitFile(printFiles.FirstOrDefault().Key, 0, fileSize); + System.Web.HttpContext.Current.Response.Flush(); + System.Web.HttpContext.Current.Response.Close(); + } + + } + + protected Dictionary exportWord(string ptp_id) + { + Dictionary keyValuePairs = new Dictionary(); + 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 FastReportItemList = new List(); + 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 FastReportItemList = new List(); + 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 FastReportItemList2 = new List(); + 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 FastReportItemList3 = new List(); + 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 FastReportItemList4 = new List(); + 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 FastReportItemList5 = new List(); + 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 listStr = new List { - 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, --设计压力 - ptpPipe.DesignTemperature, --设计温度 - ptpPipe.TestPressure, --试验压力 + IsoInfo.DesignPress, --设计压力 + IsoInfo.DesignTemperature, --设计温度 + IsoInfo.TestPressure, --试验压力 IsoInfo.PipelineCode,--管道编号/单线号 testMedium.MediumName,--试验介质 testPackage.AmbientTemperature,--试验环境温度 @@ -538,7 +594,7 @@ namespace FineUIPro.Web.HJGL.TestPackage where ptpPipe.PTP_ID=@ptp_id"; List listStr = new List { - 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 listStr = new List { - 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 when consumables2.ConsumablesName is not null and consumables1.ConsumablesName<>consumables2.ConsumablesName - then consumables1.ConsumablesName+'+'+consumables2.ConsumablesName - else consumables2.ConsumablesName end - else consumables1.ConsumablesName end) as WeldingMaterial,--焊材牌号 + (case + when consumables1.ConsumablesName is not null then + case + when consumables2.ConsumablesName is not null and consumables1.ConsumablesName <> consumables2.ConsumablesName + 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]; diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageData.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageData.aspx.designer.cs index 9e2309bc..196af0e0 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageData.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageData.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HJGL.TestPackage { - - - public partial class TestPackageData { - +namespace FineUIPro.Web.HJGL.TestPackage +{ + + + public partial class TestPackageData + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// panelLeftRegion 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel panelLeftRegion; - + /// /// tvControlItem 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Tree tvControlItem; - + /// /// hdPTP_ID 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdPTP_ID; - + /// /// Panel2 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel2; - + /// /// Grid1 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar2 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar2; - + /// /// txtTestPackageNo 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtTestPackageNo; - + /// /// ToolbarFill1 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// drpPrintType 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpPrintType; - + /// /// btnPrint 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnPrint; - + /// /// ToolbarSeparator1 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx index 47142db7..dd67bfc2 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx @@ -60,9 +60,9 @@ - + - + @@ -72,9 +72,13 @@ - + <%-- - + --%> diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs index 00ce31a4..27421387 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs +++ b/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 diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx index bbb06e76..8487ddb3 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx @@ -25,6 +25,8 @@ + + <%----%> @@ -64,14 +66,14 @@ TextAlign="Left"> - @@ -97,51 +99,6 @@ - <%-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - --%> diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx.cs index 73e9e87a..b79ff86b 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx.cs +++ b/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 listStr = new List(); - // 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 审核 /// /// 审核 @@ -207,7 +168,7 @@ namespace FineUIPro.Web.HJGL.TestPackage // string result = string.Empty; List result = new List(); //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 delJoints = new List(); - //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 - /// - /// 恢复版本 - /// - /// - /// - 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 下载模板 /// /// 下载模板按钮 @@ -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"))); + } /// /// 下载导入模板 /// @@ -659,31 +509,59 @@ namespace FineUIPro.Web.HJGL.TestPackage /// 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 uploadfilepath = rootPath + Const.TestPackageTemplateUrl; - string filePath = Const.TestPackageTemplateUrl; - string fileName = Path.GetFileName(filePath); - FileInfo info = new FileInfo(uploadfilepath); - long fileSize = info.Length; - Response.ClearContent(); - Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); - Response.ContentType = "excel/plain"; - Response.ContentEncoding = System.Text.Encoding.UTF8; - Response.AddHeader("Content-Length", fileSize.ToString().Trim()); - Response.TransmitFile(uploadfilepath, 0, fileSize); - Response.End(); + string UnitWorkId = Request.Params["UnitWorkId"]; + var queryList = from x in Funs.DB.View_HJGL_Pipeline + join y in Funs.DB.PTP_PipelineList on x.PipelineId equals y.PipelineId into yGroup + from y in yGroup.DefaultIfEmpty() + where x.UnitWorkId == UnitWorkId && y==null + select new + { + x.PipelineId, + x.PipelineCode, + x.PipingClassCode, + x.MediumName, + x.DesignPress, + x.DesignTemperature, + x.TestMediumCode, + x.TestPressure + }; + + var value = new + { + model = queryList.ToList() + }; + MiniExcel.SaveAsByTemplate(path, uploadfilepath, value); } - //else if (e.EventArgument == "Confirm_Restore") - //{ - // var unitworkid = Request.Params["UnitWorkId"]; - // decimal version = decimal.Parse(drpVersion.SelectedValue); - // RestoreVersion(unitworkid, version); - //} + else if (e.EventArgument == "Confirm_OK") + { + var value = new + { + 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 分页选择下拉改变事件 /// /// 分页选择下拉改变事件 diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx.designer.cs index c152620c..5514a619 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx.designer.cs @@ -77,6 +77,15 @@ namespace FineUIPro.Web.HJGL.TestPackage /// protected global::FineUIPro.HiddenField hdFileName; + /// + /// btnDownLoadLine 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnDownLoadLine; + /// /// btnDownLoad 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx index e8470f51..ce1151b5 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx @@ -20,7 +20,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -77,10 +77,10 @@ - + <%-- - + --%> diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx.cs index 2fc8c47e..f8a2fd37 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx.cs +++ b/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 listStr = new List(); - 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) diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx.designer.cs index 14911a89..8e19cd8f 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HJGL.TestPackage { - - - public partial class TestPackageItemEdit { - +namespace FineUIPro.Web.HJGL.TestPackage +{ + + + public partial class TestPackageItemEdit + { + /// /// Head1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlHead Head1; - + /// /// form1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// panelCenterRegion 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel panelCenterRegion; - + /// /// SimpleForm1 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// txtTestPackageNo 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtTestPackageNo; - + /// /// txtTestPackageName 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtTestPackageName; - + /// /// drpUnit 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnit; - + /// /// drpUnitWork 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitWork; - + /// /// txtRemark 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtRemark; - + /// /// txtadjustTestPressure 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtadjustTestPressure; - + /// /// panel3 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel panel3; - + /// /// Toolbar1 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// ToolbarFill1 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// hdPipelinesId 控件。 /// @@ -154,8 +156,8 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hdPipelinesId; - + protected global::FineUIPro.TextBox hdPipelinesId; + /// /// btnFind 控件。 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnFind; - + /// /// btnSave 控件。 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// panel2 控件。 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel panel2; - + /// /// Grid1 控件。 /// @@ -191,16 +193,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - - /// - /// NumberBox1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox NumberBox1; - + /// /// ToolbarSeparator1 控件。 /// @@ -209,7 +202,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -218,7 +211,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -227,7 +220,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// Window1 控件。 /// @@ -236,7 +229,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// Menu1 控件。 /// @@ -245,7 +238,7 @@ namespace FineUIPro.Web.HJGL.TestPackage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuDelete 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx index 24b7ea0d..8f0d6882 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx @@ -173,6 +173,10 @@ DataField="JointAttribute" SortField="JointAttribute" FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px"> + + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs index dce404f3..b80da60f 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs +++ b/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"; diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx index 5285e86a..d6bd1e47 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx +++ b/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" %> @@ -142,6 +142,15 @@ + + + + + + <%-- @@ -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'); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs index 329aeb87..cc9e7ad2 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs +++ b/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("JointAttribute"); + newWeldJoint.WeldingLocationId = values.Value("WeldingLocationId"); var coverWelderCode = (from x in Funs.DB.SitePerson_Person where x.ProjectId == CurrUser.LoginProjectId && x.WelderCode == values.Value("CoverWelderCode") diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs index dc192a89..519c715e 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.WeldingProcess.WeldingManage { - - - public partial class WeldReportEdit { - +namespace FineUIPro.Web.WeldingProcess.WeldingManage +{ + + + public partial class WeldReportEdit + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// panelCenterRegion 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel panelCenterRegion; - + /// /// Toolbar2 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar2; - + /// /// hdItemsString 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdItemsString; - + /// /// hdTablerId 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdTablerId; - + /// /// drpJointAttribute 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpJointAttribute; - + /// /// txtPipelineCode 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtPipelineCode; - + /// /// ToolbarFill1 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnSave 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// btnAccept 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAccept; - + /// /// SimpleForm1 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// txtWeldingDailyCode 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWeldingDailyCode; - + /// /// drpUnit 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnit; - + /// /// drpUnitWork 控件。 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitWork; - + /// /// txtWeldingDate 控件。 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtWeldingDate; - + /// /// txtTabler 控件。 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtTabler; - + /// /// txtTableDate 控件。 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtTableDate; - + /// /// txtRemark 控件。 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtRemark; - + /// /// lbAmount 控件。 /// @@ -200,7 +202,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbAmount; - + /// /// btnSelectWelder 控件。 /// @@ -209,7 +211,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSelectWelder; - + /// /// drpCanWelder 控件。 /// @@ -218,7 +220,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCanWelder; - + /// /// btnSaveWelder 控件。 /// @@ -227,7 +229,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSaveWelder; - + /// /// Grid1 控件。 /// @@ -236,7 +238,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// lbPipeArea 控件。 /// @@ -245,7 +247,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lbPipeArea; - + /// /// drpCoverWelderId 控件。 /// @@ -254,7 +256,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCoverWelderId; - + /// /// drpBackingWelderId 控件。 /// @@ -263,7 +265,16 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpBackingWelderId; - + + /// + /// drpWeldingLocationId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpWeldingLocationId; + /// /// drpJointAttribute2 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageEdit.aspx b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageEdit.aspx index e62dc22b..723a506a 100644 --- a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageEdit.aspx @@ -42,7 +42,7 @@ - + diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx index 192002cd..f4e8566e 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx @@ -45,6 +45,12 @@ + + + + + + diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.cs index 8ef1b8de..e786741a 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.cs +++ b/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; + } + } } } //颜色模型设置 diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.designer.cs index 5d28efa1..1673245d 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.designer.cs @@ -104,6 +104,15 @@ namespace FineUIPro.Web.common.ProjectSet /// protected global::FineUIPro.RadioButtonList rblPressUnit; + /// + /// ckPressMustCheckBItem 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBox ckPressMustCheckBItem; + /// /// ckbDayReport 控件。 /// diff --git a/SGGL/Model/HJGL/PackagingManagePrintOutput.cs b/SGGL/Model/HJGL/PackagingManagePrintOutput.cs new file mode 100644 index 00000000..7e56c089 --- /dev/null +++ b/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; } + } +} diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 2633b477..ff837291 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -103845,6 +103845,8 @@ namespace Model private string _Remark; + private System.Nullable _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 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 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; diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj index 3ae5354e..4fd03303 100644 --- a/SGGL/Model/Model.csproj +++ b/SGGL/Model/Model.csproj @@ -235,6 +235,7 @@ +