From 175818b56adc0a6628f19a7374e3f2eb3d9e3af7 Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Tue, 31 Oct 2023 10:02:54 +0800
Subject: [PATCH] 2023-10-31
---
SGGL/BLL/HJGL/PointTrust/PointBatchService.cs | 5 ++---
.../HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs | 3 ++-
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx | 6 +++---
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx | 6 +++---
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/SGGL/BLL/HJGL/PointTrust/PointBatchService.cs b/SGGL/BLL/HJGL/PointTrust/PointBatchService.cs
index 04705021..c0be47d9 100644
--- a/SGGL/BLL/HJGL/PointTrust/PointBatchService.cs
+++ b/SGGL/BLL/HJGL/PointTrust/PointBatchService.cs
@@ -138,8 +138,7 @@ namespace BLL
var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(weldJointId);
var pipeline = BLL.PipelineService.GetPipelineByPipelineId(newWeldJoint.PipelineId);
var project = BLL.ProjectService.GetProjectByProjectId(pipeline.ProjectId);
- var unitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(pipeline.UnitWorkId);
- var unit = BLL.UnitService.GetUnitByUnitId(pipeline.UnitId);
+ var unitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(pipeline.UnitWorkId);
var WeldingDaily = BLL.WeldingDailyService.GetPipeline_WeldingDailyByWeldingDailyId(newWeldJoint.WeldingDailyId);
var ndt = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(pipeline.DetectionType);
var ndtr = BLL.Base_DetectionRateService.GetDetectionRateByDetectionRateId(pipeline.DetectionRateId);
@@ -205,7 +204,7 @@ namespace BLL
{
new SqlParameter("@ProjectId", project.ProjectId),
new SqlParameter("@UnitWorkId", pipeline.UnitWorkId),
- new SqlParameter("@UnitId", pipeline.UnitId),
+ new SqlParameter("@UnitId", WeldingDaily.UnitId),
new SqlParameter("@DetectionTypeId", pipeline.DetectionType),
new SqlParameter("@DetectionRateId", pipeline.DetectionRateId)
};
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs
index 1811890f..e34b2dee 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs
@@ -210,7 +210,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
&& x.PipeArea == PipeArea
&& x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())
orderby x.PipelineCode select x).ToList();
- if (!string .IsNullOrEmpty( drpFlowingSection.SelectedValue))
+ if (!string .IsNullOrEmpty( drpFlowingSection.SelectedValue)&& drpFlowingSection.SelectedValue!=Const._Null)
{
pipeline = pipeline.Where(x => x.FlowingSection == drpFlowingSection.SelectedValue).ToList();
}
@@ -370,6 +370,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
this.drpFlowingSection.DataValueField = "Value";
this.drpFlowingSection.DataSource = pipeline;
this.drpFlowingSection.DataBind();
+ Funs.FineUIPleaseSelect(drpFlowingSection);
}
#endregion
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
index f15bdc0f..fa5398b0 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
@@ -117,7 +117,7 @@
DataField="BackingWelderCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Center" Width="90px">
-
-
-
-
+
-
+
-
+