diff --git a/DataBase/版本日志/HJGLDB_DS_2025-12-09_gf.sql b/DataBase/版本日志/HJGLDB_DS_2025-12-09_gf.sql new file mode 100644 index 0000000..451e56a --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2025-12-09_gf.sql @@ -0,0 +1,185 @@ + +ALTER PROC [dbo].[HJGL_sp_StatisticsSampleTable] + @projectId NVARCHAR(50) = NULL, + @iso_isoNo VARCHAR(50) = NULL, + @isHotPress bit = NULL, + @Welded NVARCHAR(50) =NULL, + @ndtType NVARCHAR(10) = NULL, + @ndtResult NVARCHAR(20)=NULL + +AS +/*********ͳ ܴ޸2022.11.30********/ +SELECT +JointInfo.JOT_ID, +project.ProjectCode, --ʩ +IsoInfo.PressureTestPackageNo,--ѹ +IsoInfo.ISO_ID, +IsoInfo.ISO_IsoNo, --ߺ +'1-'+IsoClass.ISC_IsoName+'-'+Ser.SER_Code+'-'+Steel.STE_Code AS ISO_Code, --ܵ +IsoClass.ISC_IsoName, --ܵȼ +Ser.SER_Name, -- +IsoInfo.ISO_DesignPress, --ѹ +IsoInfo.PipeLineClass, --ܵ +JointInfo.JOT_JointNo, -- +JointInfo.JOT_JointDesc, -- +JointInfo.JOT_Location, --λ +WeldMethod.WME_Name, --ӷ +JointType.JOTY_Code, -- +JointType.JOTY_Group, +Sort1,Sort2,Sort3,Sort4,Sort5, +IsoInfo.ISO_Insulator, -- +IsoInfo.ISO_DesignTemperature, --¶ +IsoInfo.ISO_TestPress, --ѹ +(CASE WHEN WeldMat.WMT_MatCode IS NOT NULL AND WeldSilk.WMT_MatCode IS NOT NULL and WeldMat.WMT_MatCode!=WeldSilk.WMT_MatCode + THEN WeldMat.WMT_MatCode + '/' + WeldSilk.WMT_MatCode + WHEN WeldMat.WMT_MatCode IS NOT NULL THEN WeldMat.WMT_MatCode + ELSE ISNULL(WeldSilk.WMT_MatCode,'') END) AS WeldMatSilkCode, +(CASE WHEN JointInfo.JOT_CellWelder!=JointInfo.JOT_FloorWelder THEN Welder1.WED_Code+'/'+Welder2.WED_Code ELSE Welder1.WED_Code END) AS WED_Code, +--Welder1.WED_Code,-- +Steel.STE_Code,-- +Steel.STE_Name,-- +NDTRate.NDTR_Name,--Ӧ +(CASE WHEN JointInfo.Jot_WeldingDate IS NOT NULL THEN JointInfo.Jot_WeldingDate + ELSE WeldReportMain.JOT_WeldDate END) AS JOT_WeldDate, -- +JointInfo.JOT_Size,--羭 +Batch.BatchCode,-- +BatchDetail.NDT, --ⷽʽId +(CASE WHEN BatchDetail.PointType=2 THEN 'K' ELSE '' END) AS PointType,--ĺ +JointInfo.JOT_Dia,--ֱ +JointInfo.JOT_Sch, --ں +(CASE WHEN JointInfo.RT_TrustCode IS NOT NULL THEN '' ELSE '' END) AS RTTrust, --RTί +JointInfo.RT_TrustCode, --RTίе +JointInfo.RT_TrustDate AS RTTrustDate, --߼ί + + JointInfo.RTFeedbackDate, --߼ⷴ + JointInfo.RT_States AS RTTestResult,--RT + + (CASE WHEN JointInfo.UT_TrustCode IS NOT NULL THEN '' ELSE '' END) AS UTTrust,--UTί + JointInfo.UT_States AS UTTestResult,--UT + + (CASE WHEN JointInfo.MT_TrustCode IS NOT NULL THEN '' ELSE '' END) AS MTTrust,--MTί + JointInfo.MT_States AS MTTestResult,--MT + + (CASE WHEN JointInfo.PT_TrustCode IS NOT NULL THEN '' ELSE '' END) AS PTTrust,--PTί + JointInfo.PT_TrustCode, --PTίе + JointInfo.PT_TrustDate, --PTί + JointInfo.PT_States AS PTTestResult,--PT + + (CASE WHEN JointInfo.PAUT_TrustCode IS NOT NULL THEN '' ELSE '' END) AS PAUTTrust, --PAUTί + JointInfo.PAUT_TrustCode, --PAUTίе + JointInfo.PAUT_TrustDate AS PAUTTrustDate, --PAUTί + JointInfo.PAUT_States AS PAUTTestResult,--PAUT + + (CASE WHEN (SELECT TOP 1 UnableCheck FROM dbo.HJGL_CH_TrustItem c WHERE c.JOT_ID=JointInfo.JOT_ID )=1 + THEN '' ELSE '' END) AS UnableCheck, + (SELECT TOP 1 UnableCheckReason FROM dbo.HJGL_CH_TrustItem c WHERE c.JOT_ID=JointInfo.JOT_ID ) AS UnableCheckReason, + +(CASE WHEN JointInfo.ProessTypes like '%4|5%' Then 'Ӧȴ,ȶ' +WHEN JointInfo.ProessTypes like '%4%' Then 'Ӧȴ' +WHEN JointInfo.ProessTypes like '%5%' Then 'ȶ' + ELSE '' END) AS ProessTypes,--ȴ +(case when JointInfo.ProessTypes like '%4%' or JointInfo.ProessTypes like '%5%' then 'Y' +else 'N' end) as IS_Proess, +(case when JointInfo.ProessTypes like '%1%' then 'Y' +else '' end) as IS_Preheating, +(select top 1 HotProessTrustCode from HJGL_CH_HotProessTrust t left join HJGL_CH_HotProessTrustItem i on t.HotProessTrustId=i.HotProessTrustId where i.JOT_ID=JointInfo.JOT_ID order by TrustDate desc) +as HotProessTrustCode, --ȴίб +JointInfo.HotProessTrustDate,--ȴίʱ +JointInfo.HotResultDate,--ȴʱ +(select top 1 HotHardCode from HJGL_CH_HardTestReport t left join HJGL_CH_HardTestReportItem i on t.HardTestReportId=i.HardTestReportId where i.JOT_ID=JointInfo.JOT_ID order by TestDate desc) +as HotHardCode, --Ӳίб +JointInfo.HardTrustDate,--Ӳίʱ +JointInfo.HardResultDate,--Ӳȷʱ +(case when JointInfo.HardTestResultOK=1 then 'ϸ' when JointInfo.HardTestResultOK=0 then 'ϸ' else '' end) as HardResult,--Ӳȼ +BatchDetail.BatchDetailId +FROM dbo.HJGL_PW_JointInfo AS JointInfo +LEFT JOIN DBO.HJGL_BO_BatchDetail AS BatchDetail ON JointInfo.JOT_ID = BatchDetail.JOT_ID +LEFT JOIN DBO.HJGL_PW_IsoInfo AS IsoInfo ON IsoInfo.ISO_ID = JointInfo.ISO_ID +LEFT JOIN HJGL_BS_WeldMethod AS WeldMethod ON WeldMethod.WME_ID = JointInfo.WME_ID +LEFT JOIN HJGL_BS_JointType AS JointType ON JointType.JOTY_ID=JointInfo.JOTY_ID +LEFT JOIN DBO.HJGL_BO_Batch AS Batch ON Batch.BatchId = BatchDetail.BatchId +LEFT JOIN dbo.Base_Project project ON project.ProjectId=JointInfo.ProjectId +LEFT JOIN dbo.HJGL_BS_Steel AS Steel ON Steel.STE_ID = JointInfo.STE_ID +LEFT JOIN DBO.HJGL_BS_Welder AS Welder1 ON Welder1.WED_ID = JointInfo.JOT_CellWelder +LEFT JOIN DBO.HJGL_BS_Welder AS Welder2 ON Welder2.WED_ID = JointInfo.JOT_FloorWelder +LEFT JOIN DBO.HJGL_BO_WeldReportMain AS WeldReportMain ON WeldReportMain.DReportID = JointInfo.DReportID +LEFT JOIN dbo.HJGL_BS_NDTRate AS NDTRate ON NDTRate.NDTR_ID = JointInfo.NDTR_ID +LEFT JOIN dbo.HJGL_BS_IsoClass AS IsoClass ON IsoClass.ISC_ID =IsoInfo.ISC_ID +LEFT JOIN dbo.HJGL_BS_Service AS Ser ON Ser.SER_ID = IsoInfo.SER_ID +LEFT JOIN HJGL_BS_WeldMaterial AS WeldMat ON WeldMat.WMT_ID=JointInfo.JOT_WeldMat +LEFT JOIN HJGL_BS_WeldMaterial AS WeldSilk ON WeldSilk.WMT_ID=JointInfo.JOT_WeldSilk + +WHERE (JointInfo.ProjectId=@projectId OR @projectId IS NULL) + AND ((CASE WHEN @ndtType='RT' THEN JointInfo.RT_TrustCode + WHEN @ndtType='PT' THEN JointInfo.PT_TrustCode + WHEN @ndtType='MT' THEN JointInfo.MT_TrustCode + WHEN @ndtType='UT' THEN JointInfo.UT_TrustCode + WHEN @ndtType='PAUT' THEN JointInfo.PAUT_TrustCode END) IS NOT NULL OR @ndtType IS NULL) + AND ((CASE WHEN @ndtType='RT' AND @ndtResult IS NOT NULL THEN JointInfo.RT_States + WHEN @ndtType='PT' AND @ndtResult IS NOT NULL THEN JointInfo.PT_States + WHEN @ndtType='MT' AND @ndtResult IS NOT NULL THEN JointInfo.MT_States + WHEN @ndtType='UT' AND @ndtResult IS NOT NULL THEN JointInfo.UT_States + WHEN @ndtType='PAUT' AND @ndtResult IS NOT NULL THEN JointInfo.PAUT_States END) =@ndtResult OR @ndtResult IS NULL) +AND ((case when JointInfo.DReportID IS NOT NULL then '1' else '2' end)=@Welded OR @Welded IS NULL) +AND (IsoInfo.ISO_IsoNo =@iso_isoNo OR @iso_isoNo IS NULL) +AND (((SELECT TOP 1 TrustDate from dbo.HJGL_CH_HotProessTrustItem a + WHERE a.JOT_ID=BatchDetail.JOT_ID and (a.ProessTypes='4' OR a.ProessTypes='5')) IS NOT NULL + AND @isHotPress=1) OR @isHotPress IS NULL) +ORDER BY project.ProjectCode,IsoInfo.ISO_IsoNo,JointInfo.JOT_JointNo + + + + +GO + + +INSERT INTO dbo.Sys_Menu(MenuId, MenuName, Url, SortIndex, SuperMenu,MenuModule) +VALUES ('19FC40C2-4FDC-44DC-A785-85491BACAC6D','ʱ','HJGL/MaterialManage/QualityCertificate.aspx',5,'4105B536-E0E9-4CD3-6666-27BB147603FA','7') +GO +/*ʱ*/ +INSERT INTO dbo.ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('1B26BF66-1CEE-42B0-8477-F0A74AE2B404','19FC40C2-4FDC-44DC-A785-85491BACAC6D','',1) +INSERT INTO dbo.ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('B4AC36B0-DD9B-48A4-AE55-8DFED0C40917','19FC40C2-4FDC-44DC-A785-85491BACAC6D','޸',2) +INSERT INTO dbo.ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('4ADD8C65-3085-444E-BA2D-A086B04DD54C','19FC40C2-4FDC-44DC-A785-85491BACAC6D','ɾ',3) +INSERT INTO dbo.ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('03A9A0A8-62E5-405B-924C-0DDD40F12CB4','19FC40C2-4FDC-44DC-A785-85491BACAC6D','',4) +go + + + +CREATE TABLE [dbo].[Weld_QualityCertificate]( + [QualityCertificateId] [nvarchar](50) NOT NULL, + [WeldId] [nvarchar](50) NULL, + [HeartNo] [nvarchar](50) NULL, + [Warrantybook] [nvarchar](50) NULL, + [CompileMan] [nvarchar](50) NULL, + [CompileDate] [datetime] NULL, + CONSTRAINT [PK_Weld_QualityCertificate] PRIMARY KEY CLUSTERED +( + [QualityCertificateId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_QualityCertificate', @level2type=N'COLUMN',@level2name=N'QualityCertificateId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_QualityCertificate', @level2type=N'COLUMN',@level2name=N'WeldId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_QualityCertificate', @level2type=N'COLUMN',@level2name=N'HeartNo' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ա' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_QualityCertificate', @level2type=N'COLUMN',@level2name=N'Warrantybook' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_QualityCertificate', @level2type=N'COLUMN',@level2name=N'CompileMan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_QualityCertificate', @level2type=N'COLUMN',@level2name=N'CompileDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_QualityCertificate' +GO + + + diff --git a/HJGL_DS/BLL/BLL.csproj b/HJGL_DS/BLL/BLL.csproj index dce8a56..7c9a08d 100644 --- a/HJGL_DS/BLL/BLL.csproj +++ b/HJGL_DS/BLL/BLL.csproj @@ -218,6 +218,7 @@ + diff --git a/HJGL_DS/BLL/Common/Const.cs b/HJGL_DS/BLL/Common/Const.cs index f721b55..816e79d 100644 --- a/HJGL_DS/BLL/Common/Const.cs +++ b/HJGL_DS/BLL/Common/Const.cs @@ -1682,6 +1682,11 @@ namespace BLL #endregion #region 焊条烘烤记录 + /// + /// 焊材质保书 + /// + public const string CLGL_QualityCertificateMenuId = "19FC40C2-4FDC-44DC-A785-85491BACAC6D"; + /// /// 焊条烘烤记录 /// diff --git a/HJGL_DS/BLL/HJGL/MaterialManage/QualityCertificateService.cs b/HJGL_DS/BLL/HJGL/MaterialManage/QualityCertificateService.cs new file mode 100644 index 0000000..7957157 --- /dev/null +++ b/HJGL_DS/BLL/HJGL/MaterialManage/QualityCertificateService.cs @@ -0,0 +1,73 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Collections; + +namespace BLL +{ + public static class QualityCertificateService + { + /// + /// 根据焊材质保书Id获取焊材质保书信息 + /// + /// 焊材质保书Id + /// + public static Model.Weld_QualityCertificate GetQualityCertificateByQualityCertificateId(string qualityCertificateId) + { + Model.SGGLDB db = Funs.DB; + var QualityCertificate = db.Weld_QualityCertificate.FirstOrDefault(e => e.QualityCertificateId == qualityCertificateId); + return QualityCertificate; + } + + /// + /// 添加焊材质保书 + /// + /// + public static void AddQualityCertificate(Model.Weld_QualityCertificate qualityCertificate) + { + Model.SGGLDB db = Funs.DB; + Model.Weld_QualityCertificate newQualityCertificate = new Model.Weld_QualityCertificate(); + + newQualityCertificate.QualityCertificateId = qualityCertificate.QualityCertificateId; + newQualityCertificate.WeldId = qualityCertificate.WeldId; + newQualityCertificate.HeartNo = qualityCertificate.HeartNo; + newQualityCertificate.Warrantybook = qualityCertificate.Warrantybook; + newQualityCertificate.CompileMan = qualityCertificate.CompileMan; + newQualityCertificate.CompileDate = qualityCertificate.CompileDate; + + db.Weld_QualityCertificate.InsertOnSubmit(newQualityCertificate); + db.SubmitChanges(); + } + + /// + /// 修改焊丝烘烤记录 + /// + /// + public static void UpdateQualityCertificate(Model.Weld_QualityCertificate qualityCertificate) + { + Model.SGGLDB db = Funs.DB; + Model.Weld_QualityCertificate newQualityCertificate = db.Weld_QualityCertificate.First(e => e.QualityCertificateId == qualityCertificate.QualityCertificateId); + + newQualityCertificate.WeldId = qualityCertificate.WeldId; + newQualityCertificate.HeartNo = qualityCertificate.HeartNo; + newQualityCertificate.Warrantybook = qualityCertificate.Warrantybook; + newQualityCertificate.CompileMan = qualityCertificate.CompileMan; + newQualityCertificate.CompileDate = qualityCertificate.CompileDate; + + db.SubmitChanges(); + } + + /// + /// 删除焊丝烘烤记录 + /// + /// + public static void DeleteQualityCertificate(string qualityCertificateId) + { + Model.SGGLDB db = Funs.DB; + Model.Weld_QualityCertificate qualityCertificate = db.Weld_QualityCertificate.First(e => e.QualityCertificateId == qualityCertificateId); + db.Weld_QualityCertificate.DeleteOnSubmit(qualityCertificate); + db.SubmitChanges(); + } + } +} diff --git a/HJGL_DS/BLL/WeldMat/Stock/StockInitService.cs b/HJGL_DS/BLL/WeldMat/Stock/StockInitService.cs index 67b8c85..ba5a5ca 100644 --- a/HJGL_DS/BLL/WeldMat/Stock/StockInitService.cs +++ b/HJGL_DS/BLL/WeldMat/Stock/StockInitService.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using System.Web.UI.WebControls; namespace BLL { @@ -77,5 +78,45 @@ namespace BLL { return (from x in Funs.DB.Weld_StockInit where x.WeldId == weldId select x).Count(); } + + /// + /// 加载批号下拉框 + /// + /// + /// + public static void InitHeartNo(FineUIPro.DropDownList dropName, bool isShowPlease) + { + dropName.DataValueField = "Value"; + dropName.DataTextField = "Text"; + dropName.DataSource = GetHeartNoList(); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + + /// + /// 获取施工部用户 + /// + /// + /// + public static ListItem[] GetHeartNoList() + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + var ls = (from x in db.Weld_StockIn + select new { + x.HeartNo, + x.Warrantybook + }).Distinct().ToList(); + ListItem[] lis = new ListItem[ls.Count()]; + for (int i = 0; i < ls.Count(); i++) + { + lis[i] = new ListItem(ls[i].HeartNo ?? "", ls[i].Warrantybook.ToString()); + } + return lis; + } + } } } diff --git a/HJGL_DS/FineUIPro.Web/ErrLog.txt b/HJGL_DS/FineUIPro.Web/ErrLog.txt index 270b3e2..b27fd49 100644 --- a/HJGL_DS/FineUIPro.Web/ErrLog.txt +++ b/HJGL_DS/FineUIPro.Web/ErrLog.txt @@ -35,3 +35,26 @@ IP地址:::1 出错时间:11/11/2025 15:17:16 + +错误信息开始=====> +错误类型:IndexOutOfRangeException +错误信息:无法找到列 CompileDate。 +错误堆栈: + 在 System.Data.DataTable.ParseSortString(String sortString) + 在 System.Data.DataView.CheckSort(String sort) + 在 System.Data.DataView.set_Sort(String value) + 在 FineUIPro.Web.PageBase.GetPagedDataTable(Grid Grid1, DataTable tb) 位置 D:\工作\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\common\PageBase.cs:行号 328 + 在 FineUIPro.Web.HJGL.MaterialManage.QualityCertificate.BindGrid() 位置 D:\工作\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\HJGL\MaterialManage\QualityCertificate.aspx.cs:行号 63 + 在 FineUIPro.Web.HJGL.MaterialManage.QualityCertificate.Page_Load(Object sender, EventArgs e) 位置 D:\工作\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\HJGL\MaterialManage\QualityCertificate.aspx.cs:行号 31 + 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) + 在 System.EventHandler.Invoke(Object sender, EventArgs e) + 在 System.Web.UI.Control.OnLoad(EventArgs e) + 在 System.Web.UI.Control.LoadRecursive() + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:12/09/2025 16:42:15 +出错文件:http://localhost:64304/HJGL/MaterialManage/QualityCertificate.aspx +IP地址:::1 +操作人员:管理员 + +出错时间:12/09/2025 16:42:15 + diff --git a/HJGL_DS/FineUIPro.Web/FileUpload/WeldMat/QualityCertificate/639008956132961833_焊口信息导入模板.xls b/HJGL_DS/FineUIPro.Web/FileUpload/WeldMat/QualityCertificate/639008956132961833_焊口信息导入模板.xls new file mode 100644 index 0000000..2bb2a2f Binary files /dev/null and b/HJGL_DS/FineUIPro.Web/FileUpload/WeldMat/QualityCertificate/639008956132961833_焊口信息导入模板.xls differ diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj index a3d9ce2..a41bcc1 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj @@ -1136,6 +1136,8 @@ + + @@ -5895,6 +5897,20 @@ FluxReleaseRecords.aspx + + QualityCertificate.aspx + ASPXCodeBehind + + + QualityCertificate.aspx + + + QualityCertificateEdit.aspx + ASPXCodeBehind + + + QualityCertificateEdit.aspx + SolderBakingRecordProject.aspx ASPXCodeBehind diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user index 8aa7c11..bf54086 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -2,7 +2,7 @@ true - Release|Any CPU + Debug|Any CPU diff --git a/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificate.aspx b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificate.aspx new file mode 100644 index 0000000..d594206 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificate.aspx @@ -0,0 +1,134 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="QualityCertificate.aspx.cs" Inherits="FineUIPro.Web.HJGL.MaterialManage.QualityCertificate" %> + + + + + + 焊材质保书 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificate.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificate.aspx.cs new file mode 100644 index 0000000..c0bb619 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificate.aspx.cs @@ -0,0 +1,288 @@ +using System; +using System.Collections.Generic; +using System.Data.SqlClient; +using System.Data; +using System.Linq; +using BLL; + +namespace FineUIPro.Web.HJGL.MaterialManage +{ + public partial class QualityCertificate : PageBase + { + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + + this.drpWeldType.DataTextField = "WeldTypeName"; + this.drpWeldType.DataValueField = "WeldTypeId"; + this.drpWeldType.DataSource = BLL.WeldTypeService.GetWeldTypeList(); + this.drpWeldType.DataBind(); + Funs.FineUIPleaseSelect(this.drpWeldType); + + // 绑定表格 + BindGrid(); + } + } + + /// + /// 绑定数据 + /// + private void BindGrid() + { + string strSql = @"SELECT QC.QualityCertificateId,QC.WeldId,QC.Warrantybook,Weld.WeldCode,Weld.WeldName,Weld.WeldSpec,QC.HeartNo,QC.CompileDate, + WeldType.WeldTypeName + FROM dbo.Weld_QualityCertificate AS QC + LEFT JOIN dbo.Weld_WeldInfo AS Weld ON Weld.WeldId=QC.WeldId + LEFT JOIN dbo.Weld_WeldType AS WeldType ON WeldType.WeldTypeId = Weld.WeldTypeId + WHERE 1=1 "; + List listStr = new List(); + + if (!string.IsNullOrEmpty(this.txtWeldName.Text.Trim())) + { + strSql += " AND Weld.WeldName LIKE @WeldName"; + listStr.Add(new SqlParameter("@WeldName", "%" + this.txtWeldName.Text.Trim() + "%")); + } + if (drpWeldType.SelectedValue != BLL.Const._Null) + { + strSql += " AND Weld.WeldTypeId = @WeldTypeId"; + listStr.Add(new SqlParameter("@WeldTypeId", drpWeldType.SelectedValue)); + } + if (!string.IsNullOrEmpty(this.txtHeartNo.Text.Trim())) + { + strSql += " AND QC.HeartNo LIKE @HeartNo"; + listStr.Add(new SqlParameter("@HeartNo", "%" + this.txtHeartNo.Text.Trim() + "%")); + } + if (!string.IsNullOrEmpty(this.txtWarrantybook.Text.Trim())) + { + strSql += " AND QC.Warrantybook LIKE @Warrantybook"; + listStr.Add(new SqlParameter("@Warrantybook", "%" + this.txtWarrantybook.Text.Trim() + "%")); + } + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + + Grid1.RecordCount = tb.Rows.Count; + //tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + #endregion + + #region 表头过滤 + protected void Grid1_FilterChange(object sender, EventArgs e) + { + BindGrid(); + } + #endregion + + #region 页索引改变事件 + /// + /// 页索引改变事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + #endregion + + #region 排序 + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + Grid1.SortDirection = e.SortDirection; + Grid1.SortField = e.SortField; + BindGrid(); + } + #endregion + + #region 分页选择下拉改变事件 + /// + /// 分页选择下拉改变事件 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + #endregion + + #region 弹出编辑窗口关闭事件 + /// + /// 弹出编辑窗体关闭事件 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + #endregion + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + BindGrid(); + } + #endregion + + #region 增加按钮 + /// + /// 增加按钮 + /// + /// + /// + protected void btnNew_Click(object sender, EventArgs e) + { + if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.CLGL_QualityCertificateMenuId, BLL.Const.BtnAdd)) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("QualityCertificateEdit.aspx?QualityCertificateId={0}", string.Empty, "编辑 - "))); + } + else + { + Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + return; + } + } + #endregion + + #region 编辑 + /// + /// 双击Grid事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + this.EditData(); + } + + /// + /// 编辑按钮 + /// + /// + /// + protected void btnMenuEdit_Click(object sender, EventArgs e) + { + this.EditData(); + } + + /// + /// 编辑数据方法 + /// + private void EditData() + { + if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.CLGL_QualityCertificateMenuId, BLL.Const.BtnModify)) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + + string id = Grid1.SelectedRowID; + if (!string.IsNullOrEmpty(id)) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("QualityCertificateEdit.aspx?QualityCertificateId={0}", id, "编辑 - "))); + } + } + else + { + Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + return; + } + } + #endregion + + #region 删除 + /// + /// 右键删除事件 + /// + /// + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + this.DeleteData(); + } + + /// + /// 删除方法 + /// + private void DeleteData() + { + if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.CLGL_QualityCertificateMenuId, BLL.Const.BtnDelete)) + { + if (Grid1.SelectedRowIndexArray.Length == 1) + { + string rowID = Grid1.SelectedRowID.ToString(); + if (this.judgementDelete(rowID)) + { + CommonService.DeleteAttachFileById(rowID);//删除附件 + BLL.QualityCertificateService.DeleteQualityCertificate(rowID); + BLL.Sys_LogService.AddLog(BLL.Const.System_7, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "删除焊材质保书"); + } + } + else + { + Alert.ShowInTop("请选择要删除的记录！", MessageBoxIcon.Warning); + return; + } + this.BindGrid(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + + } + else + { + Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + return; + } + } + + /// + /// 判断是否可删除 + /// + /// + /// + /// + private bool judgementDelete(string rowID) + { + string content = string.Empty; + //var q = from x in Funs.DB.Weld_UsingMat where x.StockInId == rowID select x; + //if (q.Count() > 0) + //{ + // content = "该入库材料已有领用，不能删除！"; + //} + if (string.IsNullOrEmpty(content)) + { + return true; + } + else + { + Alert.ShowInTop(content); + return false; + } + } + #endregion + } +} \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificate.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificate.aspx.designer.cs new file mode 100644 index 0000000..f2d2957 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificate.aspx.designer.cs @@ -0,0 +1,213 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HJGL.MaterialManage { + + + public partial class QualityCertificate { + + /// + /// 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; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// txtWeldName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWeldName; + + /// + /// drpWeldType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpWeldType; + + /// + /// txtHeartNo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtHeartNo; + + /// + /// txtWarrantybook 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWarrantybook; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// lblNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblNumber; + + /// + /// 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; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuEdit; + + /// + /// btnMenuDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; + } +} diff --git a/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificateEdit.aspx b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificateEdit.aspx new file mode 100644 index 0000000..d71eac2 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificateEdit.aspx @@ -0,0 +1,79 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="QualityCertificateEdit.aspx.cs" Inherits="FineUIPro.Web.HJGL.MaterialManage.QualityCertificateEdit" %> + + + + + + 编辑焊材质保书 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificateEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificateEdit.aspx.cs new file mode 100644 index 0000000..4fe0cdb --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificateEdit.aspx.cs @@ -0,0 +1,216 @@ +using System; +using System.Linq; +using BLL; + +namespace FineUIPro.Web.HJGL.MaterialManage +{ + public partial class QualityCertificateEdit : PageBase + { + #region 定义项 + /// + /// 主键 + /// + private string QualityCertificateId + { + get + { + return (string)ViewState["QualityCertificateId"]; + } + set + { + ViewState["QualityCertificateId"] = value; + } + } + #endregion + + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); + this.QualityCertificateId = Request.Params["QualityCertificateId"]; + StockInitService.InitHeartNo(this.drpHeartNo, true); + if (!string.IsNullOrEmpty(this.QualityCertificateId)) + { + this.hdQualityCertificateId.Text = this.QualityCertificateId; + Model.Weld_QualityCertificate qc = BLL.QualityCertificateService.GetQualityCertificateByQualityCertificateId(this.QualityCertificateId); + if (qc != null) + { + if (!string.IsNullOrEmpty(qc.WeldId)) + { + this.hdWeldId.Text = qc.WeldId; + var weld = BLL.WeldInfoService.GetWeldInfoById(qc.WeldId); + if (weld != null) + { + //this.txtWeldCode.Text = weld.WeldCode; + this.txtWeldName.Text = weld.WeldName; + this.txtWeldSpec.Text = weld.WeldSpec; + if (!string.IsNullOrEmpty(weld.WeldTypeId)) + { + var weldType = BLL.WeldTypeService.GetWeldTypeById(weld.WeldTypeId); + if (weldType != null) + { + this.txtWeldType.Text = weldType.WeldTypeName; + } + } + } + this.drpHeartNo.SelectedItem.Text = qc.HeartNo; + this.txtWarrantybook.Text = qc.Warrantybook; + } + } + } + else + { + + } + } + } + #endregion + + #region 保存 + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (this.hdWeldId.Text == string.Empty) + { + Alert.ShowInTop("请选择焊材牌号！", MessageBoxIcon.Warning); + return; + } + if (this.drpHeartNo.SelectedValue == BLL.Const._Null) + { + Alert.ShowInTop("请选择批号！", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrEmpty(this.hdQualityCertificateId.Text.Trim())) + { + Alert.ShowInTop("请上传质保书附件！", MessageBoxIcon.Warning); + return; + } + SaveData(); + ShowNotify("保存成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + /// + /// 保存数据 + /// + private void SaveData() + { + Model.Weld_QualityCertificate qc = new Model.Weld_QualityCertificate(); + if (!string.IsNullOrEmpty(this.hdWeldId.Text.Trim())) + { + qc.WeldId = this.hdWeldId.Text.Trim(); + } + + qc.Warrantybook = this.txtWarrantybook.Text.Trim(); + //qc.Number = txtNumber.Text.Trim(); + qc.HeartNo = drpHeartNo.SelectedItem.Text.Trim(); + qc.Warrantybook = txtWarrantybook.Text.Trim(); + qc.CompileMan = this.CurrUser.UserId; + qc.CompileDate = DateTime.Now; + if (!string.IsNullOrEmpty(this.QualityCertificateId)) + { + qc.QualityCertificateId = this.QualityCertificateId; + BLL.QualityCertificateService.UpdateQualityCertificate(qc); + BLL.Sys_LogService.AddLog(Const.System_7, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "修改焊材质保书"); + } + else + { + if (string.IsNullOrWhiteSpace(this.hdQualityCertificateId.Text.Trim())) + { + qc.QualityCertificateId = SQLHelper.GetNewID(typeof(Model.Weld_QualityCertificate)); + } + else + { + qc.QualityCertificateId = this.hdQualityCertificateId.Text.Trim(); + } + BLL.QualityCertificateService.AddQualityCertificate(qc); + BLL.Sys_LogService.AddLog(Const.System_7, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "添加焊材质保书"); + } + } + #endregion + + #region 附件上传 + /// + /// 上传附件资源 + /// + /// + /// + protected void btnAttachUrl2_Click(object sender, EventArgs e) + { + string edit = "0"; // 表示能打开附件上传窗口，但不能上传附件 + if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.CLGL_QualityCertificateMenuId, BLL.Const.BtnSave)) + { + if (string.IsNullOrEmpty(this.hdQualityCertificateId.Text.Trim())) + { + this.hdQualityCertificateId.Text = SQLHelper.GetNewID(); + } + edit = "1"; + PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/WeldMat/QualityCertificate&menuId={1}&edit={2}", this.hdQualityCertificateId.Text, Const.CLGL_QualityCertificateMenuId, edit))); + } + } + #endregion + + #region 查找焊材信息 + /// + /// 查找焊材信息 + /// + /// + /// + protected void btnSelect_Click(object sender, EventArgs e) + { + string window = String.Format("../../WeldMat/Stock/ShowWeldInfo.aspx", "编辑 - "); + PageContext.RegisterStartupScript(Window1.GetSaveStateReference(this.hdWeldId.ClientID) + Window1.GetShowReference(window)); + } + + #region 弹出编辑窗口关闭事件 + /// + /// 弹出编辑窗体关闭事件 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + if (!string.IsNullOrEmpty(this.hdWeldId.Text)) + { + var weld = BLL.WeldInfoService.GetWeldInfoById(this.hdWeldId.Text); + if (weld != null) + { + //this.txtWeldCode.Text = weld.WeldCode; + this.txtWeldName.Text = weld.WeldName; + this.txtWeldSpec.Text = weld.WeldSpec; + if (!string.IsNullOrEmpty(weld.WeldTypeId)) + { + var weldType = BLL.WeldTypeService.GetWeldTypeById(weld.WeldTypeId); + if (weldType != null) + { + this.txtWeldType.Text = weldType.WeldTypeName; + } + } + } + } + } + #endregion + + #endregion + + protected void drpHeartNo_SelectedIndexChanged(object sender, EventArgs e) + { + this.txtWarrantybook.Text = string.Empty; + if (this.drpHeartNo.SelectedValue != BLL.Const._Null) + { + this.txtWarrantybook.Text = this.drpHeartNo.SelectedValue; + } + } + } +} \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificateEdit.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificateEdit.aspx.designer.cs new file mode 100644 index 0000000..327a2bf --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificateEdit.aspx.designer.cs @@ -0,0 +1,168 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HJGL.MaterialManage { + + + public partial class QualityCertificateEdit { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// hdWeldId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdWeldId; + + /// + /// hdQualityCertificateId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdQualityCertificateId; + + /// + /// txtWeldName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWeldName; + + /// + /// btnSelect 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSelect; + + /// + /// txtWeldSpec 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWeldSpec; + + /// + /// drpHeartNo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpHeartNo; + + /// + /// txtWeldType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWeldType; + + /// + /// txtWarrantybook 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtWarrantybook; + + /// + /// UploadAttach2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.LinkButton UploadAttach2; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Window2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window2; + } +} diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/StatisticsSampleTable.aspx b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/StatisticsSampleTable.aspx index 55a8105..6cb1e16 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/StatisticsSampleTable.aspx +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/StatisticsSampleTable.aspx @@ -50,7 +50,7 @@ diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx index e05784d..60cfb7c 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx +++ b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx @@ -45,7 +45,8 @@ - + diff --git a/HJGL_DS/Model/Model.cs b/HJGL_DS/Model/Model.cs index d6a9378..84fd930 100644 --- a/HJGL_DS/Model/Model.cs +++ b/HJGL_DS/Model/Model.cs @@ -515,6 +515,9 @@ namespace Model partial void InsertWeld_ProjectPlan(Weld_ProjectPlan instance); partial void UpdateWeld_ProjectPlan(Weld_ProjectPlan instance); partial void DeleteWeld_ProjectPlan(Weld_ProjectPlan instance); + partial void InsertWeld_QualityCertificate(Weld_QualityCertificate instance); + partial void UpdateWeld_QualityCertificate(Weld_QualityCertificate instance); + partial void DeleteWeld_QualityCertificate(Weld_QualityCertificate instance); partial void InsertWeld_RecycleMat(Weld_RecycleMat instance); partial void UpdateWeld_RecycleMat(Weld_RecycleMat instance); partial void DeleteWeld_RecycleMat(Weld_RecycleMat instance); @@ -2316,6 +2319,14 @@ namespace Model } } + public System.Data.Linq.Table View_UnitPerformance + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table View_UsePosition { get @@ -2332,6 +2343,14 @@ namespace Model } } + public System.Data.Linq.Table Weld_QualityCertificate + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Weld_RecycleMat { get @@ -105634,6 +105653,8 @@ namespace Model private string _Welder; + private string _WED_Unit; + private string _STE_ID; private string _DReportID; @@ -105752,6 +105773,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WED_Unit", DbType="NVarChar(50)")] + public string WED_Unit + { + get + { + return this._WED_Unit; + } + set + { + if ((this._WED_Unit != value)) + { + this._WED_Unit = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_STE_ID", DbType="VarChar(50)")] public string STE_ID { @@ -108678,6 +108715,357 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_UnitPerformance")] + public partial class View_UnitPerformance + { + + private System.Nullable _Id; + + private string _ProjectCode; + + private string _WED_Unit; + + private string _UnitCode; + + private string _UnitName; + + private System.Nullable _TotalSize; + + private int _TotalJoint; + + private int _JointNum1; + + private System.Nullable _JointPassNum1; + + private int _RepairJoint1; + + private int _RepairJoint2; + + private int _RepairJoint3; + + private System.Nullable _JointPassRate; + + private int _Totalfilm; + + private System.Nullable _TotalPassfilm; + + private int _RepairFilm1; + + private int _RepairFilm2; + + private int _RepairFilm3; + + private System.Nullable _JointFilmPassRate; + + public View_UnitPerformance() + { + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="UniqueIdentifier")] + public System.Nullable Id + { + get + { + return this._Id; + } + set + { + if ((this._Id != value)) + { + this._Id = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectCode", DbType="VarChar(1) NOT NULL", CanBeNull=false)] + public string ProjectCode + { + get + { + return this._ProjectCode; + } + set + { + if ((this._ProjectCode != value)) + { + this._ProjectCode = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WED_Unit", DbType="NVarChar(50)")] + public string WED_Unit + { + get + { + return this._WED_Unit; + } + set + { + if ((this._WED_Unit != value)) + { + this._WED_Unit = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitCode", DbType="NVarChar(20)")] + public string UnitCode + { + get + { + return this._UnitCode; + } + set + { + if ((this._UnitCode != value)) + { + this._UnitCode = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitName", DbType="NVarChar(50)")] + public string UnitName + { + get + { + return this._UnitName; + } + set + { + if ((this._UnitName != value)) + { + this._UnitName = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="totalSize", Storage="_TotalSize", DbType="Decimal(19,2)")] + public System.Nullable TotalSize + { + get + { + return this._TotalSize; + } + set + { + if ((this._TotalSize != value)) + { + this._TotalSize = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="totalJoint", Storage="_TotalJoint", DbType="Int NOT NULL")] + public int TotalJoint + { + get + { + return this._TotalJoint; + } + set + { + if ((this._TotalJoint != value)) + { + this._TotalJoint = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JointNum1", DbType="Int NOT NULL")] + public int JointNum1 + { + get + { + return this._JointNum1; + } + set + { + if ((this._JointNum1 != value)) + { + this._JointNum1 = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JointPassNum1", DbType="Int")] + public System.Nullable JointPassNum1 + { + get + { + return this._JointPassNum1; + } + set + { + if ((this._JointPassNum1 != value)) + { + this._JointPassNum1 = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RepairJoint1", DbType="Int NOT NULL")] + public int RepairJoint1 + { + get + { + return this._RepairJoint1; + } + set + { + if ((this._RepairJoint1 != value)) + { + this._RepairJoint1 = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RepairJoint2", DbType="Int NOT NULL")] + public int RepairJoint2 + { + get + { + return this._RepairJoint2; + } + set + { + if ((this._RepairJoint2 != value)) + { + this._RepairJoint2 = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RepairJoint3", DbType="Int NOT NULL")] + public int RepairJoint3 + { + get + { + return this._RepairJoint3; + } + set + { + if ((this._RepairJoint3 != value)) + { + this._RepairJoint3 = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JointPassRate", DbType="Decimal(19,3)")] + public System.Nullable JointPassRate + { + get + { + return this._JointPassRate; + } + set + { + if ((this._JointPassRate != value)) + { + this._JointPassRate = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="totalfilm", Storage="_Totalfilm", DbType="Int NOT NULL")] + public int Totalfilm + { + get + { + return this._Totalfilm; + } + set + { + if ((this._Totalfilm != value)) + { + this._Totalfilm = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="totalPassfilm", Storage="_TotalPassfilm", DbType="Int")] + public System.Nullable TotalPassfilm + { + get + { + return this._TotalPassfilm; + } + set + { + if ((this._TotalPassfilm != value)) + { + this._TotalPassfilm = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="repairFilm1", Storage="_RepairFilm1", DbType="Int NOT NULL")] + public int RepairFilm1 + { + get + { + return this._RepairFilm1; + } + set + { + if ((this._RepairFilm1 != value)) + { + this._RepairFilm1 = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="repairFilm2", Storage="_RepairFilm2", DbType="Int NOT NULL")] + public int RepairFilm2 + { + get + { + return this._RepairFilm2; + } + set + { + if ((this._RepairFilm2 != value)) + { + this._RepairFilm2 = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="repairFilm3", Storage="_RepairFilm3", DbType="Int NOT NULL")] + public int RepairFilm3 + { + get + { + return this._RepairFilm3; + } + set + { + if ((this._RepairFilm3 != value)) + { + this._RepairFilm3 = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JointFilmPassRate", DbType="Decimal(19,3)")] + public System.Nullable JointFilmPassRate + { + get + { + return this._JointFilmPassRate; + } + set + { + if ((this._JointFilmPassRate != value)) + { + this._JointFilmPassRate = value; + } + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_UsePosition")] public partial class View_UsePosition { @@ -108987,6 +109375,188 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Weld_QualityCertificate")] + public partial class Weld_QualityCertificate : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _QualityCertificateId; + + private string _WeldId; + + private string _HeartNo; + + private string _Warrantybook; + + private string _CompileMan; + + private System.Nullable _CompileDate; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnQualityCertificateIdChanging(string value); + partial void OnQualityCertificateIdChanged(); + partial void OnWeldIdChanging(string value); + partial void OnWeldIdChanged(); + partial void OnHeartNoChanging(string value); + partial void OnHeartNoChanged(); + partial void OnWarrantybookChanging(string value); + partial void OnWarrantybookChanged(); + partial void OnCompileManChanging(string value); + partial void OnCompileManChanged(); + partial void OnCompileDateChanging(System.Nullable value); + partial void OnCompileDateChanged(); + #endregion + + public Weld_QualityCertificate() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualityCertificateId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string QualityCertificateId + { + get + { + return this._QualityCertificateId; + } + set + { + if ((this._QualityCertificateId != value)) + { + this.OnQualityCertificateIdChanging(value); + this.SendPropertyChanging(); + this._QualityCertificateId = value; + this.SendPropertyChanged("QualityCertificateId"); + this.OnQualityCertificateIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldId", DbType="NVarChar(50)")] + public string WeldId + { + get + { + return this._WeldId; + } + set + { + if ((this._WeldId != value)) + { + this.OnWeldIdChanging(value); + this.SendPropertyChanging(); + this._WeldId = value; + this.SendPropertyChanged("WeldId"); + this.OnWeldIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HeartNo", DbType="NVarChar(50)")] + public string HeartNo + { + get + { + return this._HeartNo; + } + set + { + if ((this._HeartNo != value)) + { + this.OnHeartNoChanging(value); + this.SendPropertyChanging(); + this._HeartNo = value; + this.SendPropertyChanged("HeartNo"); + this.OnHeartNoChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Warrantybook", DbType="NVarChar(50)")] + public string Warrantybook + { + get + { + return this._Warrantybook; + } + set + { + if ((this._Warrantybook != value)) + { + this.OnWarrantybookChanging(value); + this.SendPropertyChanging(); + this._Warrantybook = value; + this.SendPropertyChanged("Warrantybook"); + this.OnWarrantybookChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")] + public string CompileMan + { + get + { + return this._CompileMan; + } + set + { + if ((this._CompileMan != value)) + { + this.OnCompileManChanging(value); + this.SendPropertyChanging(); + this._CompileMan = value; + this.SendPropertyChanged("CompileMan"); + this.OnCompileManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")] + public System.Nullable CompileDate + { + get + { + return this._CompileDate; + } + set + { + if ((this._CompileDate != value)) + { + this.OnCompileDateChanging(value); + this.SendPropertyChanging(); + this._CompileDate = value; + this.SendPropertyChanged("CompileDate"); + this.OnCompileDateChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Weld_RecycleMat")] public partial class Weld_RecycleMat : INotifyPropertyChanging, INotifyPropertyChanged { diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user index 28be9c4..a48b337 100644 --- a/HJGL_DS/WebAPI/WebAPI.csproj.user +++ b/HJGL_DS/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU FolderProfile true