From fa8530ab6e4da1defa6772208e270a55a11a01c4 Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Wed, 13 Aug 2025 15:56:42 +0800 Subject: [PATCH 1/3] 1 --- .vs/SGGL_SeDin_New/v17/.wsuo | Bin 73216 -> 73216 bytes SGGL/BLL/Common/Funs.cs | 18 ++++++++++++++++++ .../HSSE/CostGoods/CostManageEdit.aspx | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.vs/SGGL_SeDin_New/v17/.wsuo b/.vs/SGGL_SeDin_New/v17/.wsuo index 7f5969003285703035b592ad9f8fad2b4e7e50b7..6c1e3e65c695337400141b0ae6f2d8f4760f0e44 100644 GIT binary patch delta 886 zcmZqJ!_u&aWkLX>(8j>ujEpRkFES~xX{~&(z;kDFG1F4UP!$FS24NtU0^EtN z^Gl9ftdkEj8E*cRMVF nn;Rx4rzKfhn%9D?1jfeZ?-@ZnD#Tc{Ikz-{lO&VtIOhWZ?2SOU delta 879 zcma)4&rcIU6yBLmw=B*U3s$9QLEb%s5iLFv4|<4^oB~Lrwk`e$2Ex!Wh3GTQItw}Hc%{W7S0j`yWYn_&T&_h;)x7)qM?s4Kjq`}f>!tqxd{Kv^M zXZ|DVuTX!HipDT|$5s=94gU_FEgNIiT+z0j`nokYJ72K!wYgcVm@5>lVs*{Q 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/FineUIPro.Web/HSSE/CostGoods/CostManageEdit.aspx b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageEdit.aspx index 9c8b5f26..f1f153d1 100644 --- a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageEdit.aspx @@ -43,7 +43,7 @@ - + From edebefa3c99f95b5d8aeb61634534c1a8170db8e Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Mon, 18 Aug 2025 10:15:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AF=95=E5=8E=8B=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/SGGL_SeDin_New/v17/.wsuo | Bin 73216 -> 72704 bytes .../v17/DocumentLayout.backup.json | 2 +- .vs/SGGL_SeDin_New/v17/DocumentLayout.json | 2 +- SGGL/BLL/BLL.csproj | 11 +- .../File/Excel/DataIn/璇曞帇鍖呭鍏ユā鐗.xlsx | Bin 8504 -> 9614 bytes SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 2 +- .../TestPackage/ItemEndCheckEdit2.aspx.cs | 23 +- .../TestPackage/TestPackageComplete.aspx.cs | 1731 +++++++++-------- .../HJGL/TestPackage/TestPackageData.aspx | 8 +- .../HJGL/TestPackage/TestPackageData.aspx.cs | 323 +-- .../HJGL/TestPackage/TestPackageEdit.aspx | 8 +- .../HJGL/TestPackage/TestPackageEdit.aspx.cs | 2 +- .../HJGL/TestPackage/TestPackageImport.aspx | 49 +- .../TestPackage/TestPackageImport.aspx.cs | 258 +-- .../TestPackageImport.aspx.designer.cs | 9 + .../HJGL/TestPackage/TestPackageItemEdit.aspx | 6 +- .../TestPackage/TestPackageItemEdit.aspx.cs | 4 +- .../TestPackageItemEdit.aspx.designer.cs | 73 +- .../HJGL/WeldingManage/WeldReport.aspx | 4 + .../HJGL/WeldingManage/WeldReport.aspx.cs | 2 +- .../HJGL/WeldingManage/WeldReportEdit.aspx | 16 +- .../HJGL/WeldingManage/WeldReportEdit.aspx.cs | 2 + .../WeldReportEdit.aspx.designer.cs | 77 +- .../ProjectData/ProjectSysSet.aspx | 6 + .../ProjectData/ProjectSysSet.aspx.cs | 39 + .../ProjectSysSet.aspx.designer.cs | 9 + 26 files changed, 1351 insertions(+), 1315 deletions(-) diff --git a/.vs/SGGL_SeDin_New/v17/.wsuo b/.vs/SGGL_SeDin_New/v17/.wsuo index 6c1e3e65c695337400141b0ae6f2d8f4760f0e44..9af64ada3cbf77d590569d186d1fa7c817edf295 100644 GIT binary patch delta 1186 zcmchW%Wl&^6ox%cNFmrXkhV~zsvv}tfQ(|-xmaqUD27sQsikrk8y8k>r3yu*TvY)r zP_l964YFX3>OYfuaX64wJ zR9;?HgL|^WRHjOjB!eFa?saFF&A&ws-#Cg^5)255TL>mWNf7#v~lpE=FC4&L<`}{sa`inwEc+KftqjVFgK|vzLbL20;GFSmG z!7K0@tb#Y74mN|+Lm!wopYXFbQx2gs2xtP04r;l&jDzabpxFLcZRj)ejY|BN3pAMa zV<@@sN#=HH%^$NP3OPrAv{3QLN|o`Jp$Ba{(Zi$t8~)9SRHk^xGKbw^T{CoRS~K0d are+mfLo1icCD$zEi+SDUbJM)J@b)KjFO`u1 delta 1085 zcmc(eO-~a+7{_O(+eO-`6nSf;RFp=l2H7G}V+o?WX`+$fikd*U`HEI-3?v*(D2WFT zn7Ew}VA6w$o=Eqii8nZS@W4mVlSeM)sP+HQS*aIp#3%XXdEL&Fe`iXcjM5ily&z0> z`ong=^j`><$5@OpmIig0auaEuQ#+x7J5=fbM|F$ZWHjEZYc24mj(?#yfVd6(Mm(f_ zT=x_3U7mYvMIz|b#fjE0G_MQ(O$md zxr0UtX;~D^V(#Pq+P0jTBuzZJ0..\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/FineUIPro.Web/File/Excel/DataIn/璇曞帇鍖呭鍏ユā鐗.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/璇曞帇鍖呭鍏ユā鐗.xlsx index 8eee13d894cae67d09bd9bee814ba382f2a59157..87bfc63b577ae6c10bc9bacafaedc60d1a4bb5a8 100644 GIT binary patch delta 6866 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 Y34r%h`QiN+Aeah{2c|*Qr1>-Ze=X&9O#lD@ delta 5748 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 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/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 @@ 锘縰sing 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;//鏄惁蹇呴』妫鏌椤 ///淇濆瓨鏄庣粏 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/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 @@ -锘縰sing 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) //涓嶅瓨鍦ˋ绫诲熬椤规湭鏁存敼瀹屾垚璁板綍 - { - 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 +锘縰sing 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) //涓嶅瓨鍦ˋ绫诲熬椤规湭鏁存敼瀹屾垚璁板綍 + { + 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..dc6547f3 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"> @@ -52,13 +52,13 @@ - - + --%> - 0 then '绗'+convert(varchar(10),t.PrintState)+'娆℃墦鍗' else '鏈墦鍗' end) as PrintState, t.TableDate from PTP_TestPackage t where t.ProjectId=@projectId"; @@ -245,175 +246,175 @@ 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; } + foreach (var ptp_id in selectedRows) + { + exportWord(ptp_id); + + } } - protected void exportWord(string type) + protected void exportWord(string ptp_id) { - if (!string.IsNullOrEmpty(this.PTP_ID)) - { - //淇敼璇曞帇鍖呮墦鍗扮姸鎬 - var updateTestPackage = Funs.DB.PTP_TestPackage.FirstOrDefault(x => x.PTP_ID == this.PTP_ID); - 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鏍煎紡 - { - 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); - } - } - } - else + if (string.IsNullOrEmpty(ptp_id)) { Alert.ShowInTop("璇烽夋嫨瑕佹墦鍗扮殑鍗曟嵁!", MessageBoxIcon.Warning); return; } + //淇敼璇曞帇鍖呮墦鍗扮姸鎬 + 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鏍煎紡 + { + 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/" + 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(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鏍煎紡 + { + 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/" + 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/" + 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/" + 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/" + 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/" + 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(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); + } + } + } @@ -524,9 +525,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,--璇曢獙鐜娓╁害 diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx index 47142db7..2a5daf9c 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx @@ -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..5e1841b8 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx @@ -25,6 +25,8 @@ + + <%----%> @@ -71,7 +73,7 @@ FieldType="String" HeaderText="绠＄嚎鍙" HeaderTextAlign="Center" 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 @@ 锘縰sing 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鏍煎紡閿欒锛丒xcel鍙湁" + 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..9d5c007d 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx @@ -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/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 鎺т欢銆 /// From 87bbd83e25c50787f748850cc8c5476c26f7079a Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Thu, 28 Aug 2025 15:41:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=84=8A=E6=8E=A5=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/SGGL_SeDin_New/v17/.wsuo | Bin 72704 -> 73216 bytes .vs/SGGL_SeDin_New/v17/DocumentLayout.json | 6 +- .../鐗堟湰鏃ュ織/SGGLDB_V2025-08-28-001-lpf.sql | 6 + .../HJGL/PreDesign/PackagingManageService .cs | 60 +++++++-- .../PreDesign/TrainNumberManageService.cs | 34 +---- .../File/Excel/DataIn/璇曞帇鍖呭鍏ユā鐗.xlsx | Bin 9614 -> 9620 bytes SGGL/FineUIPro.Web/File/Fastreport/鍙戣揣鍗.frx | 123 ++++++++++++++++++ SGGL/FineUIPro.Web/File/Fastreport/瑁呯鍗.frx | 6 +- .../HJGL/PreDesign/PackagingManage.aspx.cs | 37 +----- .../PreDesign/PackagingManageView.aspx.cs | 11 +- .../HJGL/PreDesign/TrainNumberManager.aspx | 3 + .../HJGL/PreDesign/TrainNumberManager.aspx.cs | 99 +++++++++++--- .../HJGL/TestPackage/ItemEndCheck.aspx | 2 +- .../HJGL/TestPackage/TestPackageAudit.aspx | 4 +- .../HJGL/TestPackage/TestPackageComplete.aspx | 4 +- .../HJGL/TestPackage/TestPackageData.aspx | 2 +- .../HJGL/TestPackage/TestPackageData.aspx.cs | 123 +++++++++++++----- .../TestPackageData.aspx.designer.cs | 42 +++--- .../HJGL/TestPackage/TestPackageEdit.aspx | 4 +- .../HJGL/TestPackage/TestPackageImport.aspx | 2 +- .../HJGL/TestPackage/TestPackageItemEdit.aspx | 2 +- SGGL/Model/HJGL/PackagingManagePrintOutput.cs | 19 +++ SGGL/Model/Model.cs | 24 ++++ SGGL/Model/Model.csproj | 1 + 24 files changed, 444 insertions(+), 170 deletions(-) create mode 100644 DataBase/鐗堟湰鏃ュ織/SGGLDB_V2025-08-28-001-lpf.sql create mode 100644 SGGL/FineUIPro.Web/File/Fastreport/鍙戣揣鍗.frx create mode 100644 SGGL/Model/HJGL/PackagingManagePrintOutput.cs diff --git a/.vs/SGGL_SeDin_New/v17/.wsuo b/.vs/SGGL_SeDin_New/v17/.wsuo index 9af64ada3cbf77d590569d186d1fa7c817edf295..c92d44ad39226b364f8c6200bf8e580893ce7719 100644 GIT binary patch delta 1723 zcmc&!&u<%55Z&88*v|F+3`MS+>gGml6kx&V$kc5!;X(To;DzhVEznZ z1QA9=5yub;;#tIls(O747Pa43L&THQ1TZkz* z>ggGnZDFX4zB2i9j<;X-_}Ra+koOv6FT#FTiM;^D?h=c@e)p{C#*IiO+_UkR?1FEO z7kP(ivaok(;ehLrvYzrEmh1ZtZt)R&@36?K0S(Go4VEsHtHB!70@}`VeAS=yGI~}= zn=2g*4%=_}-(xpJxA=#1r2;z(MQIjNQVf2QuE3rYfU8f$#Dh4m`4Z{ni)S1H9k&zW z-CO8CsANX$MEEwVYzjArQ%t0{7(z6gu?tUa^VM`pq`w8-<%a|5?LRwth_6NqYypbV zI?F&&DX}?wUn#lVFX7~X{r1>5!h^nOAu?$6b?RFlQogWV7{B8ZspY{(_Daq&FBe0K z&excQ9oc)SvYUmVIQ1@@wtt>#Kfoq|WyeK^MTFBc=>_OsKHitgZ{|15{6K7*<%nP8c^tNCD z?yj7G8gf_DCzt?R`gqk4Af->bmN^dI*C(LUh{Nv6p~mDz<7v>0%Y9tJ>fOD+8=C&; zx_RTn(2wdgcjrr}8H@dLETM;GRX3t?LN!!nR2{R_d<52WSuKEfj6SfWD`RoPR2A7W z%(xsg&Ae>H)KNJX%~^Wf(!-XTXb8fnb+Stu{>pbu>@}xB#2T~*tqoqJe>dG*GWcY5 x!2V@*MwG0C5>M#LsB9XE*k7E-UN5e6z=$0YMDG;QHZDjs!JS6`g8#q`>=b=Joti4quuxC(s!*<) z0!u4)eO3?{3-gqD#Lny{lSu$yFnG4c#e#g(+s}r7zJT428zv2!#@MY!2~!5inZ(6@DFp z@XcL|te>Z97FiqLtO@bg?rvSH9TjY5%-aL7gm3>N-`G7?SyqzJwfgk74vp{ZjLwL= z^udiL8_Tu!*-Z{3YxL~Y=X%}ZxeD( zjScgZGh}n2D_s#kR;snP^4j(|8|10>kd4v}CFNfF?yPzSoRbge5RZ2Jx@R-z|p?0g=v<2}pC>wMk)oNL}p zLDtM%JCrE|`Yhjtq{*ozCMF@@3Ov}dR#1ax8;MVMoKeNH`a%qiBz+^8F4MKq49gEy z od!immbW2K1l&P=cjk?8vKj4qb-fmyF6xF9wQ&l_axKQ`xE4jf{VE_OC diff --git a/.vs/SGGL_SeDin_New/v17/DocumentLayout.json b/.vs/SGGL_SeDin_New/v17/DocumentLayout.json index d1ae1f9c..75ab69a7 100644 --- a/.vs/SGGL_SeDin_New/v17/DocumentLayout.json +++ b/.vs/SGGL_SeDin_New/v17/DocumentLayout.json @@ -8,7 +8,7 @@ "VerticalTabListWidth": 256, "DocumentGroups": [ { - "DockedWidth": 217, + "DockedWidth": 200, "SelectedChildIndex": -1, "Children": [ { @@ -70,10 +70,6 @@ { "$type": "Bookmark", "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" - }, - { - "$type": "Bookmark", - "Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" } ] } 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/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 87bfc63b577ae6c10bc9bacafaedc60d1a4bb5a8..3319b5d828779c57c78b3e92a1c548ffc29a21df 100644 GIT binary patch delta 2364 zcmV-C3B&e|OO#8n+6I5#H=|-w0ssIO1pojK0001ZY%h0ja%*C5Z)+}iZEU1eQE%HI z5PqMu|A2URZHVJER-LMuTP@NyMQYbRRuq#M)dmZ2;;8C>-{I8By1Z1KW#3Zh~`+tYfNRl~y9dJ7ItE)@#Pg*}C z08lo=rE^UhhL)G2X7)@sLV;(cP0buE%{sJ=5v;JK5U#F58bwK1GpX<%AvGVt(5sc? zBGrikBP!;AzAa^A2eg`h1g>W0xorZj>jog6WF_6M2gRu7>0+(4VNVsv?#LK* z2HpgIB!Ynsk-&d-5~`NmXscK544}h3=@b1V3JH0ag6=d2A47^mBR104@W9F>pJbIB zu#zJfiT)dnKx_5Al0x!6i8elPqj+|)l9jmMw=QB$^NZEKQWZuOv+lZ(P81oQz*29; z(GX)~+GgI$3cPe0(J2mRhjv~X1h7t+rI8!PcW@>!D#U+^wUxVr)*b?aoyL?V{@c!^ zL;9D_Ao#z?e*lGBwgEyQyLju@1w?^hlxxtwz4?Vc!}Pgz|a2-gYVVL@u&J; zimg3n#V>AA_aIfFw;2xTXfgs>yTL%|bd1rqcR$F&l^}Bp2Yj%77jj(!XF|vXHbVV9 zw+z4Il8o_ z6f$Z%8g|GgKpWTZ$FG!gMN*yo&keGjZ3&ay&Bu8mN2hKUzo z#A~K=a=9o^J0!H-G1j4XO@Eo!Kk(8 zR;hiv@fjWkz-ZitmXR_mj{Fm^stkXG-R6(efGG(0qr%Jip!Vbp{Z*r!7xYlsZ|d}! zi(P3!e>R3PTc51*%Of`o3<||Mpf=g-yLSGyZ;;CB?Bah6N>0C4C0^{d(o6kAsvT= zI0!Dhd6*{mB-0)UaRAP}Bo6P_IPZ}V2V~;Ke@S%jP~juzQiXWMO)7HPBOzXMopL$^ zzOkfh-7zW^5aa=%%X$OaF zm70gEV8qrhYvQc#KCGtu`1sQw#^GUX?+Z6qt%qC=QtOgL5}3Q}jGd*-E}krw ze=5Daa&46EhKz)(C?SHY2_Gi?xnmEE-5o{9=_oi=KXJr@Z6P^f5Lh=x&t;$23 zAZrhCQfNHHiL&*OrH^k?bot?L00030v#SmZ3kv?WS{k(h00006lfW4qf6r>$KoE!T zg}#H>Q*x-+$svRyD+iZC4-P)K53pDhdqKOaYF4Ge_z)bExJlYV@F^!lsr!ezfdo=q zQ@=~8Ea#M0=-MiY136hbYBl=i`;B(j-g+ZE>oo+(l`N38T%K4UtIFlFRv<4c&!21( z3pJB2^OS@F*##t9&f`Zmf1QL-3~Chp0GNw) z04+Sap3iSk!MG$=RfSTUzNSkk`Ku6$w+oJq+_AMY{n3ry9Yx3O=>65r=r9_$qu#fh zQOBm*vFWTPsf!1_csPEj$gdl9&8y|W+EG%!a7{yE>0RICk*cWVfB*c1-UCk0Ta)gk zX@C9ocxLeSY~FH7n$f%7JN^6XXnOfM4JYx*fHU|#9rPwYzeK}NfA(9cl;)^pL?xfC z)K=5b63*h-(=(Id$KN~gu%F89IJQUkZWF+|vFOb({IRM0LQYXL)2pQQA@)x6ouaf|3k@po2F%2L)(GMo*W2P zCccH_ZYwrvNTS{Ty=lAE4u+5So|EsMdr7`L$R_v!W9wEGh(s|8K=D@8YFD85Y87TE zu#PFgnpQ!9j$qNUyuHb}ro1)qYFZ7()nEfpQkHUEpuKaNVr=;yB(srsC@*eXBboDm zrP*Q4_!rv&PU83uOK?mu$8Zk}^+ZG`q~H@$f173i2#%ov3CdYaB7*5oXv=5z?l2;6O_M`aSIi*kRMC~3EnrOVp0MC02Y(w zB2EEIlQbhO8c i(Ih$qt&6e5lMf{p0S}WVB|ZU&lVv3%23R5h0000<5oqxM delta 2399 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 + + 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/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 @@ 锘縰sing 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/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/TestPackageData.aspx b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageData.aspx index dc6547f3..3b29f2c8 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageData.aspx +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageData.aspx @@ -49,7 +49,7 @@ - <%-- printFiles = new Dictionary(); + foreach (var ptp_id in selectedRows) { - exportWord(ptp_id); - - } + var item = exportWord(ptp_id); + printFiles.Add(item.FirstOrDefault().Key, item.FirstOrDefault().Value); + } + if (printFiles.Count>1) + { + string rootPath = Funs.RootPath; + string startPath = rootPath + "FileUpload\\璇曞帇鍖呰祫鏂" + DateTime.Now.GetHashCode(); + if (!Directory.Exists(startPath)) + { + Directory.CreateDirectory(startPath); + } + string zipPath = rootPath + "FileUpload\\璇曞帇鍖呰祫鏂" + DateTime.Now.GetHashCode() + ".zip"; + foreach (var item in printFiles) + { + var sourceFile = item.Key; + var destFile = startPath + "\\" + item.Value; + if (File.Exists(sourceFile)) + { + File.Copy(sourceFile, destFile, true); + File.Delete(sourceFile); + } + } + System.IO.Compression.ZipFile.CreateFromDirectory(startPath, zipPath); + FileInfo info = new FileInfo(zipPath); + long fileSize = info.Length; + System.Web.HttpContext.Current.Response.Clear(); + System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed"; + System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode("璇曞帇鍖呰祫鏂.zip", System.Text.Encoding.UTF8)); + System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString()); + System.Web.HttpContext.Current.Response.TransmitFile(zipPath, 0, fileSize); + System.Web.HttpContext.Current.Response.Flush(); + System.Web.HttpContext.Current.Response.Close(); + Funs.DeleteDir(startPath); + File.Delete(zipPath); + } + else + { + FileInfo info = new FileInfo(printFiles.FirstOrDefault().Key); + long fileSize = info.Length; + System.Web.HttpContext.Current.Response.Clear(); + System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed"; + System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(printFiles.FirstOrDefault().Value, System.Text.Encoding.UTF8)); + System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString()); + System.Web.HttpContext.Current.Response.TransmitFile(printFiles.FirstOrDefault().Key, 0, fileSize); + System.Web.HttpContext.Current.Response.Flush(); + System.Web.HttpContext.Current.Response.Close(); + } + } - protected void exportWord(string ptp_id) + protected Dictionary 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); @@ -286,6 +334,7 @@ namespace FineUIPro.Web.HJGL.TestPackage if (this.drpPrintType.SelectedValue == "1")//pdf鏍煎紡 { + exportName+=".pdf"; ListItem[] list = new ListItem[10]; list[0] = new ListItem("0", "File\\Fastreport\\JGZL\\绠￠亾璇曞帇鍖呮枃浠惰祫鏂.frx"); list[1] = new ListItem("1", "File\\Fastreport\\JGZL\\绠￠亾鍘嬪姏璇曢獙鎶鏈姹.frx"); @@ -301,26 +350,28 @@ namespace FineUIPro.Web.HJGL.TestPackage List FastReportItemList = new List(); foreach (var item in list) { - FastReportItemList.Add(GetFastReportItem(updateTestPackage, item.Text)); + FastReportItemList.Add(GetFastReportItem(updateTestPackage, item.Text, ptp_id)); } - var Path = Funs.RootPath + "FileUpload/" + ptp_id + ".pdf"; + string Path = Funs.RootPath + "FileUpload/" + ptp_id + ".pdf"; BLL.FastReportService.ExportMergeReport(FastReportItemList, Path, this.drpPrintType.SelectedValue); - FileInfo info = new FileInfo(Path); - long fileSize = info.Length; - + 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); + File.Delete(Path);*/ } else if (this.drpPrintType.SelectedValue == "2")//word鏍煎紡 { + exportName += ".docx"; ListItem[] list = new ListItem[3]; list[0] = new ListItem("0", "File\\Fastreport\\JGZL\\绠￠亾璇曞帇鍖呮枃浠惰祫鏂.frx"); list[1] = new ListItem("1", "File\\Fastreport\\JGZL\\绠￠亾鍘嬪姏璇曢獙鎶鏈姹.frx"); @@ -329,7 +380,7 @@ namespace FineUIPro.Web.HJGL.TestPackage List FastReportItemList = new List(); foreach (var item in list) { - FastReportItemList.Add(GetFastReportItem(updateTestPackage, item.Text)); + FastReportItemList.Add(GetFastReportItem(updateTestPackage, item.Text, ptp_id)); } var PathA = Funs.RootPath + "FileUpload/" + ptp_id + ".docx"; BLL.FastReportService.ExportMergeReport(FastReportItemList, PathA, this.drpPrintType.SelectedValue); @@ -340,7 +391,7 @@ namespace FineUIPro.Web.HJGL.TestPackage List FastReportItemList2 = new List(); foreach (var item in list2) { - FastReportItemList2.Add(GetFastReportItem(updateTestPackage, item.Text)); + FastReportItemList2.Add(GetFastReportItem(updateTestPackage, item.Text, ptp_id)); } var PathB = Funs.RootPath + "FileUpload/" + ptp_id + "2.docx"; BLL.FastReportService.ExportMergeReport(FastReportItemList2, PathB, this.drpPrintType.SelectedValue); @@ -355,7 +406,7 @@ namespace FineUIPro.Web.HJGL.TestPackage List FastReportItemList3 = new List(); foreach (var item in list3) { - FastReportItemList3.Add(GetFastReportItem(updateTestPackage, item.Text)); + FastReportItemList3.Add(GetFastReportItem(updateTestPackage, item.Text, ptp_id)); } var PathC = Funs.RootPath + "FileUpload/" + ptp_id + "3.docx"; BLL.FastReportService.ExportMergeReport(FastReportItemList3, PathC, this.drpPrintType.SelectedValue); @@ -369,7 +420,7 @@ namespace FineUIPro.Web.HJGL.TestPackage List FastReportItemList4 = new List(); foreach (var item in list4) { - FastReportItemList4.Add(GetFastReportItem(updateTestPackage, item.Text)); + FastReportItemList4.Add(GetFastReportItem(updateTestPackage, item.Text, ptp_id)); } var PathD = Funs.RootPath + "FileUpload/" + ptp_id + "4.docx"; BLL.FastReportService.ExportMergeReport(FastReportItemList4, PathD, this.drpPrintType.SelectedValue); @@ -384,7 +435,7 @@ namespace FineUIPro.Web.HJGL.TestPackage List FastReportItemList5 = new List(); foreach (var item in list5) { - FastReportItemList5.Add(GetFastReportItem(updateTestPackage, item.Text)); + FastReportItemList5.Add(GetFastReportItem(updateTestPackage, item.Text, ptp_id)); } var PathE = Funs.RootPath + "FileUpload/" + ptp_id + "5.docx"; BLL.FastReportService.ExportMergeReport(FastReportItemList5, PathE, this.drpPrintType.SelectedValue); @@ -393,10 +444,12 @@ namespace FineUIPro.Web.HJGL.TestPackage doc1.AppendDocument(doc5, Aspose.Words.ImportFormatMode.KeepSourceFormatting); //灏嗗悎骞剁殑鏂囨。淇濆瓨涓 DOCX 鏂囦欢 - doc1.Save(Funs.RootPath + "FileUpload/doc.docx"); + var Path = Funs.RootPath + "FileUpload/"+ ptp_id + "Result.docx"; + doc1.Save(Path); - var Path = Funs.RootPath + "FileUpload/doc.docx"; - FileInfo info = new FileInfo(Path); + keyValuePairs.Add(Path, exportName); + + /* FileInfo info = new FileInfo(Path); long fileSize = info.Length; System.Web.HttpContext.Current.Response.Clear(); @@ -405,20 +458,22 @@ namespace FineUIPro.Web.HJGL.TestPackage System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString()); System.Web.HttpContext.Current.Response.TransmitFile(Path, 0, fileSize); System.Web.HttpContext.Current.Response.Flush(); - System.Web.HttpContext.Current.Response.Close(); - File.Delete(Path); + 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(); @@ -483,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); @@ -539,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); @@ -596,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); @@ -636,7 +691,7 @@ namespace FineUIPro.Web.HJGL.TestPackage break; case "7"://绠￠亾鐒婃帴宸ヤ綔璁板綍 { - var iosList = BLL.TestPackageEditService.GetPipeLineListByPTP_ID(this.PTP_ID); + var iosList = BLL.TestPackageEditService.GetPipeLineListByPTP_ID(ptp_id); if (iosList.Count > 0) { var q = iosList[0]; @@ -659,11 +714,13 @@ namespace FineUIPro.Web.HJGL.TestPackage else material1.MaterialCode end) as MaterialCode, --鏉愯川 weldJoint.WeldingLocationId,--鐒婃帴浣嶇疆 weldingMethod.WeldingMethodCode,--鐒婃帴鏂规硶 - (case when consumables1.ConsumablesName is not null then - case 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 @@ -732,7 +789,7 @@ namespace FineUIPro.Web.HJGL.TestPackage break; case "8"://绠￠亾鏃犳崯妫娴嬫暟閲忕粺璁¤〃 { - var iosList = BLL.TestPackageEditService.GetPipeLineListByPTP_ID(this.PTP_ID); + var iosList = BLL.TestPackageEditService.GetPipeLineListByPTP_ID(ptp_id); if (iosList.Count > 0) { var q = iosList[0]; @@ -937,7 +994,7 @@ namespace FineUIPro.Web.HJGL.TestPackage break; case "9"://鏃犳崯妫娴嬬粨鏋滄眹鎬昏〃 { - var iosList = BLL.TestPackageEditService.GetPipeLineListByPTP_ID(this.PTP_ID); + var iosList = BLL.TestPackageEditService.GetPipeLineListByPTP_ID(ptp_id); if (iosList.Count > 0) { var q = iosList[0]; 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 2a5daf9c..dd67bfc2 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx @@ -60,9 +60,9 @@ - + - + diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx index 5e1841b8..8487ddb3 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx @@ -66,7 +66,7 @@ TextAlign="Left"> - + 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 @@ +锘縰sing 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 fce7a898..4692ee58 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 @@ +