From 26d1774fb1c23653f160133b78924f2cc12b2a4d Mon Sep 17 00:00:00 2001 From: shecs <408299694@qq.com> Date: Mon, 1 Jul 2024 09:29:35 +0800 Subject: [PATCH] 11 --- HJGL/BLL/Common/Const.cs | 11 + .../BaseInfo/MaterialCoodeService.cs | 10 +- .../DataIn/DataInTempService.cs | 3 + HJGL/FineUIPro.Web/File/Excel/CoodeIn.xlsx | Bin 0 -> 8760 bytes .../FineUIPro.Web/File/Excel/DailyReport.xlsx | Bin 10487 -> 10452 bytes HJGL/FineUIPro.Web/FineUIPro.Web.csproj | 8 + .../PublicInfo/BaseInfo/MaterialEdit.aspx | 2 +- .../WelderManage/QualifiedProject.aspx.cs | 2 + .../WelderManage/WelderManage.aspx.cs | 43 ++- .../WeldingProcess/DataIn/DataIn.aspx.cs | 29 +- .../WeldingProcess/DataIn/DataInEdit.aspx | 5 +- .../DataIn/DataInEdit.aspx.designer.cs | 122 +++--- .../TrustManage/PointForAudit.aspx | 138 +++++++ .../TrustManage/PointForAudit.aspx.cs | 352 ++++++++++++++++++ .../PointForAudit.aspx.designer.cs | 188 ++++++++++ .../TrustManage/PointManage.aspx | 2 +- .../TrustManage/PointManage.aspx.cs | 39 +- .../TrustManage/TrustBatchSelect.aspx.cs | 2 +- .../WeldingManage/JointInfoEdit.aspx | 14 +- .../WeldingManage/JointInfoEdit.aspx.cs | 34 +- .../JointInfoEdit.aspx.designer.cs | 22 +- .../WeldingManage/MaterialCoode.aspx | 15 +- .../WeldingManage/MaterialCoode.aspx.cs | 197 +++++++++- .../MaterialCoode.aspx.designer.cs | 36 ++ .../WeldingManage/MaterialCoodeEdit.aspx | 5 + .../WeldingManage/MaterialCoodeEdit.aspx.cs | 10 + .../MaterialCoodeEdit.aspx.designer.cs | 9 + .../WeldingManage/WeldReport.aspx.cs | 280 +++++++------- .../WeldingManage/WeldReportEdit.aspx | 1 + .../WeldingManage/WeldReportEdit.aspx.cs | 177 +++++---- .../WeldingReport/JointComprehensive.aspx | 4 +- .../WeldingReport/JointComprehensive.aspx.cs | 2 +- .../WeldingReport/WeldDailyExport.aspx | 4 +- .../WeldingReport/WeldDailyExport.aspx.cs | 4 +- HJGL/Model/Model.cs | 150 ++++---- 35 files changed, 1432 insertions(+), 488 deletions(-) create mode 100644 HJGL/FineUIPro.Web/File/Excel/CoodeIn.xlsx create mode 100644 HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx create mode 100644 HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.cs create mode 100644 HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.designer.cs diff --git a/HJGL/BLL/Common/Const.cs b/HJGL/BLL/Common/Const.cs index d49490c..503cd94 100644 --- a/HJGL/BLL/Common/Const.cs +++ b/HJGL/BLL/Common/Const.cs @@ -243,6 +243,11 @@ namespace BLL /// public const string WelderQueTemplateUrl = "File\\Excel\\WelderQue.xlsx"; + /// + /// Coode导入模板 + /// + public const string CoodeInTemplateUrl = "File\\Excel\\CoodeIn.xlsx"; + /// /// 委托单导入模板 /// @@ -564,6 +569,12 @@ namespace BLL /// public const string HJGL_PointManageMenuId = "3ACE25CE-C5CE-4CEC-AD27-0D5CF1DF2F01"; + /// + /// 点口待审核 + /// + public const string HJGL_PointForAuditMenuId = "7C4BD351-630C-4E2A-B9AD-F91C042ED7A0"; + + /// /// 无损委托单 /// diff --git a/HJGL/BLL/PublicInfo/BaseInfo/MaterialCoodeService.cs b/HJGL/BLL/PublicInfo/BaseInfo/MaterialCoodeService.cs index 0580930..ab6060d 100644 --- a/HJGL/BLL/PublicInfo/BaseInfo/MaterialCoodeService.cs +++ b/HJGL/BLL/PublicInfo/BaseInfo/MaterialCoodeService.cs @@ -29,8 +29,9 @@ namespace BLL ProjectId = coode.ProjectId, Coode = coode.Coode, HeartNo = coode.HeartNo, - Amount = coode.Amount - }; + Amount = coode.Amount, + IsUse = coode.IsUse + }; db.Base_MaterialCoode.InsertOnSubmit(newCoode); db.SubmitChanges(); } @@ -49,6 +50,7 @@ namespace BLL NewCoode.Coode = coode.Coode; NewCoode.HeartNo = coode.HeartNo; NewCoode.Amount = coode.Amount; + NewCoode.IsUse=coode.IsUse; db.SubmitChanges(); } } @@ -99,7 +101,7 @@ namespace BLL dropName.DataValueField = "MaterialCoode"; dropName.DataTextField = "MaterialCoode"; var sql = from x in Funs.DB.Base_MaterialCoode - where x.ProjectId == projectId + where x.ProjectId == projectId & x.IsUse == true orderby x.Coode, x.HeartNo select new { x.MaterialCoodeId, MaterialCoode = x.Coode + ":" + x.HeartNo}; dropName.DataSource = sql.ToList(); @@ -116,7 +118,7 @@ namespace BLL dropName.DataValueField = "Coode"; dropName.DataTextField = "Coode"; var sql = (from x in Funs.DB.Base_MaterialCoode - where x.ProjectId == projectId select x.Coode).Distinct(); + where x.ProjectId == projectId && x.IsUse==true select x.Coode).Distinct(); dropName.DataSource = sql; dropName.DataBind(); diff --git a/HJGL/BLL/WeldingProcess/DataIn/DataInTempService.cs b/HJGL/BLL/WeldingProcess/DataIn/DataInTempService.cs index e0c670f..2064dd9 100644 --- a/HJGL/BLL/WeldingProcess/DataIn/DataInTempService.cs +++ b/HJGL/BLL/WeldingProcess/DataIn/DataInTempService.cs @@ -69,6 +69,7 @@ namespace BLL newDataInTemp.Value37 = dataInTemp.Value37; newDataInTemp.Value38 = dataInTemp.Value38; newDataInTemp.Value39 = dataInTemp.Value39; + newDataInTemp.Value40 = dataInTemp.Value40; newDataInTemp.ToopValue = dataInTemp.ToopValue; db.Sys_DataInTemp.InsertOnSubmit(newDataInTemp); db.SubmitChanges(); @@ -124,6 +125,8 @@ namespace BLL newDataInTemp.Value36 = dataInTemp.Value36; newDataInTemp.Value37 = dataInTemp.Value37; newDataInTemp.Value38 = dataInTemp.Value38; + newDataInTemp.Value39 = dataInTemp.Value39; + newDataInTemp.Value40 = dataInTemp.Value40; newDataInTemp.ToopValue = dataInTemp.ToopValue; try { diff --git a/HJGL/FineUIPro.Web/File/Excel/CoodeIn.xlsx b/HJGL/FineUIPro.Web/File/Excel/CoodeIn.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..3c5fc0053a2d845dc983f1d1fbc4e8038c92b280 GIT binary patch literal 8760 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 J(Ej%A{{Ti187Tk& literal 0 HcmV?d00001 diff --git a/HJGL/FineUIPro.Web/File/Excel/DailyReport.xlsx b/HJGL/FineUIPro.Web/File/Excel/DailyReport.xlsx index 8fd2c9943235448f8accd426fd3be9b65da96bb0..b76cd7966cd9f3e1cd69251aba62328dbdaee3a5 100644 GIT binary patch delta 3112 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 diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj index 7b31679..ea19706 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -231,6 +231,7 @@ + @@ -3418,6 +3419,13 @@ LogList.aspx + + PointForAudit.aspx + ASPXCodeBehind + + + PointForAudit.aspx + MaterialCoode.aspx ASPXCodeBehind diff --git a/HJGL/FineUIPro.Web/PublicInfo/BaseInfo/MaterialEdit.aspx b/HJGL/FineUIPro.Web/PublicInfo/BaseInfo/MaterialEdit.aspx index 0b3c521..9a97264 100644 --- a/HJGL/FineUIPro.Web/PublicInfo/BaseInfo/MaterialEdit.aspx +++ b/HJGL/FineUIPro.Web/PublicInfo/BaseInfo/MaterialEdit.aspx @@ -22,7 +22,7 @@ - diff --git a/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs b/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs index 3f3cedd..7a77c0c 100644 --- a/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs +++ b/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs @@ -527,6 +527,7 @@ namespace FineUIPro.Web.WelderManage updateQue.SizesMin = sizesMin; updateQue.MaterialTypeName = materialTypeName; updateQue.WeldType = weldType; + updateQue.IsPass = q.IsPass; BLL.WelderQualifiedService.UpdateWelderQualifiedProject(updateQue); } @@ -710,6 +711,7 @@ namespace FineUIPro.Web.WelderManage } + welderQue.IsPass = true; #endregion welderQueList.Add(welderQue); diff --git a/HJGL/FineUIPro.Web/WelderManage/WelderManage.aspx.cs b/HJGL/FineUIPro.Web/WelderManage/WelderManage.aspx.cs index 579b858..c96d124 100644 --- a/HJGL/FineUIPro.Web/WelderManage/WelderManage.aspx.cs +++ b/HJGL/FineUIPro.Web/WelderManage/WelderManage.aspx.cs @@ -379,7 +379,7 @@ namespace FineUIPro.Web.WelderManage string strSql = @"SELECT Welder.WelderId, Welder.WelderCode, Welder.WelderName, Welder.UnitId, Welder.Birthday,(CASE WHEN Welder.Sex=1 THEN '男' ELSE '女' END) AS Sex, - Welder.IdentityCard,Welder.IdentityCard, Welder.CertificateNum, Welder.CertificateValidity, + Welder.IdentityCard, Welder.CertificateNum, Welder.CertificateValidity, Welder.WelderLevel, Welder.Remark,Unit.UnitName,Welder.IsOnDuty FROM Welder_Welder AS Welder LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Welder.UnitId WHERE 1=1 "; @@ -416,7 +416,7 @@ namespace FineUIPro.Web.WelderManage //行0 CellRangeAddress region = new CellRangeAddress(rowIndex, rowIndex, 0, 11); ws.AddMergedRegion(region); - ws.GetRow(rowIndex).GetCell(0).SetCellValue("巴斯夫（广东）一体化项目专用化学品二区\r\n焊工信息登记表"); + ws.GetRow(rowIndex).GetCell(0).SetCellValue("巴斯夫（广东）一体化丁辛醇（OXO）\r\n焊工信息登记表"); ws.GetRow(rowIndex).GetCell(0).CellStyle = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, HorizontalAlignment.Center, 16); //行1 @@ -429,7 +429,7 @@ namespace FineUIPro.Web.WelderManage ws.GetRow(rowIndex + 2).GetCell(0).SetCellValue("序号"); ws.GetRow(rowIndex + 2).GetCell(1).SetCellValue("焊工姓名"); ws.GetRow(rowIndex + 2).GetCell(2).SetCellValue("考试中心焊工号"); - ws.GetRow(rowIndex + 2).GetCell(3).SetCellValue("CC7焊工号"); + ws.GetRow(rowIndex + 2).GetCell(3).SetCellValue("CC11焊工号"); ws.GetRow(rowIndex + 2).GetCell(4).SetCellValue("身份证号"); ws.GetRow(rowIndex + 2).GetCell(5).SetCellValue("焊工证号"); ws.GetRow(rowIndex + 2).GetCell(6).SetCellValue("合格项目"); @@ -456,23 +456,26 @@ namespace FineUIPro.Web.WelderManage { num = itemWelders.Count - 1; ws = ExcelCreateRow(ws, hssfworkbook, rowIndex, rowIndex + num, style, 0, 11); - //合并单元格 - region = new CellRangeAddress(rowIndex, rowIndex + num, 0, 0); - ws.AddMergedRegion(region); - region = new CellRangeAddress(rowIndex, rowIndex + num, 1, 1); - ws.AddMergedRegion(region); - region = new CellRangeAddress(rowIndex, rowIndex + num, 2, 2); - ws.AddMergedRegion(region); - region = new CellRangeAddress(rowIndex, rowIndex + num, 3, 3); - ws.AddMergedRegion(region); - region = new CellRangeAddress(rowIndex, rowIndex + num, 4, 4); - ws.AddMergedRegion(region); - region = new CellRangeAddress(rowIndex, rowIndex + num, 5, 5); - ws.AddMergedRegion(region); - region = new CellRangeAddress(rowIndex, rowIndex + num, 10, 10); - ws.AddMergedRegion(region); - region = new CellRangeAddress(rowIndex, rowIndex + num, 11, 11); - ws.AddMergedRegion(region); + if (num > 0) + { + //合并单元格 + region = new CellRangeAddress(rowIndex, rowIndex + num, 0, 0); + ws.AddMergedRegion(region); + region = new CellRangeAddress(rowIndex, rowIndex + num, 1, 1); + ws.AddMergedRegion(region); + region = new CellRangeAddress(rowIndex, rowIndex + num, 2, 2); + ws.AddMergedRegion(region); + region = new CellRangeAddress(rowIndex, rowIndex + num, 3, 3); + ws.AddMergedRegion(region); + region = new CellRangeAddress(rowIndex, rowIndex + num, 4, 4); + ws.AddMergedRegion(region); + region = new CellRangeAddress(rowIndex, rowIndex + num, 5, 5); + ws.AddMergedRegion(region); + region = new CellRangeAddress(rowIndex, rowIndex + num, 10, 10); + ws.AddMergedRegion(region); + region = new CellRangeAddress(rowIndex, rowIndex + num, 11, 11); + ws.AddMergedRegion(region); + } int j = 0; foreach (var item in itemWelders) { diff --git a/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataIn.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataIn.aspx.cs index 6120518..9b12e2b 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataIn.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataIn.aspx.cs @@ -65,7 +65,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn string strSql = @"SELECT TempId,ProjectId,UserId,Time,RowNo,ToopValue,Value1,Value2,Value3,Value4,Value5,Value6,Value7, Value8,Value9,Value10,Value11,Value12,Value13,Value14,Value15,Value16,Value17,Value18,Value19, Value20,Value21,Value22,Value23,Value24,Value25,Value26,Value27,Value28,Value29,Value30,Value31, - Value32,Value33,Value34,Value35,Value36,Value37,Value38 + Value32,Value33,Value34,Value35,Value36,Value37,Value38,Value39,Value40 FROM Sys_DataInTemp WHERE UserId=@UserId"; List listStr = new List(); @@ -1194,31 +1194,8 @@ namespace FineUIPro.Web.WeldingProcess.DataIn } } - if (!string.IsNullOrEmpty(tempData.Value39)) - { - var cood = coodeList.FirstOrDefault(x => x.Coode == tempData.Value39); - if (cood == null) - { - errInfo += "Coode1:[" + tempData.Value39 + "]不存在；"; - } - else - { - weldJoint.Coode1 = cood.Coode; - } - } - - if (!string.IsNullOrEmpty(tempData.Value40)) - { - var cood = coodeList.FirstOrDefault(x => x.Coode == tempData.Value40); - if (cood == null) - { - errInfo += "Coode2:[" + tempData.Value40 + "]不存在；"; - } - else - { - weldJoint.Coode2 = cood.Coode; - } - } + weldJoint.Coode1 = tempData.Value39; + weldJoint.Coode2 = tempData.Value40; if (!string.IsNullOrEmpty(tempData.Value25)) { diff --git a/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx b/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx index 5bd46da..4352b3c 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx @@ -149,8 +149,6 @@ - - @@ -160,13 +158,14 @@ + + - diff --git a/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx.designer.cs index 9076f9b..9fa41e9 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.WeldingProcess.DataIn { - - - public partial class DataInEdit { - +namespace FineUIPro.Web.WeldingProcess.DataIn +{ + + + public partial class DataInEdit + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// Toolbar1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// ToolbarFill1 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// ckAll 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.CheckBox ckAll; - + /// /// btnSave 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// lbErrCout 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea lbErrCout; - + /// /// txtValue1 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue1; - + /// /// txtValue2 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue2; - + /// /// txtValue3 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue3; - + /// /// txtValue4 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue4; - + /// /// txtValue5 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue5; - + /// /// txtValue6 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue6; - + /// /// txtValue7 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue7; - + /// /// txtValue8 控件。 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue8; - + /// /// txtValue9 控件。 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue9; - + /// /// txtValue10 控件。 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue10; - + /// /// txtValue11 控件。 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue11; - + /// /// txtValue12 控件。 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue12; - + /// /// txtValue13 控件。 /// @@ -200,7 +202,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue13; - + /// /// txtValue14 控件。 /// @@ -209,7 +211,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue14; - + /// /// txtValue15 控件。 /// @@ -218,7 +220,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue15; - + /// /// txtValue16 控件。 /// @@ -227,7 +229,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue16; - + /// /// txtValue17 控件。 /// @@ -236,7 +238,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue17; - + /// /// txtValue18 控件。 /// @@ -245,7 +247,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue18; - + /// /// txtValue19 控件。 /// @@ -254,7 +256,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue19; - + /// /// txtValue20 控件。 /// @@ -263,7 +265,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue20; - + /// /// txtValue21 控件。 /// @@ -272,7 +274,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue21; - + /// /// txtValue22 控件。 /// @@ -281,7 +283,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtValue22; - + /// /// txtValue23 控件。 /// @@ -290,7 +292,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue23; - + /// /// txtValue24 控件。 /// @@ -299,7 +301,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue24; - + /// /// txtValue25 控件。 /// @@ -308,7 +310,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue25; - + /// /// txtValue26 控件。 /// @@ -317,7 +319,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue26; - + /// /// txtValue27 控件。 /// @@ -326,7 +328,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue27; - + /// /// txtValue28 控件。 /// @@ -335,7 +337,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue28; - + /// /// txtValue29 控件。 /// @@ -344,7 +346,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue29; - + /// /// txtValue30 控件。 /// @@ -353,7 +355,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue30; - + /// /// txtValue31 控件。 /// @@ -362,7 +364,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue31; - + /// /// txtValue32 控件。 /// @@ -371,7 +373,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue32; - + /// /// txtValue33 控件。 /// @@ -380,7 +382,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue33; - + /// /// txtValue34 控件。 /// @@ -389,16 +391,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue34; - - /// - /// txtValue35 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtValue35; - + /// /// txtValue36 控件。 /// @@ -407,7 +400,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue36; - + /// /// txtValue37 控件。 /// @@ -416,7 +409,16 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue37; - + + /// + /// txtValue35 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue35; + /// /// txtValue38 控件。 /// @@ -425,7 +427,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue38; - + /// /// txtValue39 控件。 /// @@ -434,7 +436,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue39; - + /// /// txtValue40 控件。 /// diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx new file mode 100644 index 0000000..9a7b3c0 --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx @@ -0,0 +1,138 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PointForAudit.aspx.cs" Inherits="FineUIPro.Web.WeldingProcess.TrustManage.PointForAudit" %> + + + + + 点口待审核 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.cs new file mode 100644 index 0000000..b9ea68c --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.cs @@ -0,0 +1,352 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Reflection; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.WeldingProcess.TrustManage +{ + public partial class PointForAudit : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + + BLL.Base_DetectionTypeService.InitDetectionTypeDropDownList(drpNde, "", false, ""); + drpNde.SelectedValue = "296add43-e979-4cf3-b13e-a68bb00a75d2"; // 默认RT + BindGrid(); + } + } + + private void BindGrid() + { + string strSql = @"SELECT PointBatchItemId,PointBatchId,PointBatchCode,WeldJointId,PointState,PointDate,WorkAreaCode, + WeldJointCode,JointArea,Size,WelderCode,WeldingDate,PipelineCode,PipingClassName, + (CASE WHEN IsWelderFirst=1 THEN '是' ELSE '否' END) AS IsWelderFirst, + JLAudit,GLGSAudit,QTAudit,IsPointAudit + FROM dbo.View_Batch_PointBatchItem + WHERE PointState IS NOT NULL AND TrustBatchItemId IS NULL"; + List listStr = new List(); + if (!string.IsNullOrEmpty(this.txtPipeCode.Text)) + { + strSql += " AND PipelineCode LIKE @PipelineCode"; + listStr.Add(new SqlParameter("@PipelineCode", "%" + this.txtPipeCode.Text.Trim() + "%")); + } + if (!string.IsNullOrEmpty(this.txtPointStartDate.Text)) + { + strSql += " AND PointDate >= @PointStartDate"; + listStr.Add(new SqlParameter("@PointStartDate", Convert.ToDateTime(this.txtPointStartDate.Text))); + } + if (!string.IsNullOrEmpty(this.txtPointEndDate.Text)) + { + strSql += " AND PointDate < @PointEndDate"; + listStr.Add(new SqlParameter("@PointEndDate", Convert.ToDateTime(this.txtPointEndDate.Text).AddDays(1))); + } + if (drpNoAudit.SelectedValue != "0") + { + if (drpNoAudit.SelectedValue == "1") + { + strSql += " AND JLAudit='未审核'"; + } + if (drpNoAudit.SelectedValue == "2") + { + strSql += " AND GLGSAudit='未审核'"; + } + if (drpNoAudit.SelectedValue == "3") + { + strSql += " AND QTAudit='未审核'"; + } + } + else + { + strSql += " AND (JLAudit='未审核' OR GLGSAudit='未审核' OR QTAudit='未审核')"; + } + + if (drpNde.SelectedValue != null) + { + strSql += " AND DetectionTypeId=@DetectionTypeId"; + listStr.Add(new SqlParameter("@DetectionTypeId", drpNde.SelectedValue)); + } + + 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(); + } + + #region + /// + /// 改变索引事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 分页下拉选择事件 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + this.BindGrid(); + } + #endregion + + protected void BtnAnalyse_Click(object sender, EventArgs e) + { + BindGrid(); + } + protected void Window2_Close(object sender, WindowCloseEventArgs e) + { + this.BindGrid(); + } + protected void btnJLAudit_Click(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_PointForAuditMenuId, Const.BtnJLAudit)) + { + if (Grid1.SelectedRowIndexArray.Length <= 0) + { + Alert.ShowInTop("最少选中一行！", MessageBoxIcon.Warning); + return; + } + + string userId = CurrUser.UserId; + foreach (string pointBatchItemId in Grid1.SelectedRowIDArray) + { + var pointBatchItem = BLL.Batch_PointBatchItemService.GetPointBatchItemByPointBatchItemId(pointBatchItemId); + pointBatchItem.JLAudit = userId; + BLL.Funs.DB.SubmitChanges(); + } + Alert.ShowInTop("所选项审核完成！", MessageBoxIcon.Warning); + BindGrid(); + + } + else + { + ShowNotify(Resources.Lan.NoPrivilegePrompt, MessageBoxIcon.Warning); + return; + } + } + protected void btnGLGSAudit_Click(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_PointForAuditMenuId, Const.BtnGLGSAudit)) + { + if (Grid1.SelectedRowIndexArray.Length <= 0) + { + Alert.ShowInTop("最少选中一行！", MessageBoxIcon.Warning); + return; + } + + string userId = CurrUser.UserId; + foreach (string pointBatchItemId in Grid1.SelectedRowIDArray) + { + var pointBatchItem = BLL.Batch_PointBatchItemService.GetPointBatchItemByPointBatchItemId(pointBatchItemId); + pointBatchItem.GLGSAudit = userId; + BLL.Funs.DB.SubmitChanges(); + } + Alert.ShowInTop("所选项审核完成！", MessageBoxIcon.Warning); + BindGrid(); + + } + else + { + ShowNotify(Resources.Lan.NoPrivilegePrompt, MessageBoxIcon.Warning); + return; + } + } + protected void btnOtherAudit_Click(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_PointForAuditMenuId, Const.BtnQTAudit)) + { + if (Grid1.SelectedRowIndexArray.Length <= 0) + { + Alert.ShowInTop("最少选中一行！", MessageBoxIcon.Warning); + return; + } + + string userId = CurrUser.UserId; + foreach (string pointBatchItemId in Grid1.SelectedRowIDArray) + { + var pointBatchItem = BLL.Batch_PointBatchItemService.GetPointBatchItemByPointBatchItemId(pointBatchItemId); + pointBatchItem.QTAudit = userId; + BLL.Funs.DB.SubmitChanges(); + } + Alert.ShowInTop("所选项审核完成！", MessageBoxIcon.Warning); + BindGrid(); + + } + else + { + ShowNotify(Resources.Lan.NoPrivilegePrompt, MessageBoxIcon.Warning); + return; + } + } + + /// + /// 手动生成委托单 + /// + /// + /// + protected void btnHandGenerate_Click(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_PointManageMenuId, Const.BtnHandGenerate)) + { + List selectRow = new List(); + + foreach (string pitem in Grid1.SelectedRowIDArray) + { + selectRow.Add(pitem); + } + + if (selectRow.Count() > 0) + { + List weldMot = new List(); + List grooveType = new List(); + List IsFist = new List(); + List pointBatchIds = new List(); + string error = string.Empty; + + foreach (string pointItemId in selectRow) + { + var pointItem = BLL.Batch_PointBatchItemService.GetPointBatchItemByPointBatchItemId(pointItemId); + var jot = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(pointItem.WeldJointId); + weldMot.Add(jot.WeldingMethodId); + grooveType.Add(jot.GrooveTypeId); + IsFist.Add(pointItem.IsWelderFirst == true ? true : false); + pointBatchIds.Add(pointItem.PointBatchId); + } + + if (pointBatchIds.Distinct().Count() > 1) + { + error = "勾选的焊口不在一个批次中，"; + } + if (weldMot.Distinct().Count() > 1) + { + error = "勾选的焊口焊接方法不一至，"; + } + if (grooveType.Distinct().Count() > 1) + { + error = error + "勾选的焊口坡口类型不一至，"; + } + if (IsFist.Distinct().Count() > 1) + { + error = error + "勾选的焊口是否首三不一至，"; + } + + if (error == string.Empty) + { + var point = BLL.Batch_PointBatchService.GetPointBatchById(pointBatchIds[0]); + var iso = BLL.Pipeline_PipelineService.GetPipelineByPipelineId(point.PipelineId); + var project = BLL.Base_ProjectService.GetProjectByProjectId(point.ProjectId); + var unit = BLL.Base_UnitService.GetUnit(point.UnitId); + var ndt = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(point.DetectionTypeId); + var work = BLL.Project_WorkAreaService.GetProject_WorkAreaByWorkAreaId(iso.WorkAreaId); + + Model.Batch_BatchTrust newBatchTrust = new Model.Batch_BatchTrust(); + string perfix = string.Empty; + //perfix = unit.UnitCode + "-" + ins.InstallationCode + "-GD-" + ndt.DetectionTypeCode + "-"; + perfix = ndt.DetectionTypeCode + "-" + unit.UnitCode + "-" + work.WorkAreaCode + "-PI" + "-"; + newBatchTrust.TrustBatchCode = BLL.SQLHelper.RunProcNewId("SpGetNewCode", "dbo.Batch_BatchTrust", "TrustBatchCode", project.ProjectId, perfix); + + string trustBatchId = SQLHelper.GetNewID(typeof(Model.Batch_BatchTrust)); + newBatchTrust.TrustBatchId = trustBatchId; + + newBatchTrust.TrustDate = DateTime.Now; + newBatchTrust.ProjectId = point.ProjectId; + newBatchTrust.UnitId = point.UnitId; + newBatchTrust.InstallationId = point.InstallationId; + newBatchTrust.WorkAreaId = iso.WorkAreaId; + newBatchTrust.WeldingMethodId = weldMot[0]; + newBatchTrust.GrooveTypeId = grooveType[0]; + newBatchTrust.IsWelderFirst = IsFist[0]; + newBatchTrust.DetectionTypeId = point.DetectionTypeId; + newBatchTrust.PipelineId = point.PipelineId; + + BLL.Batch_BatchTrustService.AddBatchTrust(newBatchTrust); // 新增委托单 + + // 生成委托明细，并回写点口明细信息 + string toPointBatch = string.Empty; + foreach (string pointItemId in selectRow) + { + var pointItem = BLL.Batch_PointBatchItemService.GetPointBatchItemByPointBatchItemId(pointItemId); + if (BLL.Batch_PointBatchService.GetIsGenerateTrust(pointItem.PointBatchItemId)) ////生成委托单的条件判断 + { + if (!toPointBatch.Contains(pointItem.PointBatchId)) + { + toPointBatch = toPointBatch + pointItem.PointBatchId + ","; + } + + Model.Batch_BatchTrustItem trustItem = new Model.Batch_BatchTrustItem + { + TrustBatchItemId = SQLHelper.GetNewID(typeof(Model.Batch_BatchTrustItem)), + TrustBatchId = trustBatchId, + PointBatchItemId = pointItem.PointBatchItemId, + WeldJointId = pointItem.WeldJointId, + //FilmNum = fileNum, + CreateDate = DateTime.Now + }; + Batch_BatchTrustItemService.AddBatchTrustItem(trustItem); + } + + //Model.Batch_PointBatchItem pointBatchItem = Funs.DB.Batch_PointBatchItem.FirstOrDefault(e => e.PointBatchItemId == item.PointBatchItemId); + + pointItem.IsBuildTrust = true; + Funs.DB.SubmitChanges(); + } + + // 回写委托批对应点口信息 + if (!string.IsNullOrEmpty(toPointBatch)) + { + toPointBatch = toPointBatch.Substring(0, toPointBatch.Length - 1); + var updateTrut = BLL.Batch_BatchTrustService.GetBatchTrustById(trustBatchId); + if (updateTrut != null) + { + updateTrut.TopointBatch = toPointBatch; + BLL.Batch_BatchTrustService.UpdateBatchTrust(updateTrut); + } + } + + Alert.ShowInTop("委托单已生成！", MessageBoxIcon.Success); + } + else + { + Alert.ShowInTop(error + "不能组成一个委托单！", MessageBoxIcon.Warning); + } + } + else + { + Alert.ShowInTop("请勾选要生成委托单的焊口！", MessageBoxIcon.Warning); + } + } + else + { + ShowNotify(Resources.Lan.NoPrivilegePrompt, MessageBoxIcon.Warning); + return; + } + } + } +} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.designer.cs new file mode 100644 index 0000000..95dcc3d --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.designer.cs @@ -0,0 +1,188 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.WeldingProcess.TrustManage +{ + + + public partial class PointForAudit + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// drpNoAudit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpNoAudit; + + /// + /// txtPipeCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPipeCode; + + /// + /// drpNde 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpNde; + + /// + /// txtPointStartDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtPointStartDate; + + /// + /// txtPointEndDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtPointEndDate; + + /// + /// BtnAnalyse 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button BtnAnalyse; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnJLAudit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnJLAudit; + + /// + /// btnGLGSAudit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnGLGSAudit; + + /// + /// btnOtherAudit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOtherAudit; + + /// + /// btnHandGenerate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnHandGenerate; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + } +} diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx index 8b065f6..968c4f7 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx @@ -118,7 +118,7 @@ runat="server" OnClick="btnbtnOpenResetPoint_Click"> + ConfirmText="确定要手动关闭批中待处理焊口吗？" OnClick="btnbtnClear_Click">