gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
高飞 2025-10-27 14:27:17 +08:00
parent eedf0ea56c 97b99f4ec1
commit 751270c1c6
16 changed files with 87 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
DataBase/版本日志/HJGLDB_DS_2025-10-20_02_bwj.sql Normal file
View File

@ -0,0 +1,62 @@
ALTER VIEW [dbo].[HJGL_View_CheckResultSummary]
/*ÎÞËð¼ì²â½á¹û»ã×ܱí*/
AS
SELECT c.*,
(CASE WHEN CHARINDEX('20d2cbca-8b3d-434b-b1c1-181796986fa5',c.NDT)>0 THEN
(SELECT TOP (1) report.CH_TrustCode FROM dbo.HJGL_CH_Trust report
WHERE report.CH_NDTMethod='20d2cbca-8b3d-434b-b1c1-181796986fa5' AND report.BatchId=c.BatchId
ORDER BY report.CH_TrustCode)
ELSE NULL END) AS RTReport,
(CASE WHEN CHARINDEX('20d2cbca-8b3d-434b-b1c1-181796986fa5',c.NDT)>0 THEN
(SELECT TOP (1) item.States FROM dbo.HJGL_CH_TrustItem item
LEFT JOIN dbo.HJGL_CH_Trust trust ON trust.CH_TrustID = item.CH_TrustID
WHERE item.BatchDetailId=c.BatchDetailId AND trust.CH_NDTMethod='20d2cbca-8b3d-434b-b1c1-181796986fa5' AND item.States IN ('2','4'))
ELSE NULL end) AS RT ,
(CASE WHEN CHARINDEX('ee316c8c-9899-4ab8-8152-7f00b655243d',c.NDT)>0 THEN
(SELECT TOP (1) report.CH_TrustCode FROM dbo.HJGL_CH_Trust report
WHERE report.CH_NDTMethod='ee316c8c-9899-4ab8-8152-7f00b655243d' AND report.BatchId=c.BatchId
ORDER BY report.CH_TrustCode)
ELSE NULL END) AS UTReport,
(CASE WHEN CHARINDEX('ee316c8c-9899-4ab8-8152-7f00b655243d',c.NDT)>0 THEN
(SELECT TOP (1) item.States FROM dbo.HJGL_CH_TrustItem item
LEFT JOIN dbo.HJGL_CH_Trust trust ON trust.CH_TrustID = item.CH_TrustID
WHERE item.BatchDetailId=c.BatchDetailId AND trust.CH_NDTMethod='ee316c8c-9899-4ab8-8152-7f00b655243d' AND item.States IN ('2','4'))
ELSE NULL end) AS UT ,
(CASE WHEN CHARINDEX('6bac78b9-0e82-4885-bb8f-36486b15e545',c.NDT)>0 THEN
(SELECT TOP (1) report.CH_TrustCode FROM dbo.HJGL_CH_Trust report
WHERE report.CH_NDTMethod='6bac78b9-0e82-4885-bb8f-36486b15e545' AND report.BatchId=c.BatchId
ORDER BY report.CH_TrustCode)
ELSE NULL END) AS MTReport,
(CASE WHEN CHARINDEX('6bac78b9-0e82-4885-bb8f-36486b15e545',c.NDT)>0 THEN
(SELECT TOP (1) item.States FROM dbo.HJGL_CH_TrustItem item
LEFT JOIN dbo.HJGL_CH_Trust trust ON trust.CH_TrustID = item.CH_TrustID
WHERE item.BatchDetailId=c.BatchDetailId AND trust.CH_NDTMethod='6bac78b9-0e82-4885-bb8f-36486b15e545' AND item.States IN ('2','4'))
ELSE NULL end) AS MT,
(CASE WHEN CHARINDEX('3799c68a-895e-4ed1-b516-dbb487660832',c.NDT)>0 THEN
(SELECT TOP (1) report.CH_TrustCode FROM dbo.HJGL_CH_Trust report
WHERE report.CH_NDTMethod='3799c68a-895e-4ed1-b516-dbb487660832' AND report.BatchId=c.BatchId
ORDER BY report.CH_TrustCode)
ELSE NULL END) AS PTReport,
(CASE WHEN CHARINDEX('3799c68a-895e-4ed1-b516-dbb487660832',c.NDT)>0 THEN
(SELECT TOP (1) item.States FROM dbo.HJGL_CH_TrustItem item
LEFT JOIN dbo.HJGL_CH_Trust trust ON trust.CH_TrustID = item.CH_TrustID
WHERE item.BatchDetailId=c.BatchDetailId AND trust.CH_NDTMethod='3799c68a-895e-4ed1-b516-dbb487660832' AND item.States IN ('2','4'))
ELSE NULL end) AS PT
FROM dbo.HJGL_View_CheckResultSummary1 c
GO

8
HJGL_DS/FineUIPro.Web/ContinuousPrint/TestRecordtPrint.aspx.cs
View File

@ -887,7 +887,7 @@ namespace FineUIPro.Web.ContinuousPrint
// ws.GetRow(rowIndex + 4).GetCell(5).SetCellValue("施工单位");
// region = new CellRangeAddress(rowIndex + 4, rowIndex + 4, 6, 8);
// ws.AddMergedRegion(region);
// ws.GetRow(rowIndex + 4).GetCell(6).SetCellValue("镇海石化建安工程有限公司");
// ws.GetRow(rowIndex + 4).GetCell(6).SetCellValue("浙江鼎盛石化工程有限公司");
// ws.GetRow(rowIndex + 4).GetCell(9).SetCellValue("委托日期");
// region = new CellRangeAddress(rowIndex + 4, rowIndex + 4, 10, 13);
// ws.AddMergedRegion(region);
@ -1389,7 +1389,7 @@ namespace FineUIPro.Web.ContinuousPrint
// ws.GetRow(rowIndex + 4).GetCell(4).SetCellValue("施工单位");
// region = new CellRangeAddress(rowIndex + 4, rowIndex + 4, 5, 6);
// ws.AddMergedRegion(region);
// ws.GetRow(rowIndex + 4).GetCell(6).SetCellValue("镇海石化建安工程有限公司");
// ws.GetRow(rowIndex + 4).GetCell(6).SetCellValue("浙江鼎盛石化工程有限公司");
// ws.GetRow(rowIndex + 4).GetCell(7).SetCellValue("委托日期");
// region = new CellRangeAddress(rowIndex + 4, rowIndex + 4, 8, 13);
// ws.AddMergedRegion(region);
@ -1898,7 +1898,7 @@ namespace FineUIPro.Web.ContinuousPrint
// ws.GetRow(rowIndex + 4).GetCell(4).SetCellValue("施工单位");
// region = new CellRangeAddress(rowIndex + 4, rowIndex + 4, 5, 6);
// ws.AddMergedRegion(region);
// ws.GetRow(rowIndex + 4).GetCell(6).SetCellValue("镇海石化建安工程有限公司");
// ws.GetRow(rowIndex + 4).GetCell(6).SetCellValue("浙江鼎盛石化工程有限公司");
// ws.GetRow(rowIndex + 4).GetCell(7).SetCellValue("委托日期");
// region = new CellRangeAddress(rowIndex + 4, rowIndex + 4, 8, 13);
// ws.AddMergedRegion(region);
@ -2419,7 +2419,7 @@ namespace FineUIPro.Web.ContinuousPrint
// ws.GetRow(rowIndex + 4).GetCell(4).SetCellValue("施工单位");
// region = new CellRangeAddress(rowIndex + 4, rowIndex + 4, 5, 6);
// ws.AddMergedRegion(region);
// ws.GetRow(rowIndex + 4).GetCell(6).SetCellValue("镇海石化建安工程有限公司");
// ws.GetRow(rowIndex + 4).GetCell(6).SetCellValue("浙江鼎盛石化工程有限公司");
// ws.GetRow(rowIndex + 4).GetCell(7).SetCellValue("委托日期");
// region = new CellRangeAddress(rowIndex + 4, rowIndex + 4, 8, 13);
// ws.AddMergedRegion(region);

4
HJGL_DS/FineUIPro.Web/File/Fastreport/管道无损检测结果汇总表.frx
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="01/09/2025 16:09:34" ReportInfo.Modified="10/20/2025 13:02:43" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="01/09/2025 16:09:34" ReportInfo.Modified="10/20/2025 17:20:09" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@ -67,7 +67,7 @@ namespace FastReport
}
}</ScriptText>
<Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFDbN1Q7UYiQPLPu1xuNqgnQ==">
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFUjzf5ybjvLX13LUyhg71vA==">
<TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data">
<Column Name="SingleName" DataType="System.String" PropName="attach_image_id"/>
<Column Name="WeldJointCode" DataType="System.String" PropName="image_series"/>

4
HJGL_DS/FineUIPro.Web/HJGL/CheckManage/CheckResultsSummary.aspx.cs
View File

@ -193,7 +193,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
// this.txtConstructionUnit.Text = unitName;
// }
//}
this.txtConstructionUnit.Text = "镇海石化建安工程有限公司";
this.txtConstructionUnit.Text = "浙江鼎盛石化工程有限公司";
this.txtTestingStandard.Text = "NB/T47013-2015";//检测标准
this.txtPipeClass.Text = BLL.HJGL_PipingClassService.GetPipingClassByPipingClassId(isoClassId).ISC_IsoName;//管道级别
this.txtPipelineCode.Text = this.tvControlItem.SelectedNode.Text;//管道编号
@ -654,7 +654,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
newRow["SingleName"] = row["ISO_IsoNo"].ToString();
newRow["WeldJointCode"] = row["JOT_JointNo"].ToString();
newRow["WelderCode"] = row["WED_Code"].ToString();
newRow["PointBatchCode"] = row["BatchCode"].ToString();
newRow["PointBatchCode"] = "/";
newRow["RTUTResult"] = row["RTUTResult"].ToString();
newRow["RTUTCheckNo"] = row["RTUTReport"].ToString();
newRow["MTPTResult"] = row["MTPTResult"].ToString();

4
HJGL_DS/FineUIPro.Web/HJGL/CheckManage/CheckResultsSummaryByBatch.aspx.cs
View File

@ -188,7 +188,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
this.txtSupervisionUnit.Text = project.WatchUnit;
}
this.txtConstructionUnit.Text = "镇海石化建安工程有限公司";
this.txtConstructionUnit.Text = "浙江鼎盛石化工程有限公司";
this.txtTestingStandard.Text = "NB/T47013-2015";//检测标准
var result = from x in db.HJGL_View_CheckResult
@ -629,7 +629,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
var installation = (from x in Funs.DB.Project_Installation where x.ProjectId == projectId select x.InstallationCode).FirstOrDefault();
var installationCode = installation;//单位工程 V_Name26
string unitName = "镇海石化建安工程有限公司"; //施工单位 V_Name27
string unitName = "浙江鼎盛石化工程有限公司"; //施工单位 V_Name27
var testingStandard = this.txtTestingStandard.Text.Trim();//检测标准 V_Name28
var workArea = installation;//区号 V_Name29
var reportDate = DateTime.Now.ToShortDateString();//报告日期 V_Name30

2
HJGL_DS/FineUIPro.Web/HJGL/CheckManage/MTReportEdit.aspx.cs
View File

@ -188,7 +188,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
var hardReport = from x in Funs.DB.HJGL_CH_HardTestReport where x.ISO_ID == ISO_ID select x;
var pro = BLL.Base_ProjectService.GetProjectByProjectId(iso.ProjectId);
this.txtCH_TrustUnit.Text = "镇海石化建安工程有限公司";
this.txtCH_TrustUnit.Text = "浙江鼎盛石化工程有限公司";
if (iso != null)
{
this.txtIsoNo.Text = iso.ISO_IsoNo;

4
HJGL_DS/FineUIPro.Web/HJGL/CheckManage/PTReportEdit.aspx.cs
View File

@ -146,7 +146,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
var hardReport = from x in Funs.DB.HJGL_CH_HardTestReport where x.ISO_ID == ISO_ID select x;
var pro = BLL.Base_ProjectService.GetProjectByProjectId(iso.ProjectId);
this.txtCH_TrustUnit.Text = "镇海石化建安工程有限公司";
this.txtCH_TrustUnit.Text = "浙江鼎盛石化工程有限公司";
if (iso != null)
{
this.txtIsoNo.Text = iso.ISO_IsoNo;
@ -301,7 +301,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
{
this.hdReportCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeByProjectId3", "HJGL_CH_TestingReportPrint", "ReportCode", iso.ProjectId, "PT-" + pro.TestEngineeringCode + "-");
this.txtPTReportCode.Text = this.hdReportCode.Text.Substring(3);
this.txtContractUnit.Text = "镇海石化建安工程有限公司";
this.txtContractUnit.Text = "浙江鼎盛石化工程有限公司";
}
BindGrid();
}

2
HJGL_DS/FineUIPro.Web/HJGL/CheckManage/RTReportEdit.aspx.cs
View File

@ -203,7 +203,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
var hardReport = from x in Funs.DB.HJGL_CH_HardTestReport where x.ISO_ID == ISO_ID select x;
var pro = BLL.Base_ProjectService.GetProjectByProjectId(iso.ProjectId);
this.txtCH_TrustUnit.Text = "镇海石化建安工程有限公司";
this.txtCH_TrustUnit.Text = "浙江鼎盛石化工程有限公司";
if (iso != null)
{
this.txtIsoNo.Text = iso.ISO_IsoNo;

4
HJGL_DS/FineUIPro.Web/HJGL/CheckManage/UTReportEdit.aspx.cs
View File

@ -191,7 +191,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
var hardReport = from x in Funs.DB.HJGL_CH_HardTestReport where x.ISO_ID == ISO_ID select x;
var pro = BLL.Base_ProjectService.GetProjectByProjectId(iso.ProjectId);
this.txtCH_TrustUnit.Text = "镇海石化建安工程有限公司";
this.txtCH_TrustUnit.Text = "浙江鼎盛石化工程有限公司";
if (iso != null)
{
this.txtIsoNo.Text = iso.ISO_IsoNo;
@ -351,7 +351,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
{
this.hdReportCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeByProjectId3", "HJGL_CH_TestingReportPrint", "ReportCode", iso.ProjectId, "UT-" + pro.TestEngineeringCode + "-");
this.txtUTReportCode.Text = this.hdReportCode.Text.Substring(3);
this.txtContractUnit.Text = "镇海石化建安工程有限公司";
this.txtContractUnit.Text = "浙江鼎盛石化工程有限公司";
this.txtSurfaceState.Text = "机械打磨";
this.txtProbeType.Text = "2.5MHZ10×10K2";
this.txtSurfaceCompensation.Text = " dB";

2
HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessManageEdit.aspx.cs
View File

@ -1127,7 +1127,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
// hardTestReport.TestStandard = "GB/T17394.1-2014";
// hardTestReport.STE_ID = iso.STE_ID;
// //项目承包单位信息
// hardTestReport.ContractUnit = "镇海石化建安工程有限公司";
// hardTestReport.ContractUnit = "浙江鼎盛石化工程有限公司";
// hardTestReport.TestMethod = "里氏硬度";
// BLL.HJGL_CH_HardTestReportService.AddCH_HardTestReport(hardTestReport);
// //回写焊口硬度委托时间

2
HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/RTTestingResult.aspx.cs
View File

@ -151,7 +151,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
var batchItem = BLL.HJGL_BO_BatchDetailService.GetBatchDetailByBatchId(batchId);
if (trust != null)
{
this.lblTrustUnit.Text = "镇海石化建安工程有限公司";
this.lblTrustUnit.Text = "浙江鼎盛石化工程有限公司";
if (!string.IsNullOrEmpty(trust.CH_TrustUnit))
{
var unit = BLL.Base_UnitService.GetUnit(trust.CH_TrustUnit);

2
HJGL_DS/FineUIPro.Web/Web.config
View File

@ -11,7 +11,7 @@
<FineUIPro DebugMode="false" Theme="Cupertino"/>
<appSettings>
<!--连接字符串-->
<add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
<add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
<!--系统名称-->
<add key="SystemName" value="诺必达焊接管理系统"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>

2
HJGL_DS/FineUIPro.Web/YLRQ/TestDataManagement/MTReportEdit.aspx.cs
View File

@ -187,7 +187,7 @@ namespace FineUIPro.Web.YLRQ.TestDataManagement
var pro = Funs.DB.Base_Project.FirstOrDefault(s => s.ProjectId == trust.ProjectId);
var weld = Funs.DB.PV_WeldInformation.FirstOrDefault(p => p.WeldingId == WeldingId);
this.txtCH_TrustUnit.Text = "舟山分公司";
this.txtContractUnit.Text = "镇海石化建安工程有限公司";
this.txtContractUnit.Text = "浙江鼎盛石化工程有限公司";
if (weld != null)
{
this.txtWeldingCode.Text = weld.WeldingCode;

4
HJGL_DS/FineUIPro.Web/YLRQ/TestDataManagement/PTReportEdit.aspx.cs
View File

@ -144,7 +144,7 @@ namespace FineUIPro.Web.YLRQ.TestDataManagement
var pro = Funs.DB.Base_Project.FirstOrDefault(s => s.ProjectId == trust.ProjectId);
var weld = Funs.DB.PV_WeldInformation.FirstOrDefault(p => p.WeldingId == WeldingId);
this.txtCH_TrustUnit.Text = "舟山分公司";
this.txtContractUnit.Text = "镇海石化建安工程有限公司";
this.txtContractUnit.Text = "浙江鼎盛石化工程有限公司";
if (weld != null)
{
this.txtWeldingCode.Text = weld.WeldingCode;
@ -220,7 +220,7 @@ namespace FineUIPro.Web.YLRQ.TestDataManagement
{
this.hdReportCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeByProjectId3", "PV_CH_TestingReportPrint", "ReportCode", pro.ProjectId, "PT-" + pro.TestEngineeringCode + "-");
this.txtPTReportCode.Text = this.hdReportCode.Text.Substring(3);
this.txtContractUnit.Text = "镇海石化建安工程有限公司";
this.txtContractUnit.Text = "浙江鼎盛石化工程有限公司";
}
BindGrid();
}

2
HJGL_DS/FineUIPro.Web/YLRQ/TestDataManagement/RTReportEdit.aspx.cs
View File

@ -184,7 +184,7 @@ namespace FineUIPro.Web.YLRQ.TestDataManagement
var weld = Funs.DB.PV_WeldInformation.FirstOrDefault(p => p.WeldingId == WeldingId);
this.txtCH_TrustUnit.Text = "舟山分公司";
this.txtContractUnit.Text = "镇海石化建安工程有限公司";
this.txtContractUnit.Text = "浙江鼎盛石化工程有限公司";
if (weld != null)
{
this.txtWeldingCode.Text = weld.WeldingCode;

4
HJGL_DS/FineUIPro.Web/YLRQ/TestDataManagement/UTReportEdit.aspx.cs
View File

@ -192,7 +192,7 @@ namespace FineUIPro.Web.YLRQ.TestDataManagement
var pro = Funs.DB.Base_Project.FirstOrDefault(s => s.ProjectId == trust.ProjectId);
var weld = Funs.DB.PV_WeldInformation.FirstOrDefault(p => p.WeldingId == WeldingId);
this.txtCH_TrustUnit.Text = "舟山分公司";
this.txtContractUnit.Text = "镇海石化建安工程有限公司";
this.txtContractUnit.Text = "浙江鼎盛石化工程有限公司";
if (weld != null)
{
this.txtWeldingCode.Text = weld.WeldingCode;
@ -267,7 +267,7 @@ namespace FineUIPro.Web.YLRQ.TestDataManagement
{
this.hdReportCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeByProjectId3", "PV_CH_TestingReportPrint", "ReportCode", pro.ProjectId, "UT-" + pro.TestEngineeringCode + "-");
this.txtUTReportCode.Text = this.hdReportCode.Text.Substring(3);
this.txtContractUnit.Text = "镇海石化建安工程有限公司";
this.txtContractUnit.Text = "浙江鼎盛石化工程有限公司";
this.txtSurfaceState.Text = "机械打磨";
this.txtProbeType.Text = "2.5MHZ10×10K2";
this.txtSurfaceCompensation.Text = " dB";