From 58e33c9576865810625a122f211119cd59e80234 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Mon, 12 May 2025 15:05:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1=E5=AE=89=E8=A3=85=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/赛鼎/v17/.wsuo | Bin 0 -> 11264 bytes .vs/赛鼎/v17/DocumentLayout.json | 37 + DataBase/版本日志/SGGLDB_V2025-05-12-xiaj.sql | 26 + SGGL/BLL/BLL.csproj | 4 +- SGGL/BLL/CLGL/TwArrivalStatisticsService.cs | 1 - SGGL/BLL/Common/WordHelp.cs | 144 ++-- .../Project_HJGLData_DefectService.cs | 1 - ...ject_HSSEData_HiddenDangerDetailService.cs | 1 - .../CLGL/OutPlanMasterEdit.aspx.cs | 10 - .../DataShow/HJGLWeldingItem.aspx.cs | 4 - .../File/Excel/DataIn/材料信息导入模板.xls | Bin 26112 -> 26112 bytes SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 10 +- .../HJGL/PreDesign/InstallList.aspx | 213 ++++++ .../HJGL/PreDesign/InstallList.aspx.cs | 710 ++++++++++++++++++ .../PreDesign/InstallList.aspx.designer.cs | 368 +++++++++ .../HJGL/WeldingManage/WeldReportEdit.aspx.cs | 5 - .../HJGL/WeldingManage/WeldingConDate.aspx.cs | 1 - SGGL/FineUIPro.Web/common/Menu_HJGL.xml | 1 + 18 files changed, 1438 insertions(+), 98 deletions(-) create mode 100644 .vs/赛鼎/v17/.wsuo create mode 100644 .vs/赛鼎/v17/DocumentLayout.json create mode 100644 DataBase/版本日志/SGGLDB_V2025-05-12-xiaj.sql create mode 100644 SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx create mode 100644 SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs create mode 100644 SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.designer.cs diff --git a/.vs/赛鼎/v17/.wsuo b/.vs/赛鼎/v17/.wsuo new file mode 100644 index 0000000000000000000000000000000000000000..e2115eb6a973dae7f3e99e0891873f4ee79fc42f GIT binary patch literal 11264 zcmeHN+iw(A82<{QauG$aDk3(dF?g9ed+A=VTf)D2t7!0A3h)Y`0y|t5-I4dBq*n&Rb5q`P?ly zCG$X;mMN^C&qWXNQIwRu9b2S{{}{?Q;fcEb7tvPP_0ve-_bveGXWg+_Og=s7=6B%z z6rMeJX!Dde-&^tCg@^5#@6g8K!2fCgcNT{0_CNR#?SCJ1wPXKa0!V2p_XF+&wBOxG z)3#~X%+vn)R`$OQd1RZ2B5f+{6s&6wP_C^W%Cc3tD&x698&Y|`c`iJMr`uQVZNqej z)(-~?@OY*jA7l!tSvlhTPQdfHh|;p-1J!CE)E4w6{130c(4t9G5!>r-=_x6~`x^mT z*~O;MMNhOMW0Gs?>n}I}eEO4WPx9Bd%F|bQ-K{u+)f>Pf+7ytlG|i&b2#qrMU(5Eq zMon;vHlS*c0<#ECU&J5%&T)t1rc5GNQH?_0Ju&c=565ALAn%e~k{RHZ@s8^EswwRQ z|9S7@SwXE<sRuO%732k_ng&>`1OzLCqDND+P{f;h0&|P=Y2-`|6y%a9eK~Qf)tE@ z6*^hOET(G>1Ac+OruH|2_09m5_h7FqTJfG!!v5DbK7FlGcRl{~*Dz@bwVUW++)C%L zKT`hG1eSU!1O8L)Ja?nYpS~UMj3nW8g4#~h2c4gHY_bH790x8nVou&e3u7xuZ#TLizg~RaTR_68g9bUxVp<2+rrAq z(&y;E_gw754pqX+EoUc~2cN1OMzH?2<Nuq*gTbIG3!Z;GZ+K^CG=DG z{{q&_ou8vo%ZP9mWwd*)@eE{6j__=()OTqN;8G6w^aZ)6N9DhF{|l4AYbU9Bg}r%Rsr@eu ze;gQ;!YODx-{gazk}=lLSdqH__BMF{6~qF^;GgM|fF1BRjA+YiL0`_x&~LAe{MznV zGe)Iqmv7#R+yAE{LrY)062E`D^IdQ4X$Py3;cEL+4_AXvJ7WLF7;}TjMyA!yKQd5A zL)xRCR#WC5>p|wbJe-e%qx_IKec6X{=h<^y2IPWFpZT|N_3OVcUy$?HcYb?;4OSqY zgXiUg6_-g+@`QXucZy14(QS;?hoUP^3MqbOLlKHHa zNvCoNoStN)Yg#{lHpu+YTZPeqL`omf2R=z8GFCE~Pil55Yia3(X=#R@&1!bhFby+p z=1envjXMVCQm4CcYQ&ds}@XaT4^!T0IXk{ztqH ztq%@#;y;ge{AUEWy>rsjbl>gqM8d-Ml{oPiet+XGx>n@1q_rBeopClYzCZpHBmU?7 zAJ9XL|2gq5>J;S=MQ+~sgMa;xTKvzyenyuV5xNAgv*g5Is-Dh5;Ni}7#bDr(dOr?_?% z|7(R``vPV;@t&3D!}u@xxf>7X5RBTW;kTL~{EqzFmcPUIjVk{~J^n}AVf>nw6DR(- I(c_2z0g$l%Qvd(} literal 0 HcmV?d00001 diff --git a/.vs/赛鼎/v17/DocumentLayout.json b/.vs/赛鼎/v17/DocumentLayout.json new file mode 100644 index 00000000..dc7b8b49 --- /dev/null +++ b/.vs/赛鼎/v17/DocumentLayout.json @@ -0,0 +1,37 @@ +{ + "Version": 1, + "WorkspaceRootPath": "G:\\\u516C\u53F8\u9879\u76EE\\\u8D5B\u9F0E\\", + "Documents": [], + "DocumentGroupContainers": [ + { + "Orientation": 1, + "VerticalTabListWidth": 256, + "DocumentGroups": [ + { + "DockedHeight": 791, + "SelectedChildIndex": -1, + "Children": [ + { + "$type": "Bookmark", + "Name": "ST:130:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + } + ] + }, + { + "DockedHeight": 199, + "SelectedChildIndex": -1, + "Children": [ + { + "$type": "Bookmark", + "Name": "ST:0:0:{d78612c7-9962-4b83-95d9-268046dad23a}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{34e76e81-ee4a-11d0-ae2e-00a0c90fffc3}" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_V2025-05-12-xiaj.sql b/DataBase/版本日志/SGGLDB_V2025-05-12-xiaj.sql new file mode 100644 index 00000000..a7f1ea01 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2025-05-12-xiaj.sql @@ -0,0 +1,26 @@ + + + +--ӹԤƹװ嵥 +--1װ嵥 +IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = 'BD9C587E-17C2-49F1-82AE-A05117E41D89') +BEGIN + --װ嵥 + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('BD9C587E-17C2-49F1-82AE-A05117E41D89','װ嵥','HJGL/PreDesign/InstallList.aspx',60,'1E36EA73-D536-4215-BFB9-A8771937BD89','Menu_HJGL',0,1,1) +END +GO +IF NOT EXISTS (SELECT * FROM Sys_ButtonToMenu WHERE MenuId = 'BD9C587E-17C2-49F1-82AE-A05117E41D89') +BEGIN + --װ嵥 + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('02D07D69-1140-4A04-81C8-57D902D6D957','BD9C587E-17C2-49F1-82AE-A05117E41D89','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('2608E7A1-0707-4011-BAD7-C7F0D3CBDCA8','BD9C587E-17C2-49F1-82AE-A05117E41D89','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('AD402A21-BAF5-423D-9BCF-79BF8BE933FB','BD9C587E-17C2-49F1-82AE-A05117E41D89','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('5811146E-67D5-4D15-8179-775D5F9BA1BD','BD9C587E-17C2-49F1-82AE-A05117E41D89','',4) +END +GO + diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 1cf2f498..e1b6c6a9 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -876,7 +876,7 @@ {00020813-0000-0000-C000-000000000046} 1 - 9 + 6 0 primary False @@ -885,7 +885,7 @@ {00020905-0000-0000-C000-000000000046} 8 - 7 + 4 0 primary False diff --git a/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs b/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs index b0e38aa9..1788a627 100644 --- a/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs +++ b/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs @@ -1,5 +1,4 @@  -using Microsoft.SqlServer.Dts.Runtime; using Model; using System; using System.Collections; diff --git a/SGGL/BLL/Common/WordHelp.cs b/SGGL/BLL/Common/WordHelp.cs index 85c331d9..3a65d367 100644 --- a/SGGL/BLL/Common/WordHelp.cs +++ b/SGGL/BLL/Common/WordHelp.cs @@ -341,90 +341,90 @@ namespace BLL } #endregion - public static string GetPathByDocToHTML(string strFile) - { - if (string.IsNullOrEmpty(strFile)) - { - return "0";//没有文件 - } - Microsoft.Office.Interop.Word.Application word = new Microsoft.Office.Interop.Word.Application() - { - Visible = false, - AutomationSecurity = Microsoft.Office.Core.MsoAutomationSecurity.msoAutomationSecurityForceDisable - }; - //Microsoft.Office.Interop.Word.ApplicationClass word = new Microsoft.Office.Interop.Word.ApplicationClass(); - // word.DisplayAlerts = Microsoft.Office.Interop.Word.WdAlertLevel.wdAlertsNone; - Type wordType = word.GetType(); - Microsoft.Office.Interop.Word.Documents docs = word.Documents; + //public static string GetPathByDocToHTML(string strFile) + //{ + // if (string.IsNullOrEmpty(strFile)) + // { + // return "0";//没有文件 + // } + // Microsoft.Office.Interop.Word.Application word = new Microsoft.Office.Interop.Word.Application() + // { + // Visible = false, + // AutomationSecurity = Microsoft.Office.Core.MsoAutomationSecurity.msoAutomationSecurityForceDisable + // }; + // //Microsoft.Office.Interop.Word.ApplicationClass word = new Microsoft.Office.Interop.Word.ApplicationClass(); + // // word.DisplayAlerts = Microsoft.Office.Interop.Word.WdAlertLevel.wdAlertsNone; + // Type wordType = word.GetType(); + // Microsoft.Office.Interop.Word.Documents docs = word.Documents; - // 打开文件 - Type docsType = docs.GetType(); + // // 打开文件 + // Type docsType = docs.GetType(); - object fileName = strFile; + // object fileName = strFile; - Microsoft.Office.Interop.Word.Document doc = (Microsoft.Office.Interop.Word.Document)docsType.InvokeMember("Open", - System.Reflection.BindingFlags.InvokeMethod, null, docs, new Object[] { fileName, true, true }); + // Microsoft.Office.Interop.Word.Document doc = (Microsoft.Office.Interop.Word.Document)docsType.InvokeMember("Open", + // System.Reflection.BindingFlags.InvokeMethod, null, docs, new Object[] { fileName, true, true }); - // 转换格式，另存为html - Type docType = doc.GetType(); - //给文件重新起名 - string filename = System.DateTime.Now.Year.ToString() + System.DateTime.Now.Month.ToString() + System.DateTime.Now.Day.ToString() + - System.DateTime.Now.Hour.ToString() + System.DateTime.Now.Minute.ToString() + System.DateTime.Now.Second.ToString(); + // // 转换格式，另存为html + // Type docType = doc.GetType(); + // //给文件重新起名 + // string filename = System.DateTime.Now.Year.ToString() + System.DateTime.Now.Month.ToString() + System.DateTime.Now.Day.ToString() + + // System.DateTime.Now.Hour.ToString() + System.DateTime.Now.Minute.ToString() + System.DateTime.Now.Second.ToString(); - string strFileFolder = "/html/"; - DateTime dt = DateTime.Now; - //以yyyymmdd形式生成子文件夹名 - string strFileSubFolder = dt.Year.ToString(); - strFileSubFolder += (dt.Month < 10) ? ("0" + dt.Month.ToString()) : dt.Month.ToString(); - strFileSubFolder += (dt.Day < 10) ? ("0" + dt.Day.ToString()) : dt.Day.ToString(); - string strFilePath = strFileFolder + strFileSubFolder + "/"; - // 判断指定目录下是否存在文件夹，如果不存在，则创建 - if (!Directory.Exists(strFilePath)) - { - // 创建up文件夹 - Directory.CreateDirectory(strFilePath); - } + // string strFileFolder = "/html/"; + // DateTime dt = DateTime.Now; + // //以yyyymmdd形式生成子文件夹名 + // string strFileSubFolder = dt.Year.ToString(); + // strFileSubFolder += (dt.Month < 10) ? ("0" + dt.Month.ToString()) : dt.Month.ToString(); + // strFileSubFolder += (dt.Day < 10) ? ("0" + dt.Day.ToString()) : dt.Day.ToString(); + // string strFilePath = strFileFolder + strFileSubFolder + "/"; + // // 判断指定目录下是否存在文件夹，如果不存在，则创建 + // if (!Directory.Exists(strFilePath)) + // { + // // 创建up文件夹 + // Directory.CreateDirectory(strFilePath); + // } - //被转换的html文档保存的位置 - // HttpContext.Current.Server.MapPath("html" + strFileSubFolder + filename + ".html") - string ConfigPath = strFilePath + filename + ".html"; - object saveFileName = ConfigPath; + // //被转换的html文档保存的位置 + // // HttpContext.Current.Server.MapPath("html" + strFileSubFolder + filename + ".html") + // string ConfigPath = strFilePath + filename + ".html"; + // object saveFileName = ConfigPath; - /*下面是Microsoft Word 9 Object Library的写法，如果是10，可能写成： - * docType.InvokeMember("SaveAs", System.Reflection.BindingFlags.InvokeMethod, - * null, doc, new object[]{saveFileName, Word.WdSaveFormat.wdFormatFilteredHTML}); - * 其它格式： - * wdFormatHTML - * wdFormatDocument - * wdFormatDOSText - * wdFormatDOSTextLineBreaks - * wdFormatEncodedText - * wdFormatRTF - * wdFormatTemplate - * wdFormatText - * wdFormatTextLineBreaks - * wdFormatUnicodeText - */ - docType.InvokeMember("SaveAs", System.Reflection.BindingFlags.InvokeMethod, - null, doc, new object[] { saveFileName, Microsoft.Office.Interop.Word.WdSaveFormat.wdFormatFilteredHTML }); + // /*下面是Microsoft Word 9 Object Library的写法，如果是10，可能写成： + // * docType.InvokeMember("SaveAs", System.Reflection.BindingFlags.InvokeMethod, + // * null, doc, new object[]{saveFileName, Word.WdSaveFormat.wdFormatFilteredHTML}); + // * 其它格式： + // * wdFormatHTML + // * wdFormatDocument + // * wdFormatDOSText + // * wdFormatDOSTextLineBreaks + // * wdFormatEncodedText + // * wdFormatRTF + // * wdFormatTemplate + // * wdFormatText + // * wdFormatTextLineBreaks + // * wdFormatUnicodeText + // */ + // docType.InvokeMember("SaveAs", System.Reflection.BindingFlags.InvokeMethod, + // null, doc, new object[] { saveFileName, Microsoft.Office.Interop.Word.WdSaveFormat.wdFormatFilteredHTML }); - //docType.InvokeMember("SaveAs", System.Reflection.BindingFlags.InvokeMethod, - // null, doc, new object[] { saveFileName, Microsoft.Office.Interop.Word.WdSaveFormat.wdFormatFilteredHTML }); + // //docType.InvokeMember("SaveAs", System.Reflection.BindingFlags.InvokeMethod, + // // null, doc, new object[] { saveFileName, Microsoft.Office.Interop.Word.WdSaveFormat.wdFormatFilteredHTML }); - //关闭文档 - docType.InvokeMember("Close", System.Reflection.BindingFlags.InvokeMethod, - null, doc, new object[] { null, null, null }); + // //关闭文档 + // docType.InvokeMember("Close", System.Reflection.BindingFlags.InvokeMethod, + // null, doc, new object[] { null, null, null }); - // 退出 Word - wordType.InvokeMember("Quit", System.Reflection.BindingFlags.InvokeMethod, null, word, null); - //转到新生成的页面 - //return ("/" + filename + ".html"); + // // 退出 Word + // wordType.InvokeMember("Quit", System.Reflection.BindingFlags.InvokeMethod, null, word, null); + // //转到新生成的页面 + // //return ("/" + filename + ".html"); - //转化HTML页面统一编码格式 - TransHTMLEncoding(ConfigPath); + // //转化HTML页面统一编码格式 + // TransHTMLEncoding(ConfigPath); - return (strFilePath + filename + ".html"); - } + // return (strFilePath + filename + ".html"); + //} public static void TransHTMLEncoding(string strFilePath) { try diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs index 7fbfa110..52844020 100644 --- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs @@ -1,5 +1,4 @@ using FineUIPro; -using Microsoft.SqlServer.Dts.Runtime; using NPOI.SS.Formula.Functions; using System; using System.Collections; diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs index f75c7496..d76ea2fc 100644 --- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs @@ -1,5 +1,4 @@ using FineUIPro; -using Microsoft.SqlServer.Dts.Runtime; using Model; using System; using System.Collections; diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx.cs b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx.cs index 115aaf95..58031376 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx.cs @@ -1,19 +1,9 @@ using BLL; -using FastReport.Utils; -using FineUIPro.Web.DataShow; -using FineUIPro.Web.HJGL.WeldingManage; -using FineUIPro.Web.ProjectData; -using Microsoft.Office.Interop.Word; using Model; using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; -using static BLL.TwConst; -using static System.Windows.Forms.VisualStyles.VisualStyleElement; namespace FineUIPro.Web.CLGL { diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx.cs index d0cbf024..60ef1f35 100644 --- a/SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx.cs @@ -1,10 +1,6 @@ using BLL; -using Microsoft.Office.Interop.Word; -using Model; using System; -using System.Collections.Generic; using System.Data; -using System.Data.SqlClient; using System.Linq; namespace FineUIPro.Web.DataShow diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/材料信息导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/材料信息导入模板.xls index 93bcae86c5c1510cb95ef4058af4a284f1e572ea..ef934c5fb0a5b6ea65a374321e53df6752bf6076 100644 GIT binary patch delta 34 qcmZoT!`N_!aYGIZyTOCJQw##PHy5+)U}Q^6%~Z(A+-%5pJ{|zr136>JKHW#z(U}W=2&C4&#-)zWsJ{|z~FAc~5 diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 41f14550..7162b274 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1556,6 +1556,7 @@ + @@ -10569,6 +10570,13 @@ PackagingManageView.aspx + + InstallList.aspx + ASPXCodeBehind + + + InstallList.aspx + PrePipelineQRCodeIn.aspx ASPXCodeBehind @@ -16559,7 +16567,7 @@ - + diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx new file mode 100644 index 00000000..63e63a0e --- /dev/null +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx @@ -0,0 +1,213 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InstallList.aspx.cs" Inherits="FineUIPro.Web.HJGL.PreDesign.InstallList" %> + + + + + + 安装清单 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + --%> + + + + + + + + + + + + + + + + <%-- + + + + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs new file mode 100644 index 00000000..6cd6745c --- /dev/null +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs @@ -0,0 +1,710 @@ +using BLL; +using MiniExcelLibs; +using Model; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Drawing; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices; +using System.Web; + +namespace FineUIPro.Web.HJGL.PreDesign +{ + public partial class InstallList : PageBase + { + public int pageSize = 20; + public static DataTable GridDataTable = new DataTable(); + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + this.InitTreeMenu();//加载树 + HJGL_PipelineComponentService.InitMainItemDownList(drpState, true); + HJGL_PipelineComponentService.InitMainItemDownProductionStateList(drpProductionState, true); + + var pipeline = (from x in Funs.DB.HJGL_Pipeline + where x.ProjectId == this.CurrUser.LoginProjectId + select x.FlowingSection).Distinct().ToList(); + this.drpFlowingSection.DataTextField = "Value"; + this.drpFlowingSection.DataValueField = "Value"; + this.drpFlowingSection.DataSource = pipeline; + this.drpFlowingSection.DataBind(); + Funs.FineUIPleaseSelect(drpFlowingSection); + } + } + + #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 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 && x.PipeArea == "1" && x.PipelineCode.Contains(txtPipelineCode.Text.Trim()) select x.FlowingSection).Distinct().Count(); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); + TreeNode tn1 = new TreeNode(); + tn1.NodeID = q.UnitWorkId; + //tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; + tn1.Text = q.UnitWorkName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; + tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); + tn1.EnableClickEvent = true; + tn1.EnableExpandEvent = true; + rootNode1.Nodes.Add(tn1); + if (a > 0) + { + // BindNodes(tn1); + TreeNode newNode = new TreeNode(); + newNode.Text = "加载流水段..."; + newNode.NodeID = "加载流水段..."; + tn1.Nodes.Add(newNode); + } + //if (a > 0) + //{ + // BindNodes(tn1); + //} + } + } + 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 && x.PipeArea == "1" && x.PipelineCode.Contains(txtPipelineCode.Text.Trim()) select x).Count(); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); + TreeNode tn2 = new TreeNode(); + tn2.NodeID = q.UnitWorkId; + tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; + if (q.UnitWorkId == this.hdUnitWorkId.Text) + { + tn2.Expanded = true; + } + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; + tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); + tn2.EnableClickEvent = true; + tn2.EnableExpandEvent = true; + rootNode2.Nodes.Add(tn2); + if (a > 0) + { + // BindNodes(tn1); + TreeNode newNode = new TreeNode(); + newNode.Text = "加载流水段..."; + newNode.NodeID = "加载流水段..."; + tn2.Nodes.Add(newNode); + } + //if (a > 0) + //{ + // BindNodes(tn2); + //} + } + } + } + + private void BindNodes(TreeNode node) + { + List pipeline = new List(); + var pipelines = from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.PipeArea == "1" select x; + pipeline = (from x in pipelines + where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == node.NodeID && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) + orderby x.PipelineCode + select x).ToList(); + int pageindex = int.Parse(node.CommandName.Split('|')[0]); + int pageCount = int.Parse(node.CommandName.Split('|')[1]); + if (pageindex <= pageCount) + { + pipeline = pipeline.Skip(pageSize * (pageindex - 1)).Take(pageSize).ToList(); + foreach (var item in pipeline) + { + var comCount = (from x in Funs.DB.HJGL_Pipeline_Component where x.PipelineId == item.PipelineId select x).Count(); + TreeNode newNode = new TreeNode(); + newNode.Text = item.PipelineCode + "【" + comCount.ToString() + " " + "组件" + "】"; + newNode.ToolTip = "管线号【组件数】"; + newNode.CommandName = "管线"; + newNode.NodeID = item.PipelineId; + newNode.EnableClickEvent = true; + node.Nodes.Add(newNode); + } + if (pageindex < pageCount) + { + TreeNode newNode = new TreeNode(); + newNode.Text = "加载"; + newNode.NodeID = SQLHelper.GetNewID(); + newNode.CommandName = "加载"; + newNode.Icon = Icon.ArrowDown; + newNode.EnableClickEvent = true; + node.Nodes.Add(newNode); + } + } + + + } + #endregion + protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e) + { + if (e.Node.Nodes[0].NodeID == "加载流水段...") + { + e.Node.Nodes.Clear(); + BindNodes(e.Node); + } + + } + #region 点击TreeView + /// + /// 点击TreeView + /// + /// + /// + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + if (e.CommandName.Split('|').Length == 2) + { + this.hdUnitWorkId.Text = this.tvControlItem.SelectedNodeID; + + WeldingDailyService.InitDownListByUnitWortId(drpWeldingDailyCode, true, this.tvControlItem.SelectedNodeID); + + } + else if (e.CommandName == "管线") + { + Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID); + this.hdUnitWorkId.Text = string.Empty; + if (pipeline != null) + { + this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID; + } + } + else if (e.CommandName == "加载") + { + string CommandName = e.Node.ParentNode.CommandName; + e.Node.ParentNode.CommandName = (int.Parse(CommandName.Split('|')[0]) + 1) + "|" + int.Parse(CommandName.Split('|')[1]); + TreeNode treeNode = e.Node.ParentNode; + treeNode.Nodes.Remove(e.Node); + BindNodes(e.Node.ParentNode); + } + this.BindGrid(); + } + #endregion + + #region 数据绑定 + /// + /// 数据绑定 + /// + private void BindGrid() + + { + if (tvControlItem.SelectedNode == null) return; + string strSql = @" SELECT distinct com.PipelineComponentId,com.PipelineComponentCode,com.BoxNumber,com.Remark, + com.PipelineId, punit.UnitName AS PreUnit,aunit.UnitName AS AssembleUnit,com.IsPrint, + com.QRCode,com.State,com.ProductionState,pipe.PlanStartDate,pipe.FlowingSection,com.DrawingName,com.ReceiveDate, + person.PersonName + FROM HJGL_Pipeline_Component com + LEFT JOIN HJGL_Pipeline pipe ON pipe.PipelineId =com.PipelineId + LEFT JOIN dbo.Base_Unit punit ON punit.UnitId=com.PreUnit + LEFT JOIN dbo.Base_Unit aunit ON aunit.UnitId=com.AssembleUnit + LEFT JOIN Person_Persons person on com.ReceiveMan=person.PersonId + LEFT JOIN HJGL_WeldJoint joint on joint.PipelineId =com.PipelineId + WHERE 1=1 "; + List listStr = new List(); + + + if (tvControlItem.SelectedNode.CommandName.Split('|').Length == 2) + { + strSql += " and pipe.UnitWorkId =@UnitWorkId"; + listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID)); + + } + else if (tvControlItem.SelectedNode.CommandName == "管线") + { + strSql += " and com.PipelineId = @PipelineId "; + listStr.Add(new SqlParameter("@PipelineId", this.tvControlItem.SelectedNodeID)); + + } + + if (drpWeldingDailyCode.SelectedValue != Const._Null && !string.IsNullOrEmpty(drpWeldingDailyCode.SelectedValue)) + { + strSql += " and joint.WeldingDailyId = @WeldingDailyId "; + listStr.Add(new SqlParameter("@WeldingDailyId", drpWeldingDailyCode.SelectedValue)); + + } + if (!string.IsNullOrEmpty(txtPipelineComponentCode.Text)) + { + strSql += " AND com.PipelineComponentCode like @PipelineComponentCode"; + listStr.Add(new SqlParameter("@PipelineComponentCode", "%" + this.txtPipelineComponentCode.Text.Trim() + "%")); + + } + if (drpState.SelectedValue != Const._Null) + { + strSql += " AND com.State =@State"; + listStr.Add(new SqlParameter("@State", drpState.SelectedValue)); + + } + if (drpProductionState.SelectedValue != Const._Null) + { + strSql += " AND com.ProductionState =@ProductionState"; + listStr.Add(new SqlParameter("@ProductionState", drpProductionState.SelectedValue.ToString())); + + } + if (!string.IsNullOrEmpty(drpFlowingSection.SelectedValue) && drpFlowingSection.SelectedValue != Const._Null) + { + strSql += " AND pipe.FlowingSection =@FlowingSection"; + listStr.Add(new SqlParameter("@FlowingSection", drpFlowingSection.SelectedValue.ToString())); + } + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + GridDataTable = tb; + // 2.获取当前分页数据 + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + #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 管线组件信息 维护事件 + /// + /// Grid双击事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.HJGL_PrePipelineMenuId, BLL.Const.BtnModify)) + { + Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID); + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PrePipelineEdit.aspx?PipelineComponentId={0}", Grid1.SelectedRowID, "编辑 - "))); + } + else + { + ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + } + } + protected void btnPrint_Click(object sender, EventArgs e) + { + if (Print(Grid1.SelectedRowIDArray)) + { + + HJGL_PipelineComponentService.UpdateIsPrint(Grid1.SelectedRowIDArray); //打印后修改打印状态 + } + } + private bool Print(string[] PipelineComponentId) + { + BLL.FastReportService.ResetData(); + + var result = HJGL_PipelineComponentService.GetPrintModelByPipelineComponentIds(PipelineComponentId, null, false); + var tb = LINQToDataTable(result); + if (tb != null && tb.Rows.Count > 0) + { + tb.TableName = "Table1"; + } + else + { + ShowNotify("请查看组件是否上传二维码！", MessageBoxIcon.Question); + return false; + } + BLL.FastReportService.AddFastreportTable(tb); + 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))); + + } + + return true; + } + + /// + /// 增加焊口信息 + /// + /// + /// + protected void btnNew_Click(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_PrePipelineMenuId, Const.BtnAdd)) + { + Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID); + if (pipeline != null) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PrePipelineEdit.aspx?PipelineId={0}", this.tvControlItem.SelectedNodeID, "新增 - "))); + } + else + { + ShowNotify("请选择管线！", MessageBoxIcon.Warning); + } + + } + else + { + ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + } + } + + /// + /// 批量增加焊口信息 + /// + /// + /// + protected void btnBatchAdd_Click(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_PrePipelineMenuId, Const.BtnAdd)) + { + Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID); + if (pipeline != null) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PrePipelineBatchEdit.aspx?PipelineId={0}", this.tvControlItem.SelectedNodeID, "新增 - "))); + } + else + { + ShowNotify("请选择管线！", MessageBoxIcon.Warning); + } + } + else + { + ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + } + } + + /// + /// 删除按钮 + /// + /// + /// + protected void btnDelete_Click(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_PrePipelineMenuId, Const.BtnDelete)) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning); + return; + } + + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + BLL.HJGL_PipelineComponentService.DeletePipelineComponent(rowID); + ShowNotify("删除成功！", MessageBoxIcon.Success); + + } + //this.InitTreeMenu();//加载树 + this.BindGrid(); + } + else + { + Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + } + } + + protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) + { + if (e.CommandName == "PreviewQRCode") + { + var ID = e.RowID; + var q = HJGL_PipelineComponentService.GetPipelineComponentById(ID); + string path = ""; + if (!string.IsNullOrEmpty(q.QRCode)) + { + path = BLL.CreateQRCodeService.CreateCode_Simple(q.QRCode, ID); + if (!string.IsNullOrEmpty(path)) + { + string filepath = Funs.SGGLUrl + path.Replace("\\", "//"); + + ClientScript.RegisterStartupScript(ClientScript.GetType(), "myscript", ""); + + } + } + } + + } + protected void btnSearch_Click(object sender, EventArgs e) + { + BindGrid(); + } + + #endregion + + #region 关闭弹出窗口及刷新页面 + /// + /// 关闭弹出窗口 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + //this.InitTreeMenu();//加载树 + this.BindGrid(); + } + + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + protected void btnTreeFind_Click1(object sender, EventArgs e) + { + this.InitTreeMenu(); + + } + #endregion + + /// + /// 搜索 + /// + /// + /// + public string ConvertImageUrlByImage(object str, object id) + { + string path = string.Empty; + if (!string.IsNullOrEmpty(str.ToString())) + { + path = BLL.CreateQRCodeService.CreateCode_Simple(str.ToString(), id.ToString()); + path = HttpUtility.HtmlDecode(BLL.UploadAttachmentService.ShowImage("../../", path)); + + } + return path; + } + public string ConvertState(object state) + { + string StateName = string.Empty; + if (state != null) + { + if (!string.IsNullOrEmpty(state.ToString())) + { + string txt = HJGL_PipelineComponentService.GetState().FirstOrDefault(x => x.Value == state.ToString()).Text; + return txt; + + } + } + return StateName; + } + public string ConvertProductionState(object state) + { + string StateName = string.Empty; + if (state != null) + { + if (!string.IsNullOrEmpty(state.ToString())) + { + + + string txt = HJGL_PipelineComponentService.GetProductionState().FirstOrDefault(x => x.Value == state.ToString()).Text; + + return txt; + } + } + + return StateName; + } + protected void btnImportQRCode_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("PrePipelineQRCodeIn.aspx?", "导入 - "))); + + } + protected void btnSinglePreview_Click(object sender, EventArgs e) + { + //string httpUrl = @"FileUpload\HJGL_DataImport\095e9691-99c2-4f70-8e67-e70c8fa6be9c\2022-06\管道焊接工作记录.pdf"; + //var newurl = Funs.SGGLUrl + httpUrl.Replace(Funs.RootPath, ""); + var id = Grid1.SelectedRowID; + if (string.IsNullOrEmpty(id)) + { + ShowNotify("请选择相对应的管道预制加工图", MessageBoxIcon.Warning); + return; + } + var SingleName = (from x in Funs.DB.HJGL_Pipeline_Component where x.PipelineComponentId == id select (x.DrawingName)).FirstOrDefault(); + var filemodel = BLL.HJGL_DataImportService.GetLatestFileByFileName(SingleName, "3", this.CurrUser.LoginProjectId); + if (filemodel != null) + { + string httpUrl = filemodel.FilePath; + PageContext.RegisterStartupScript(Window4.GetShowReference(String.Format("~/AttachFile/Look.aspx?fileUrl={0}", httpUrl, "查看 -"))); + + } + else + { + ShowNotify("请上传相关管道预制加工图", MessageBoxIcon.Warning); + return; + } + + + } + + protected void btnAccept_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIDArray.Length > 0) + { + + foreach (var item in Grid1.SelectedRowIDArray) + { + var model = HJGL_PipelineComponentService.GetPipelineComponentById(item); + if (model.ProductionState == 2) + { + BLL.APIPipelineComponentService.GetComponentConfirmArrival(PipelineComponentId: item, this.CurrUser.PersonId, ""); ; + + } + } + ShowNotify("操作成功", MessageBoxIcon.Success); + BindGrid(); + } + else + { + ShowNotify("请选择需要验收的数据", MessageBoxIcon.Warning); + + } + } + protected void btnRectification_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIDArray.Length > 0) + { + + foreach (var item in Grid1.SelectedRowIDArray) + { + var model = HJGL_PipelineComponentService.GetPipelineComponentById(item); + if (model.State == HJGL_PipelineComponentService.StatePenRec) + { + model.State = HJGL_PipelineComponentService.StateRec; + HJGL_PipelineComponentService.UpdatePipelineComponent(model); + + } + } + ShowNotify("操作成功", MessageBoxIcon.Success); + BindGrid(); + } + else + { + ShowNotify("请选择需要整改的数据", MessageBoxIcon.Warning); + + } + } + + protected void btnOut_Click(object sender, EventArgs e) + { + if (GridDataTable != null) + { + var q = (from x in GridDataTable.AsEnumerable() + select new + { + 组件编号 = x.Field("PipelineComponentCode"), + 物流箱号 = x.Field("BoxNumber"), + 组件状态 = ConvertState(x.Field("State")), + 生产状态 = ConvertProductionState(x.Field("ProductionState")), + 管线计划安装日期 = x.Field("PlanStartDate"), + 预制图纸名称 = x.Field("DrawingName"), + 验收人 = x.Field("PersonName"), + 验收时间 = x.Field("ReceiveDate"), + }); + string path = Funs.RootPath + @"File\Excel\Temp\PrePipeline.xlsx"; + path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx"); + + MiniExcel.SaveAs(path, q); + + string fileName = "组件信息.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); + } + + + } + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.designer.cs new file mode 100644 index 00000000..c4bfb7fb --- /dev/null +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.designer.cs @@ -0,0 +1,368 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HJGL.PreDesign +{ + + + public partial class InstallList + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelLeftRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelLeftRegion; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// txtPipelineCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPipelineCode; + + /// + /// hdUnitWorkId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdUnitWorkId; + + /// + /// btnTreeFind 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnTreeFind; + + /// + /// tvControlItem 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tree tvControlItem; + + /// + /// panelCenterRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelCenterRegion; + + /// + /// Toolbar3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar3; + + /// + /// txtPipelineComponentCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPipelineComponentCode; + + /// + /// drpState 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpState; + + /// + /// drpProductionState 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpProductionState; + + /// + /// drpWeldingDailyCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpWeldingDailyCode; + + /// + /// drpFlowingSection 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpFlowingSection; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// btnSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSearch; + + /// + /// btnDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnDelete; + + /// + /// Toolbar4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar4; + + /// + /// ToolbarFill2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill2; + + /// + /// btnRectification 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnRectification; + + /// + /// btnAccept 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAccept; + + /// + /// btnImportQRCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnImportQRCode; + + /// + /// btnBatchAdd 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnBatchAdd; + + /// + /// btnSinglePreview 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSinglePreview; + + /// + /// btnPrint 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnPrint; + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// lbstate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lbstate; + + /// + /// lbProductionState 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lbProductionState; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Window2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window2; + + /// + /// Window3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window3; + + /// + /// Window4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window4; + } +} diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs index 26560ab4..329aeb87 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs @@ -1,14 +1,9 @@ using BLL; -using FineUIPro.Web.HJGL.WeldingManage; -using Microsoft.Office.Interop.Word; using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.Data; -using System.Data.SqlClient; using System.Linq; -using System.Web.UI.DataVisualization.Charting; -using System.Threading.Tasks; namespace FineUIPro.Web.WeldingProcess.WeldingManage { public partial class WeldReportEdit : PageBase diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs index b9de329e..c305a3f4 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs @@ -1,5 +1,4 @@ using BLL; -using Microsoft.Office.Interop.Word; using System; using System.Collections.Generic; using System.Data; diff --git a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml index 1e8a07a0..9eccc8db 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml @@ -16,6 +16,7 @@ + From da7cda89488078533ddecb5bc032880eaf98d343 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Mon, 12 May 2025 18:23:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=84=8A=E6=8E=A5=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E5=B7=A5=E5=8E=82=E9=A2=84=E5=88=B6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=9A=E5=AE=89=E8=A3=85=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BLL/HJGL/WeldingManage/PipelineService.cs | 10 + .../HJGL/PreDesign/InstallList.aspx | 138 +---- .../HJGL/PreDesign/InstallList.aspx.cs | 545 ++++-------------- .../PreDesign/InstallList.aspx.designer.cs | 193 +------ 4 files changed, 175 insertions(+), 711 deletions(-) diff --git a/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs b/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs index 8c509ae5..cf722bdc 100644 --- a/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs @@ -80,6 +80,16 @@ namespace BLL { return Funs.DB.HJGL_Pipeline.FirstOrDefault(e => e.PipelineId == pipelineId); } + + /// + /// 根据流水段获取管线信息 + /// + /// + /// + public static Model.HJGL_Pipeline GetPipelineByFlowingSection(string flowingSection) + { + return Funs.DB.HJGL_Pipeline.FirstOrDefault(e => e.FlowingSection == flowingSection); + } /// /// 根据管线id获取管线状态 /// diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx index 63e63a0e..607a9290 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx @@ -48,124 +48,62 @@ + + - - - - - - - - - + - - - - - - - - - - - - - - - - - - - + Icon="TableGo" EnableAjax="false" EnablePostBack="true"> + EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipelineCode" AllowCellEditing="true" + AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineCode" + AllowSorting="true" SortField="PipelineCode" SortDirection="ASC" OnSort="Grid1_Sort" + AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"> - - - <%-- - --%> - + + + + - - - - - - - - - - - - - <%-- - - - - --%> - - - + - + - - - - @@ -186,22 +124,6 @@ - - - - "); - - } - } - } - - } protected void btnSearch_Click(object sender, EventArgs e) { BindGrid(); @@ -514,17 +344,7 @@ namespace FineUIPro.Web.HJGL.PreDesign #endregion - #region 关闭弹出窗口及刷新页面 - /// - /// 关闭弹出窗口 - /// - /// - /// - protected void Window1_Close(object sender, WindowCloseEventArgs e) - { - //this.InitTreeMenu();//加载树 - this.BindGrid(); - } + #region 刷新页面 /// /// 查询 @@ -538,40 +358,9 @@ namespace FineUIPro.Web.HJGL.PreDesign protected void btnTreeFind_Click1(object sender, EventArgs e) { this.InitTreeMenu(); - } #endregion - /// - /// 搜索 - /// - /// - /// - public string ConvertImageUrlByImage(object str, object id) - { - string path = string.Empty; - if (!string.IsNullOrEmpty(str.ToString())) - { - path = BLL.CreateQRCodeService.CreateCode_Simple(str.ToString(), id.ToString()); - path = HttpUtility.HtmlDecode(BLL.UploadAttachmentService.ShowImage("../../", path)); - - } - return path; - } - public string ConvertState(object state) - { - string StateName = string.Empty; - if (state != null) - { - if (!string.IsNullOrEmpty(state.ToString())) - { - string txt = HJGL_PipelineComponentService.GetState().FirstOrDefault(x => x.Value == state.ToString()).Text; - return txt; - - } - } - return StateName; - } public string ConvertProductionState(object state) { string StateName = string.Empty; @@ -579,95 +368,13 @@ namespace FineUIPro.Web.HJGL.PreDesign { if (!string.IsNullOrEmpty(state.ToString())) { - - string txt = HJGL_PipelineComponentService.GetProductionState().FirstOrDefault(x => x.Value == state.ToString()).Text; - return txt; } } - return StateName; } - protected void btnImportQRCode_Click(object sender, EventArgs e) - { - PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("PrePipelineQRCodeIn.aspx?", "导入 - "))); - } - protected void btnSinglePreview_Click(object sender, EventArgs e) - { - //string httpUrl = @"FileUpload\HJGL_DataImport\095e9691-99c2-4f70-8e67-e70c8fa6be9c\2022-06\管道焊接工作记录.pdf"; - //var newurl = Funs.SGGLUrl + httpUrl.Replace(Funs.RootPath, ""); - var id = Grid1.SelectedRowID; - if (string.IsNullOrEmpty(id)) - { - ShowNotify("请选择相对应的管道预制加工图", MessageBoxIcon.Warning); - return; - } - var SingleName = (from x in Funs.DB.HJGL_Pipeline_Component where x.PipelineComponentId == id select (x.DrawingName)).FirstOrDefault(); - var filemodel = BLL.HJGL_DataImportService.GetLatestFileByFileName(SingleName, "3", this.CurrUser.LoginProjectId); - if (filemodel != null) - { - string httpUrl = filemodel.FilePath; - PageContext.RegisterStartupScript(Window4.GetShowReference(String.Format("~/AttachFile/Look.aspx?fileUrl={0}", httpUrl, "查看 -"))); - - } - else - { - ShowNotify("请上传相关管道预制加工图", MessageBoxIcon.Warning); - return; - } - - - } - - protected void btnAccept_Click(object sender, EventArgs e) - { - if (Grid1.SelectedRowIDArray.Length > 0) - { - - foreach (var item in Grid1.SelectedRowIDArray) - { - var model = HJGL_PipelineComponentService.GetPipelineComponentById(item); - if (model.ProductionState == 2) - { - BLL.APIPipelineComponentService.GetComponentConfirmArrival(PipelineComponentId: item, this.CurrUser.PersonId, ""); ; - - } - } - ShowNotify("操作成功", MessageBoxIcon.Success); - BindGrid(); - } - else - { - ShowNotify("请选择需要验收的数据", MessageBoxIcon.Warning); - - } - } - protected void btnRectification_Click(object sender, EventArgs e) - { - if (Grid1.SelectedRowIDArray.Length > 0) - { - - foreach (var item in Grid1.SelectedRowIDArray) - { - var model = HJGL_PipelineComponentService.GetPipelineComponentById(item); - if (model.State == HJGL_PipelineComponentService.StatePenRec) - { - model.State = HJGL_PipelineComponentService.StateRec; - HJGL_PipelineComponentService.UpdatePipelineComponent(model); - - } - } - ShowNotify("操作成功", MessageBoxIcon.Success); - BindGrid(); - } - else - { - ShowNotify("请选择需要整改的数据", MessageBoxIcon.Warning); - - } - } protected void btnOut_Click(object sender, EventArgs e) { @@ -676,21 +383,20 @@ namespace FineUIPro.Web.HJGL.PreDesign var q = (from x in GridDataTable.AsEnumerable() select new { + 管线号 = x.Field("PipelineCode"), 组件编号 = x.Field("PipelineComponentCode"), - 物流箱号 = x.Field("BoxNumber"), - 组件状态 = ConvertState(x.Field("State")), - 生产状态 = ConvertProductionState(x.Field("ProductionState")), - 管线计划安装日期 = x.Field("PlanStartDate"), - 预制图纸名称 = x.Field("DrawingName"), - 验收人 = x.Field("PersonName"), - 验收时间 = x.Field("ReceiveDate"), + 预制散件材料描述 = !string.IsNullOrWhiteSpace(x.Field("matdef")) ? x.Field("matdef") : "-", + 数量 = x.Field("Number"), + 所在包装编号 = x.Field("PackagingCode"), + 车次 = x.Field("TrainNumber"), + 流水段 = x.Field("FlowingSection") }); - string path = Funs.RootPath + @"File\Excel\Temp\PrePipeline.xlsx"; - path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx"); + string path = Funs.RootPath + @"File\Excel\Temp\PrePipelineInstallList.xlsx"; + path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HHmm}", DateTime.Now) + ".xlsx"); MiniExcel.SaveAs(path, q); - string fileName = "组件信息.xlsx"; + string fileName = $"安装清单（{(string.Format("{0:yyyy-MM-dd-HHmm}", DateTime.Now))}）.xlsx"; FileInfo info = new FileInfo(path); long fileSize = info.Length; System.Web.HttpContext.Current.Response.Clear(); @@ -702,9 +408,6 @@ namespace FineUIPro.Web.HJGL.PreDesign System.Web.HttpContext.Current.Response.Close(); File.Delete(path); } - - } - } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.designer.cs index c4bfb7fb..e7f9d40b 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.designer.cs @@ -113,6 +113,15 @@ namespace FineUIPro.Web.HJGL.PreDesign /// protected global::FineUIPro.Toolbar Toolbar3; + /// + /// txtPipelineCode2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPipelineCode2; + /// /// txtPipelineComponentCode 控件。 /// @@ -122,87 +131,6 @@ namespace FineUIPro.Web.HJGL.PreDesign /// protected global::FineUIPro.TextBox txtPipelineComponentCode; - /// - /// drpState 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpState; - - /// - /// drpProductionState 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpProductionState; - - /// - /// drpWeldingDailyCode 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpWeldingDailyCode; - - /// - /// drpFlowingSection 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpFlowingSection; - - /// - /// ToolbarFill1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.ToolbarFill ToolbarFill1; - - /// - /// btnNew 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnNew; - - /// - /// btnSearch 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnSearch; - - /// - /// btnDelete 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnDelete; - - /// - /// Toolbar4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Toolbar Toolbar4; - /// /// ToolbarFill2 控件。 /// @@ -213,58 +141,13 @@ namespace FineUIPro.Web.HJGL.PreDesign protected global::FineUIPro.ToolbarFill ToolbarFill2; /// - /// btnRectification 控件。 + /// btnSearch 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Button btnRectification; - - /// - /// btnAccept 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAccept; - - /// - /// btnImportQRCode 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnImportQRCode; - - /// - /// btnBatchAdd 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnBatchAdd; - - /// - /// btnSinglePreview 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnSinglePreview; - - /// - /// btnPrint 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnPrint; + protected global::FineUIPro.Button btnSearch; /// /// btnOut 控件。 @@ -284,24 +167,6 @@ namespace FineUIPro.Web.HJGL.PreDesign /// protected global::FineUIPro.Grid Grid1; - /// - /// lbstate 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label lbstate; - - /// - /// lbProductionState 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label lbProductionState; - /// /// ToolbarSeparator1 控件。 /// @@ -328,41 +193,5 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - - /// - /// Window1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Window Window1; - - /// - /// Window2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Window Window2; - - /// - /// Window3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Window Window3; - - /// - /// Window4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Window Window4; } } From 1f770d4609f127abedcd81da940c8fb7429bc68a Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Mon, 12 May 2025 18:24:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=84=8A=E6=8E=A5=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=9A=E5=B7=A5=E5=8E=82=E9=A2=84=E5=88=B6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E5=AE=89=E8=A3=85=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs index 455d0b9f..60908f79 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs @@ -375,7 +375,11 @@ SELECT * FROM cte WHERE 1=1 "; return StateName; } - + /// + /// 导出 + /// + /// + /// protected void btnOut_Click(object sender, EventArgs e) { if (GridDataTable != null)