lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
高飞
2023-11-30 11:03:14 +08:00
parent 12898e3c8b d6a862141e
commit 4f6bd5c96e
3 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs
+17 -1
View File
@@ -626,6 +626,14 @@ namespace FineUIPro.Web.HJGL.PointTrust
// Model.View_Batch_BatchTrust trust = BLL.Batch_BatchTrustService.GetBatchTrustViewByPointBatchId(this.tvControlItem.SelectedNodeID);
// Model.HJGL_Batch_PointBatch batch = BLL.PointBatchService.GetPointBatchById(this.tvControlItem.SelectedNodeID);
var trust = BLL.Batch_BatchTrustService.GetBatchTrustViewByPointBatchId(reportId);
var CH_WeldMethod = (from batch in Funs.DB.View_Batch_BatchTrustItem
join joint in Funs.DB.View_HJGL_WeldJoint on batch.WeldJointId equals joint.WeldJointId
where batch.TrustBatchId == trust.TrustBatchId
select joint.WeldingMethodCode).Distinct().ToList();
var CH_SlopeType = (from batch in Funs.DB.View_Batch_BatchTrustItem
join joint in Funs.DB.View_HJGL_WeldJoint on batch.WeldJointId equals joint.WeldJointId
where batch.TrustBatchId == trust.TrustBatchId
select joint.GrooveTypeCode).Distinct().ToList();
if (trust != null)
{
string varValue = string.Empty;
@@ -638,6 +646,14 @@ namespace FineUIPro.Web.HJGL.PointTrust
}
if (CH_WeldMethod.Count>0)
{
dr["CH_WeldMethod"] = string.Join(",", CH_WeldMethod);
}
if (CH_SlopeType.Count > 0)
{
dr["CH_SlopeType"] = string.Join(",", CH_SlopeType);
}
if (!string.IsNullOrEmpty(trust.TrustBatchCode))
{
dr["CH_TrustCode"] = trust.TrustBatchCode;
@@ -658,7 +674,7 @@ namespace FineUIPro.Web.HJGL.PointTrust
var list = BLL.Base_DetectionRateService.GetDetectionRateByDetectionRateId(trust.DetectionRateId);
if (list != null)
{
dr["CH_NDTRate"] = list.DetectionRateCode;
dr["CH_NDTRate"] = list.DetectionRateValue+"%";
}