shecs/ZHJA_HJGL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
佘春生
2026-02-10 15:55:39 +08:00
parent a752675bbf
commit 9b4db50bfe
9782 changed files with 2037819 additions and 828 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs
+21 -2
View File
@@ -9,6 +9,7 @@ using System.Windows.Forms;
using Newtonsoft.Json.Linq;
using AspNet = System.Web.UI.WebControls;
using FineUIPro.Web.common.BaseInfo;
using FineUIPro.Web.HJGLServer.BaseInfo;
namespace FineUIPro.Web.HJGL.WeldingManage
{
@@ -1363,6 +1364,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var ndtInfo = BLL.HJGL_TestingService.GetTestingByTestingId(n);
//选择管道等级、执行标准时，自动添加对接焊缝检测比例、合格等级、支管连接接头检测比例、合格等级、角焊缝检测比例、合格等级
var weldControl = BLL.HJGL_WeldControlService.GEtWeldControlByISCIDAndExecStandardId(iso.ISC_ID, iso.ISO_Executive);
var cri= Funs.DB.HJGL_BS_TestStandard.FirstOrDefault(x => x.Remark.ToUpper().Trim() == ndtInfo.NDT_Code.ToUpper().Trim());
Model.HJGL_CH_Trust t = new Model.HJGL_CH_Trust();
t.BatchId = this.BatchId;
t.CH_TrustID = SQLHelper.GetNewID(typeof(Model.HJGL_CH_Trust));
@@ -1378,8 +1381,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage
t.CH_WeldMethod = joint.WME_ID;
t.CH_SlopeType = joint.JST_ID;
t.CH_NDTRate = batch.NDTR_ID;
t.CH_NDTCriteria = "NB/T 47013-2015";
if (cri != null)
{
t.CH_NDTCriteria = cri.TestStandardCode;
}
else
{
t.CH_NDTCriteria = "NB/T 47013-2015";
}
t.CH_TrustMan = this.CurrUser.UserId;
if (weldControl != null)
{
if (ndtInfo.NDT_Code == "RT")
@@ -1489,6 +1500,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var ndtInfo = BLL.HJGL_TestingService.GetTestingByTestingId(ndtItem.Value);
//选择管道等级、执行标准时，自动添加对接焊缝检测比例、合格等级、支管连接接头检测比例、合格等级、角焊缝检测比例、合格等级
var weldControl = BLL.HJGL_WeldControlService.GEtWeldControlByISCIDAndExecStandardId(iso.ISC_ID, iso.ISO_Executive);
var cri = Funs.DB.HJGL_BS_TestStandard.FirstOrDefault(x => x.Remark.ToUpper().Trim() == ndtInfo.NDT_Code.ToUpper().Trim());
Model.HJGL_CH_Trust t = new Model.HJGL_CH_Trust();
t.BatchId = this.BatchId;
t.CH_TrustID = SQLHelper.GetNewID(typeof(Model.HJGL_CH_Trust));
@@ -1503,7 +1515,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
t.CH_WeldMethod = joint.WME_ID;
t.CH_SlopeType = joint.JST_ID;
t.CH_NDTRate = batch.NDTR_ID;
t.CH_NDTCriteria = "NB/T 47013-2015";
if (cri != null)
{
t.CH_NDTCriteria = cri.TestStandardCode;
}
else
{
t.CH_NDTCriteria = "NB/T 47013-2015";
}
t.CH_TrustMan = this.CurrUser.UserId;
if (weldControl != null)
{