diff --git a/CreateModel.bat b/CreateModel.bat index 27ceb4a..2f27853 100644 --- a/CreateModel.bat +++ b/CreateModel.bat @@ -25,9 +25,9 @@ REM -------------- @echo 设置.net控制台环境 @echo. -@call "%VS150%" +@call "%VS100COMNTOOLS%"vsvars32.bat -SqlMetal /views /server:. /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model +SqlMetal /views /server:.\SQL2016 /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model @ECHO 完成 pause diff --git a/DataBase/鐗堟湰鏃ュ織/HJGLDB_2024.05.12.sql b/DataBase/鐗堟湰鏃ュ織/HJGLDB_2024.05.12.sql index da44f3e..f0570d5 100644 --- a/DataBase/鐗堟湰鏃ュ織/HJGLDB_2024.05.12.sql +++ b/DataBase/鐗堟湰鏃ュ織/HJGLDB_2024.05.12.sql @@ -1,3 +1,8 @@ +-- 管线焊工 增加是否 PMI处理 +alter table Pipeline_WeldJoint add isPMI bit NULL +GO +update Pipeline_WeldJoint set isPMI=0 +GO ALTER VIEW [dbo].[View_Pipeline_WeldJoint] AS @@ -77,6 +82,7 @@ CoverWelder.WelderName AS CoverWelderName, pipingClass.PipingClassCode,pip.PIPClassCode, CONVERT(VARCHAR(100), WeldingDaily.WeldingDate, 23) AS WeldingDate, WeldJoint.IsCancel, +WeldJoint.IsPMI, WeldJoint.IsGoldJoint, WeldJoint.WPQId,wps.WPQCode, WeldJoint.DetectionType, @@ -201,7 +207,6 @@ FROM Pipeline_WeldJoint AS weldJoint GO - UPDATE dbo.Template_Files SET title=REPLACE(title,cast(sortindex as nvarchar(50))+'-','') GO @@ -212,4 +217,73 @@ INSERT INTO [dbo].[Template_Files]([id],[title],[filePath],[SortIndex]) VALUES('95125974-3DD4-4E16-B4F0-A9D9C9A1406D','管道焊接接头PMI检测比例确认表','',25) GO +-- PMI处理委托 +create table PMI_Delegation +( + Id nvarchar(50) not null primary key, + DelegationNo nvarchar(50) not null, + DelegationDate datetime, + ProjectId nvarchar(50) not null, + InstallationId nvarchar(50), + UnitId nvarchar(50), + DetectionStandard nvarchar(50), + Tabler nvarchar(50), + Remark nvarchar(255), + CreatedTime datetime default getdate() +) +go +---- PMI处理委托 明细 +create table PMI_DelegationDetails +( + Id nvarchar(50) not null primary key, + PMIId nvarchar(50) not null, + JointId nvarchar(50) not null, + QualityNo nvarchar(255), + Acceptance nvarchar(255), + Status int not null, + CreatedTime datetime default getdate() +) +go + + +-- 插入PMI委托菜单 +insert into Sys_Menu values('A6FB44C3-0920-4F77-862F-D814FD5E5D23','PMI检测管理','PMI detection management','',21,0,3,NUll,1) +insert into Sys_Menu values(NEWID(),'PMI委托','PMI delegation','/WeldingProcess/PMI/PMIDelegation.aspx',1,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1) +insert into Sys_Menu values(NEWID(),'PMI检测录入','PMI detection entry','/WeldingProcess/PMI/PMIDetectionEntry.aspx',2,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1) +GO + + +/*******PMI委托明细视图***********/ + +ALTER VIEW [dbo].[View_PMI_DelegationDetails] +AS +/********热处理明细********/ +SELECT +TrustItem.Id, +TrustItem.Acceptance, +TrustItem.CreatedTime, +TrustItem.JointId as WeldJointId, +TrustItem.status, +TrustItem.QualityNo, +TrustItem.PMIId, +Trust.ProjectId, +Trust.DelegationNo, +Trust.DelegationDate, +WeldJoint.WeldJointCode, +Pipeline.PipelineCode, +WeldJoint.Specification, +Material.MaterialCode, +Pipeline.WorkAreaId +FROM PMI_DelegationDetails AS TrustItem +LEFT JOIN PMI_Delegation AS Trust ON Trust.Id=TrustItem.PMIId +LEFT JOIN Pipeline_WeldJoint AS WeldJoint ON WeldJoint.WeldJointId=TrustItem.JointId +LEFT JOIN Pipeline_Pipeline AS Pipeline ON Pipeline.PipelineId=WeldJoint.PipelineId +LEFT JOIN Base_Material AS Material ON Material.MaterialId=WeldJoint.Material1Id +GO + + + + + + diff --git a/HJGL/.vs/HJGL/config/applicationhost.config b/HJGL/.vs/HJGL/config/applicationhost.config index 0dd2b3b..8705adb 100644 --- a/HJGL/.vs/HJGL/config/applicationhost.config +++ b/HJGL/.vs/HJGL/config/applicationhost.config @@ -162,7 +162,7 @@ - + @@ -256,14 +256,6 @@ - - - - - - - - diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index f178c8f..d319c0f 100644 Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ diff --git a/HJGL/BLL/BLL.csproj.user b/HJGL/BLL/BLL.csproj.user index 07dbd5b..55f44b9 100644 --- a/HJGL/BLL/BLL.csproj.user +++ b/HJGL/BLL/BLL.csproj.user @@ -1,6 +1,6 @@ 锘 - ProjectFiles + ShowAllFiles \ No newline at end of file diff --git a/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs b/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs index 7dd4fd5..9c2ad63 100644 --- a/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs +++ b/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs @@ -252,6 +252,12 @@ namespace BLL { newWeldJoint.Electricity = weldJoint.Electricity; } + if (weldJoint.IsPMI != null) + { + newWeldJoint.IsPMI = weldJoint.IsPMI; + } + + if (!string.IsNullOrEmpty(weldJoint.Voltage)) { newWeldJoint.Voltage = weldJoint.Voltage; diff --git a/HJGL/DataBase/鐗堟湰鏃ュ織/BSFDB_2024-05-10.sql b/HJGL/DataBase/鐗堟湰鏃ュ織/BSFDB_2024-05-10.sql deleted file mode 100644 index f6c4b0e..0000000 --- a/HJGL/DataBase/鐗堟湰鏃ュ織/BSFDB_2024-05-10.sql +++ /dev/null @@ -1,66 +0,0 @@ -use HJGLDB_ZJBSF -go -create table PMI_Delegation -( - Id nvarchar(50) not null primary key, - DelegationNo nvarchar(50) not null, - DelegationDate datetime, - ProjectId nvarchar(50) not null, - InstallationId nvarchar(50), - UnitId nvarchar(50), - DetectionStandard nvarchar(50), - Remark nvarchar(255), - CreatedTime datetime default getdate() -) -go -create table PMI_DelegationDetails -( - Id nvarchar(50) not null primary key, - PMIId nvarchar(50) not null, - JointId nvarchar(50) not null, - QualityNo nvarchar(255), - Acceptance nvarchar(255), - Status int not null, - CreatedTime datetime default getdate() -) -go - --- 管线焊工 增加是否 PMI处理 -alter table Pipeline_WeldJoint add isPMI bit null -update Pipeline_WeldJoint set isPMI=0 --- 插入PMI委托菜单 -insert into Sys_Menu values('A6FB44C3-0920-4F77-862F-D814FD5E5D23','PMI检测管理','PMI detection management','',21,0,3,NUll,1) -insert into Sys_Menu values(NEWID(),'PMI委托','PMI delegation','/WeldingProcess/PMI/PMIDelegation.aspx',0,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1) -insert into Sys_Menu values(NEWID(),'PMI检测录入','PMI detection entry','/WeldingProcess/PMI/PMIDetectionEntry.aspx',0,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1) - - - -CREATE VIEW [dbo].[View_PMI_DelegationDetails] -AS -/*******硬度委托明细***********/ -SELECT -B.PMIId, -B.JointId, -B.QualityNo, -B.Acceptance, -B.CreatedTime, -B.status, -Pipeline.PipelineCode, -WeldJoint.WeldJointCode, -WeldJoint.Specification, -WeldJoint.Remark, -Pipeline.SingleNumber, -(CASE WHEN WeldJoint.CoverWelderCode IS NOT NULL AND WeldJoint.BackingWelderCode IS NOT NULL - THEN WeldJoint.CoverWelderCode + '/' + WeldJoint.BackingWelderCode - ELSE (ISNULL(WeldJoint.CoverWelderCode,'') + ISNULL(WeldJoint.BackingWelderCode,'')) END) AS WelderCode, --焊工 - (CASE WHEN WeldJoint.Material1Code IS NOT NULL AND WeldJoint.Material2Code IS NOT NULL - THEN WeldJoint.Material1Code + '/' + WeldJoint.Material2Code - ELSE (ISNULL(WeldJoint.Material1Code,'') + ISNULL(WeldJoint.Material2Code,'')) END) AS MaterialCode --材质 -FROM PMI_Delegation AS A INNER JOIN -PMI_DelegationDetails AS B ON A.Id=B.PMIId -LEFT JOIN View_Pipeline_WeldJoint AS WeldJoint ON WeldJoint.WeldJointId=B.JointId -LEFT JOIN Pipeline_Pipeline AS Pipeline ON Pipeline.PipelineId=WeldJoint.PipelineId - -GO - - diff --git a/HJGL/DataBase/鐗堟湰鏃ュ織/BSFDB_2024.05.11View_Pipeline_WeldJoint.sql b/HJGL/DataBase/鐗堟湰鏃ュ織/BSFDB_2024.05.11View_Pipeline_WeldJoint.sql deleted file mode 100644 index 97535ae..0000000 --- a/HJGL/DataBase/鐗堟湰鏃ュ織/BSFDB_2024.05.11View_Pipeline_WeldJoint.sql +++ /dev/null @@ -1,117 +0,0 @@ -USE [HJGLDB_ZJBSF] -GO - -/****** Object: View [dbo].[View_Pipeline_WeldJoint] Script Date: 2024-5-11 14:44:42 ******/ -SET ANSI_NULLS ON -GO - -SET QUOTED_IDENTIFIER ON -GO - - -ALTER VIEW [dbo].[View_Pipeline_WeldJoint] -AS -/************焊口信息视图*****************/ -SELECT WeldJoint.WeldJointId, -WeldJoint.ProjectId, -WeldJoint.PipelineId, -WeldJoint.WeldJointCode, -dbo.Fun_GetParseInt(WeldJoint.WeldJointCode) AS ConvertWeldJoint, -WeldJoint.WeldTypeId, -WeldJoint.Material1Id, -WeldJoint.Material2Id, -WeldJoint.ANSISCH, -WeldJoint.Thickness, -WeldJoint.Dia, -WeldJoint.Size, -WeldJoint.JointAttribute, -WeldJoint.JointArea, -WeldJoint.WeldingMethodId, -WeldJoint.IsHotProess, -WeldJoint.WeldingLocationId, -WeldJoint.WeldMatId, -WeldJoint.WeldSilkId, -WeldJoint.GrooveTypeId, -WeldJoint.PipeSegment, -WeldJoint.PipeAssembly1Id, -WeldJoint.PipeAssembly2Id, -WeldJoint.PipeAssemblyCount, -WeldJoint.HeartNo1, -WeldJoint.HeartNo2, -WeldJoint.LastTemp, -WeldJoint.CellTemp, -WeldJoint.PrepareTemp, -WeldJoint.Electricity, -WeldJoint.SystemNumber, -WeldJoint.Remark, -WeldJoint.DoneDin, -WeldJoint.Voltage, -WeldJoint.TestPackageNo, -WeldJoint.WeldingDailyCode, -WeldJoint.WeldingDailyId, -WeldJoint.BackingWelderId, -WeldJoint.CoverWelderId, -WeldJoint.PipingClassId, -WeldJoint.Specification, -WeldJoint.CancelResult, -Project.ProjectCode, -Project.ProjectName, -Pipeline.PipelineCode, -Pipeline.InstallationId, -Pipeline.UnitId, -Pipeline.SingleNumber, -Pipeline.WorkAreaId, -WeldType.WeldTypeCode, -Material1.MaterialCode AS Material1Code, -Material2.MaterialCode AS Material2Code, -WeldingMethod.WeldingMethodCode, -WeldingLocation.WeldingLocationCode, -WeldMat.ConsumablesCode AS WeldMatCode, ---WeldSilk.ConsumablesCode AS WeldSilkCode, -'' AS WeldSilkCode, -GrooveType.GrooveTypeCode, -CASE WHEN WeldJoint.WeldingDailyId IS NULL THEN '否' ELSE '是' END AS Is_hjName, -CASE WHEN WeldJoint.IsHotProess=1 THEN '是' ELSE '否' END AS IsHotProessStr, -Components1.ComponentsCode AS ComponentsCode1, -Components2.ComponentsCode AS ComponentsCode2, -BackingWelder.WelderCode AS BackingWelderCode, -BackingWelder.WelderName AS BackingWelderName, -CoverWelder.WelderCode AS CoverWelderCode, -CoverWelder.WelderName AS CoverWelderName, -(CASE WHEN CoverWelder.WelderCode IS NOT NULL AND BackingWelder.WelderCode IS NOT NULL - THEN CoverWelder.WelderCode + '/' + BackingWelder.WelderCode - ELSE (ISNULL(CoverWelder.WelderCode,'') + ISNULL(BackingWelder.WelderCode,'')) END) AS WelderCode, --焊工 - (CASE WHEN Material1.MaterialCode IS NOT NULL AND Material2.MaterialCode IS NOT NULL - THEN Material1.MaterialCode + '/' + Material2.MaterialCode - ELSE (ISNULL(Material1.MaterialCode,'') + ISNULL(Material2.MaterialCode,'')) END) AS MaterialCode, --材质 -pipingClass.PipingClassCode, -CONVERT(VARCHAR(100), WeldingDaily.WeldingDate, 23) AS WeldingDate, -WeldJoint.IsCancel, -WeldJoint.IsPMI, -WeldJoint.IsGoldJoint, -WeldJoint.WPQId,wps.WPQCode, -WeldJoint.DetectionType, -WeldJoint.PageNum -FROM Pipeline_WeldJoint AS WeldJoint -LEFT JOIN Base_Project AS Project ON Project.ProjectId=WeldJoint.ProjectId -LEFT JOIN Pipeline_Pipeline AS Pipeline ON Pipeline.PipelineId = WeldJoint.PipelineId -LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId=WeldJoint.WeldTypeId -LEFT JOIN Base_Material AS Material1 ON Material1.MaterialId = WeldJoint.Material1Id -LEFT JOIN Base_Material AS Material2 ON Material2.MaterialId = WeldJoint.Material2Id -LEFT JOIN Base_WeldingMethod AS WeldingMethod ON WeldingMethod.WeldingMethodId=WeldJoint.WeldingMethodId -LEFT JOIN Base_WeldingLocation AS WeldingLocation ON WeldingLocation.WeldingLocationId=WeldJoint.WeldingLocationId -LEFT JOIN Base_Consumables AS WeldMat ON WeldMat.ConsumablesId=WeldJoint.WeldMatId ---LEFT JOIN Base_Consumables AS WeldSilk ON WeldSilk.ConsumablesId=WeldJoint.WeldSilkId -LEFT JOIN Base_GrooveType AS GrooveType ON GrooveType.GrooveTypeId=WeldJoint.GrooveTypeId -LEFT JOIN Base_Components AS Components1 ON Components1.ComponentsId = WeldJoint.PipeAssembly1Id -LEFT JOIN Base_Components AS Components2 ON Components2.ComponentsId = WeldJoint.PipeAssembly2Id -LEFT JOIN Welder_Welder AS BackingWelder ON BackingWelder.WelderId=WeldJoint.BackingWelderId -LEFT JOIN Welder_Welder AS CoverWelder ON CoverWelder.WelderId=WeldJoint.CoverWelderId -LEFT JOIN Pipeline_WeldingDaily AS WeldingDaily ON WeldingDaily.WeldingDailyId=WeldJoint.WeldingDailyId -LEFT JOIN Base_PipingClass AS pipingClass ON pipingClass.PipingClassId=WeldJoint.PipingClassId -LEFT JOIN dbo.WPQ_WPQList wps ON wps.WPQId=WeldJoint.WPQId - - -GO - - diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj index 61c4a05..89e031f 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -240,6 +240,7 @@ + @@ -3429,6 +3430,13 @@ PIPClassEdit.aspx + + AnalysisEdit.aspx + ASPXCodeBehind + + + AnalysisEdit.aspx + QualificationAnalysis.aspx ASPXCodeBehind @@ -4903,7 +4911,6 @@ GlobalResourceProxyGenerator Lan.Designer.cs - Designer diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user index f9b03fb..8d0cdf2 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -35,7 +35,7 @@ True 0 / - http://localhost:57613/ + http://localhost:13960/ False False diff --git a/HJGL/FineUIPro.Web/Web.config b/HJGL/FineUIPro.Web/Web.config index 553053a..baa8804 100644 --- a/HJGL/FineUIPro.Web/Web.config +++ b/HJGL/FineUIPro.Web/Web.config @@ -9,7 +9,7 @@
- + diff --git a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx new file mode 100644 index 0000000..4f38110 --- /dev/null +++ b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx @@ -0,0 +1,93 @@ +锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="AnalysisEdit.aspx.cs" Inherits="FineUIPro.Web.WelderManage.AnalysisEdit" %> + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs new file mode 100644 index 0000000..d4ead77 --- /dev/null +++ b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs @@ -0,0 +1,135 @@ +锘縰sing BLL; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using static System.Windows.Forms.VisualStyles.VisualStyleElement.Header; + +namespace FineUIPro.Web.WelderManage +{ + public partial class AnalysisEdit : PageBase + { + #region 瀹氫箟椤 + /// + /// 鍚堟牸椤圭洰id + /// + public string WelderQualifiedProjectId + { + get + { + return (string)ViewState["WelderQualifiedProjectId"]; + } + set + { + ViewState["WelderQualifiedProjectId"] = value; + } + } + #endregion + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); + this.WelderQualifiedProjectId = Request.Params["WelderQualifiedProjectId"]; + + drpWeldingLocation.DataValueField = "WeldingLocationCode"; + drpWeldingLocation.DataTextField = "WeldingLocationCode"; + drpWeldingLocation.DataSource = (from x in Funs.DB.Base_WeldingLocation orderby x.WeldingLocationCode select x).ToList(); + drpWeldingLocation.DataBind(); + Funs.FineUIPleaseSelect(drpWeldingLocation, ""); + + drpWeldingMethod.DataValueField = "WeldingMethodCode"; + drpWeldingMethod.DataTextField = "WeldingMethodCode"; + drpWeldingMethod.DataSource = (from x in Funs.DB.Base_WeldingMethod orderby x.WeldingMethodCode select x).ToList(); + drpWeldingMethod.DataBind(); + Funs.FineUIPleaseSelect(drpWeldingMethod, ""); + + if (!string.IsNullOrEmpty(this.WelderQualifiedProjectId)) + { + var welderQualifiedProject = BLL.WelderQualifiedService.GetWelderQualifiedProjectById(this.WelderQualifiedProjectId); + if (welderQualifiedProject != null) + { + string wlederId = welderQualifiedProject.WelderId; + this.txtQualifiedProjectCode.Text = welderQualifiedProject.QualifiedProjectCode; + + if (!string.IsNullOrEmpty(welderQualifiedProject.WeldingMethodId)) + { + drpWeldingMethod.SelectedValueArray = welderQualifiedProject.WeldingMethodId.Split(','); + } + if (!string.IsNullOrEmpty(welderQualifiedProject.MaterialType)) + { + drpMaterialType.SelectedValueArray = welderQualifiedProject.MaterialType.Split(','); + } + if (!string.IsNullOrEmpty(welderQualifiedProject.WeldingLocationId)) + { + drpWeldingLocation.SelectedValueArray = welderQualifiedProject.WeldingLocationId.Split(','); + } + if (!string.IsNullOrEmpty(welderQualifiedProject.WeldType)) + { + drpWeldType.SelectedValueArray = welderQualifiedProject.WeldType.Split(','); + } + + if (welderQualifiedProject.ThicknessMax != null) + { + numThicknessMax.Text = welderQualifiedProject.ThicknessMax.Value.ToString(); + } + if (welderQualifiedProject.SizesMin != null) + { + numSizesMin.Text = welderQualifiedProject.SizesMin.Value.ToString(); + } + + Model.Welder_Welder welder = BLL.WelderService.GetWelderById(wlederId); + if (welder != null) + { + this.lbWedlerName.Text = welder.WelderName; + this.lbWedlerCode.Text = welder.WelderCode; + } + } + } + } + } + + protected void btnSave_Click(object sender, EventArgs e) + { + Model.Welder_WelderQualify updateQue = Funs.DB.Welder_WelderQualify.FirstOrDefault(x => x.WelderQualifiedProjectId == this.WelderQualifiedProjectId); + if (!string.IsNullOrEmpty(drpWeldingMethod.SelectedValue)) + { + updateQue.WeldingMethodId = String.Join(",", drpWeldingMethod.SelectedValueArray); + } + if (!string.IsNullOrEmpty(drpMaterialType.SelectedValue)) + { + updateQue.MaterialType = String.Join(",", drpMaterialType.SelectedValueArray); + } + if (!string.IsNullOrEmpty(drpWeldingLocation.SelectedValue)) + { + updateQue.WeldingLocationId = String.Join(",", drpWeldingLocation.SelectedValueArray); + } + if (!string.IsNullOrEmpty(drpWeldType.SelectedValue)) + { + updateQue.WeldType = String.Join(",", drpWeldType.SelectedValueArray); + } + if (!string.IsNullOrEmpty(numSizesMin.Text)) + { + updateQue.SizesMin = Convert.ToInt32(numSizesMin.Text); + } + else + { + updateQue.SizesMin = 0; + } + if (!string.IsNullOrEmpty(numThicknessMax.Text)) + { + updateQue.ThicknessMax = Convert.ToInt32(numThicknessMax.Text); + } + else + { + updateQue.ThicknessMax = 0; + } + + Funs.DB.SubmitChanges(); + BLL.Sys_LogService.AddLog(Const.System_1, this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.Welder_QualifiedProjectMenuId, Const.BtnModify, this.WelderQualifiedProjectId); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + } +} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs new file mode 100644 index 0000000..ed0ccfc --- /dev/null +++ b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs @@ -0,0 +1,170 @@ +锘//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.WelderManage +{ + + + public partial class AnalysisEdit + { + + /// + /// form1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// lbWedlerName 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lbWedlerName; + + /// + /// lbWedlerCode 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lbWedlerCode; + + /// + /// txtQualifiedProjectCode 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label txtQualifiedProjectCode; + + /// + /// drpWeldingMethod 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList drpWeldingMethod; + + /// + /// drpMaterialType 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList drpMaterialType; + + /// + /// drpWeldingLocation 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList drpWeldingLocation; + + /// + /// numThicknessMax 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.NumberBox numThicknessMax; + + /// + /// numSizesMin 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.NumberBox numSizesMin; + + /// + /// drpWeldType 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList drpWeldType; + + /// + /// Toolbar1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// lbTemp 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lbTemp; + + /// + /// ToolbarFill1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnClose 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnClose; + } +} diff --git a/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx b/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx index b37aa77..1c8c820 100644 --- a/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx +++ b/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx @@ -142,10 +142,17 @@ Target="top" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true" Width="600px" Height="420px"> + + + diff --git a/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs b/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs index 3f3cedd..0e133a4 100644 --- a/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs +++ b/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs @@ -207,6 +207,16 @@ namespace FineUIPro.Web.WelderManage } } + protected void btnMenuAnalysis_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("璇烽夋嫨涓鏉¤褰曪紒", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("AnalysisEdit.aspx?WelderQualifiedProjectId={0}", Grid1.SelectedRowID, "缁存姢 - "))); + } + /// /// 鍒犻櫎 /// diff --git a/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.designer.cs b/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.designer.cs index a96bd70..ced92e3 100644 --- a/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.WelderManage { - - - public partial class QualifiedProject { - +namespace FineUIPro.Web.WelderManage +{ + + + public partial class QualifiedProject + { + /// /// form1 鎺т欢銆 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 鎺т欢銆 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 鎺т欢銆 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Panel Panel1; - + /// /// panelLeftRegion 鎺т欢銆 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Panel panelLeftRegion; - + /// /// Toolbar4 鎺т欢銆 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Toolbar Toolbar4; - + /// /// drpUnitId 鎺т欢銆 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DropDownList drpUnitId; - + /// /// Toolbar1 鎺т欢銆 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// txtWelderCodeS 鎺т欢銆 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtWelderCodeS; - + /// /// Toolbar3 鎺т欢銆 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Toolbar Toolbar3; - + /// /// txtWelderNameS 鎺т欢銆 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtWelderNameS; - + /// /// tvControlItem 鎺т欢銆 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Tree tvControlItem; - + /// /// panelCenterRegion 鎺т欢銆 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Panel panelCenterRegion; - + /// /// Grid1 鎺т欢銆 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar2 鎺т欢銆 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Toolbar Toolbar2; - + /// /// lblCode 鎺т欢銆 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label lblCode; - + /// /// lblName 鎺т欢銆 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label lblName; - + /// /// ToolbarFill1 鎺т欢銆 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// fileUpload 鎺т欢銆 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.FileUpload fileUpload; - + /// /// btnImport 鎺т欢銆 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Button btnImport; - + /// /// btnDownLoad 鎺т欢銆 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Button btnDownLoad; - + /// /// btnAdd 鎺т欢銆 /// @@ -200,7 +202,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Button btnAdd; - + /// /// btnQualificationAnalysis 鎺т欢銆 /// @@ -209,7 +211,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Button btnQualificationAnalysis; - + /// /// hidFileName 鎺т欢銆 /// @@ -218,7 +220,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.HiddenField hidFileName; - + /// /// lbWeldType 鎺т欢銆 /// @@ -227,7 +229,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::System.Web.UI.WebControls.Label lbWeldType; - + /// /// ToolbarSeparator1 鎺т欢銆 /// @@ -236,7 +238,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 鎺т欢銆 /// @@ -245,7 +247,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 鎺т欢銆 /// @@ -254,7 +256,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// Window1 鎺т欢銆 /// @@ -263,7 +265,16 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Window Window1; - + + /// + /// Window2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Window Window2; + /// /// Menu1 鎺т欢銆 /// @@ -272,7 +283,7 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuEdit 鎺т欢銆 /// @@ -281,7 +292,16 @@ namespace FineUIPro.Web.WelderManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.MenuButton btnMenuEdit; - + + /// + /// btnMenuAnalysis 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.MenuButton btnMenuAnalysis; + /// /// btnMenuDelete 鎺т欢銆 /// diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs index f587eaf..74c1a36 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs @@ -197,7 +197,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI ShowNotify(Resources.Lan.SaveSuccessfully, MessageBoxIcon.Success); PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(this.PMIDelegationId) - + ActiveWindow.GetHideReference()); + + ActiveWindow.GetHidePostBackReference()); } else { diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx index 23776b0..de1f1f9 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx @@ -143,16 +143,25 @@ DataField="MaterialCode" SortField="MaterialCode" FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="120px"> - - + + + + + + + + + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/JointComprehensive.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/JointComprehensive.aspx.cs index 950a5cc..7fabb4c 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/JointComprehensive.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/JointComprehensive.aspx.cs @@ -407,24 +407,24 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport reportModel.GetRow(rowIndex).GetCell(5).CellStyle.SetFont(cs_content_Font); //鐒婂彛鍙 - if (reportModel.GetRow(rowIndex).GetCell(9) == null) reportModel.GetRow(rowIndex).CreateCell(9); - reportModel.GetRow(rowIndex).GetCell(9).SetCellValue(jotNum.Count()); - reportModel.GetRow(rowIndex).GetCell(9).CellStyle.SetFont(cs_content_Font); + if (reportModel.GetRow(rowIndex).GetCell(11) == null) reportModel.GetRow(rowIndex).CreateCell(11); + reportModel.GetRow(rowIndex).GetCell(11).SetCellValue(jotNum.Count()); + reportModel.GetRow(rowIndex).GetCell(11).CellStyle.SetFont(cs_content_Font); // 瀵稿緞 - if (reportModel.GetRow(rowIndex).GetCell(12) == null) reportModel.GetRow(rowIndex).CreateCell(12); - reportModel.GetRow(rowIndex).GetCell(12).SetCellValue(jotNum.Sum(x => Convert.ToDouble(x.Size))); - reportModel.GetRow(rowIndex).GetCell(12).CellStyle.SetFont(cs_content_Font); + if (reportModel.GetRow(rowIndex).GetCell(14) == null) reportModel.GetRow(rowIndex).CreateCell(14); + reportModel.GetRow(rowIndex).GetCell(14).SetCellValue(jotNum.Sum(x => Convert.ToDouble(x.Size))); + reportModel.GetRow(rowIndex).GetCell(14).CellStyle.SetFont(cs_content_Font); //鎵撳簳鐒婂伐鍙 - if (reportModel.GetRow(rowIndex).GetCell(21) == null) reportModel.GetRow(rowIndex).CreateCell(21); - reportModel.GetRow(rowIndex).GetCell(21).SetCellValue(backingWelder.Count().ToString()); - reportModel.GetRow(rowIndex).GetCell(21).CellStyle.SetFont(cs_content_Font); + if (reportModel.GetRow(rowIndex).GetCell(23) == null) reportModel.GetRow(rowIndex).CreateCell(23); + reportModel.GetRow(rowIndex).GetCell(23).SetCellValue(backingWelder.Count().ToString()); + reportModel.GetRow(rowIndex).GetCell(23).CellStyle.SetFont(cs_content_Font); //鐩栭潰鐒婂伐鍙 - if (reportModel.GetRow(rowIndex).GetCell(22) == null) reportModel.GetRow(rowIndex).CreateCell(22); - reportModel.GetRow(rowIndex).GetCell(22).SetCellValue(coverWelder.Count().ToString()); - reportModel.GetRow(rowIndex).GetCell(22).CellStyle.SetFont(cs_content_Font); + if (reportModel.GetRow(rowIndex).GetCell(24) == null) reportModel.GetRow(rowIndex).CreateCell(24); + reportModel.GetRow(rowIndex).GetCell(24).SetCellValue(coverWelder.Count().ToString()); + reportModel.GetRow(rowIndex).GetCell(24).CellStyle.SetFont(cs_content_Font); } #endregion reportModel.ForceFormulaRecalculation = true; diff --git a/HJGL/FineUIPro.Web/common/mainFullViews.aspx b/HJGL/FineUIPro.Web/common/mainFullViews.aspx index 4dc6da7..49ce1b0 100644 --- a/HJGL/FineUIPro.Web/common/mainFullViews.aspx +++ b/HJGL/FineUIPro.Web/common/mainFullViews.aspx @@ -66,10 +66,10 @@
-

  Welders Ranking Report gives you the impression of BSF

+

  Welders Ranking Report gives you the impression of BASF

  welders rank list. (The rank is according to the rejected rates.)

  Each year for the rank can be easily ranked out.

-

  鐒婂伐鎺掑悕鎶ヨ〃鏄墍鏈夊湪BSF浠庝簨鐒婃帴宸ヤ綔鐨勭剨宸ュ勾搴︽帓鍚

+

  鐒婂伐鎺掑悕鎶ヨ〃鏄墍鏈夊湪BASF浠庝簨鐒婃帴宸ヤ綔鐨勭剨宸ュ勾搴︽帓鍚

 锛堟帓鍚嶆槸鏍规嵁鐒婂伐鎷嶇墖閲忓強鎷嶇墖鍚堟牸鐜囩‘瀹氱殑锛夈

  鏌ヨ鏃跺彲閫夋嫨涓嶅悓骞翠唤鏌ヨ姣忓勾鐨勭剨宸ュ悎鏍肩巼鎺掑悕鎯呭喌銆

@@ -161,12 +161,12 @@

  Weld Contractors Report gives the welding quality information

-

  of all the contractors of BSF according to choice the

+

  of all the contractors of BASF according to choice the

  different period and different contractor.

-

  Accumulated rejection rate was calculated from Jan 2006.

-

  璇ユ姤鍛婃彁渚涗簡鎵鏈夊湪BSF浠庝簨鐒婃帴宸ヤ綔鐨勬壙鍖呭晢鍦ㄤ笉鍚屾椂鏈熺殑鐒婃帴璐ㄩ噺鐘跺喌銆

+

  Accumulated rejection rate was calculated from Jan 2024.

+

  璇ユ姤鍛婃彁渚涗簡鎵鏈夊湪BASF浠庝簨鐒婃帴宸ヤ綔鐨勬壙鍖呭晢鍦ㄤ笉鍚屾椂鏈熺殑鐒婃帴璐ㄩ噺鐘跺喌銆

  鏌ヨ鏃跺彲閫氳繃閫夋嫨涓嶅悓鏃ユ湡鍙婁笉鍚屾壙鍖呭晢鍚嶇О鏌ョ湅鐩稿叧淇℃伅銆

-

  鍏朵腑锛岀疮璁＄剨鎺ヨ繑淇巼鏄粠2006骞1鏈堣捣璁＄畻鐨勩

+

  鍏朵腑锛岀疮璁＄剨鎺ヨ繑淇巼鏄粠2024骞1鏈堣捣璁＄畻鐨勩

 diff --git a/HJGL/FineUIPro.Web/common/mainFullViews.aspx.cs b/HJGL/FineUIPro.Web/common/mainFullViews.aspx.cs index 9dcbb69..fba6709 100644 --- a/HJGL/FineUIPro.Web/common/mainFullViews.aspx.cs +++ b/HJGL/FineUIPro.Web/common/mainFullViews.aspx.cs @@ -85,12 +85,12 @@ namespace FineUIPro.Web.common string strSql = @"SELECT (WelderName+'锛'+WelderCode+'锛 鐒婂伐璇佽繃鏈燂紝鏈夋晥鏈熶负锛'+CONVERT(VARCHAR(100),CertificateValidity,23)) AS QualificationLimit FROM dbo.Welder_Welder - WHERE CertificateValidity<=GETDATE() + WHERE CertificateValidity<=GETDATE() AND IsOnDuty=1 UNION SELECT (WelderName+'锛'+WelderCode+'锛 鐒婂伐璇佽繕鏈夛細'+convert(nvarchar(6),DATEDIFF(day,getdate(),CertificateValidity))+ '澶╁埌鏈') AS QualificationLimit FROM dbo.Welder_Welder - where DATEADD(m,-1,CertificateValidity)GETDATE()"; + where DATEADD(m,-1,CertificateValidity)GETDATE() AND IsOnDuty=1"; DataTable dt = SQLHelper.GetDataTableRunText(strSql, null); GridWelder.DataSource = dt; GridWelder.DataBind(); diff --git a/HJGL/Model/Model.cs b/HJGL/Model/Model.cs index c89fb8c..d7b7bc6 100644 --- a/HJGL/Model/Model.cs +++ b/HJGL/Model/Model.cs @@ -21300,7 +21300,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] public string ProjectId { get @@ -21477,10 +21477,10 @@ namespace Model private string _Acceptance; - private System.Nullable _CreatedTime; - private int _Status; + private System.Nullable _CreatedTime; + #region 鍙墿灞曟ф柟娉曞畾涔 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -21495,10 +21495,10 @@ namespace Model partial void OnQualityNoChanged(); partial void OnAcceptanceChanging(string value); partial void OnAcceptanceChanged(); - partial void OnCreatedTimeChanging(System.Nullable value); - partial void OnCreatedTimeChanged(); partial void OnStatusChanging(int value); partial void OnStatusChanged(); + partial void OnCreatedTimeChanging(System.Nullable value); + partial void OnCreatedTimeChanged(); #endregion public PMI_DelegationDetails() @@ -21606,6 +21606,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="Int NOT NULL")] + public int Status + { + get + { + return this._Status; + } + set + { + if ((this._Status != value)) + { + this.OnStatusChanging(value); + this.SendPropertyChanging(); + this._Status = value; + this.SendPropertyChanged("Status"); + this.OnStatusChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")] public System.Nullable CreatedTime { @@ -21626,26 +21646,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="status", Storage="_Status", DbType="Int NOT NULL")] - public int Status - { - get - { - return this._Status; - } - set - { - if ((this._Status != value)) - { - this.OnStatusChanging(value); - this.SendPropertyChanging(); - this._Status = value; - this.SendPropertyChanged("Status"); - this.OnStatusChanged(); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -37266,8 +37266,6 @@ namespace Model private string _ProjectId; - private System.Nullable _IsPMI; - private string _PipelineCode; private string _PipelineId; @@ -37398,22 +37396,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="isPMI", Storage="_IsPMI", DbType="Bit")] - public System.Nullable IsPMI - { - get - { - return this._IsPMI; - } - set - { - if ((this._IsPMI != value)) - { - this._IsPMI = value; - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(100)")] public string PipelineCode { @@ -39422,6 +39404,8 @@ namespace Model private string _PipingClassCode; + private string _PIPClassCode; + private string _WeldingDate; private System.Nullable _IsCancel; @@ -40530,6 +40514,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PIPClassCode", DbType="NVarChar(50)")] + public string PIPClassCode + { + get + { + return this._PIPClassCode; + } + set + { + if ((this._PIPClassCode != value)) + { + this._PIPClassCode = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldingDate", DbType="VarChar(100)")] public string WeldingDate { diff --git a/HJGL/Model/Model.csproj.user b/HJGL/Model/Model.csproj.user index 07dbd5b..55f44b9 100644 --- a/HJGL/Model/Model.csproj.user +++ b/HJGL/Model/Model.csproj.user @@ -1,6 +1,6 @@ 锘 - ProjectFiles + ShowAllFiles \ No newline at end of file