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

1

Browse Source
This commit is contained in:
李鹏飞
2024-10-22 21:13:56 +08:00
parent cb13fe481d
commit e680580417
25 changed files with 2099 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx.cs
+2 -1
View File
@@ -326,7 +326,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
{
if (this.tvControlItem.SelectedNode != null)
{
string strSql = @"SELECT batchItem.TrustBatchItemId, pipe.PipelineCode,jot.Specification,jot.WeldJointCode,
string strSql = @"SELECT batchItem.TrustBatchItemId, pipe.PipelineCode,jot.Specification,(jot.WeldJointCode + COALESCE(RepairRecord.RepairMark, '') ) as WeldJointCode,
(CASE WHEN CoverWelder.WelderCode IS NOT NULL AND BackingWelder.WelderCode IS NOT NULL
THEN backingWelder.WelderCode + '/' + coverWelder.WelderCode
ELSE (ISNULL(coverWelder.WelderCode,'') + ISNULL(backingWelder.WelderCode,'')) END) AS WelderCode,
@@ -343,6 +343,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
LEFT JOIN Base_Material AS mat1 ON mat1.MaterialId = jot.Material1Id
LEFT JOIN Base_Material AS mat2 ON mat2.MaterialId = jot.Material2Id
LEFT JOIN Batch_PointBatchItem AS PointBatchItem ON PointBatchItem.PointBatchItemId=batchItem.PointBatchItemId
Left join Repair_RepairRecord RepairRecord on PointBatchItem.RepairRecordId =RepairRecord.RepairRecordId
WHERE batchItem.TrustBatchId=@TrustBatchId ";
List<SqlParameter> listStr = new List<SqlParameter>
{