2023-09-4

This commit is contained in:
2023-09-04 15:14:11 +08:00
parent 3a693a0306
commit e1e1d5394a
2 changed files with 5 additions and 3 deletions
@@ -140,7 +140,7 @@ namespace BLL
var project = BLL.ProjectService.GetProjectByProjectId(pipeline.ProjectId); var project = BLL.ProjectService.GetProjectByProjectId(pipeline.ProjectId);
var unitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(pipeline.UnitWorkId); var unitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(pipeline.UnitWorkId);
var unit = BLL.UnitService.GetUnitByUnitId(pipeline.UnitId); var unit = BLL.UnitService.GetUnitByUnitId(pipeline.UnitId);
var ndt = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(newWeldJoint.DetectionTypeId); var ndt = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(pipeline.DetectionType);
var ndtr = BLL.Base_DetectionRateService.GetDetectionRateByDetectionRateId(pipeline.DetectionRateId); var ndtr = BLL.Base_DetectionRateService.GetDetectionRateByDetectionRateId(pipeline.DetectionRateId);
if (newWeldJoint != null) if (newWeldJoint != null)
@@ -205,7 +205,7 @@ namespace BLL
new SqlParameter("@ProjectId", project.ProjectId), new SqlParameter("@ProjectId", project.ProjectId),
new SqlParameter("@UnitWorkId", pipeline.UnitWorkId), new SqlParameter("@UnitWorkId", pipeline.UnitWorkId),
new SqlParameter("@UnitId", pipeline.UnitId), new SqlParameter("@UnitId", pipeline.UnitId),
new SqlParameter("@DetectionTypeId", newWeldJoint.DetectionTypeId), new SqlParameter("@DetectionTypeId", pipeline.DetectionType),
new SqlParameter("@DetectionRateId", pipeline.DetectionRateId) new SqlParameter("@DetectionRateId", pipeline.DetectionRateId)
}; };
@@ -242,7 +242,7 @@ namespace BLL
batch.UnitWorkId = pipeline.UnitWorkId; batch.UnitWorkId = pipeline.UnitWorkId;
batch.BatchCondition = batchCondition; batch.BatchCondition = batchCondition;
batch.UnitId = pipeline.UnitId; batch.UnitId = pipeline.UnitId;
batch.DetectionTypeId = newWeldJoint.DetectionTypeId; batch.DetectionTypeId = pipeline.DetectionType;
batch.DetectionRateId = pipeline.DetectionRateId; batch.DetectionRateId = pipeline.DetectionRateId;
if (condition.Contains("5")) if (condition.Contains("5"))
{ {
@@ -568,6 +568,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param> /// <param name="e"></param>
/// `
/// `
protected void drpWeldingRod_SelectedIndexChanged(object sender, EventArgs e) protected void drpWeldingRod_SelectedIndexChanged(object sender, EventArgs e)
{ {
if (!string.IsNullOrEmpty(txtWpqId.Text)) if (!string.IsNullOrEmpty(txtWpqId.Text))