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

20250804 排产计划修改

Browse Source
This commit is contained in:
毕文静
2025-08-04 10:44:32 +08:00
parent 32c935b3c2
commit 98a8c1ebb4
11 changed files with 576 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx.cs
+1 -1
View File
@@ -364,7 +364,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
{
if (this.tvControlItem.SelectedNode.CommandName == "TestPackage")
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.AItemEndCheckMenuId, Const.BtnAdd))
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.AItemEndCheckMenuId, Const.BtnSave))
{
string url = "ItemEndCheckEdit.aspx?PTP_ID={0}";
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format(url, tvControlItem.SelectedNodeID, "操作 - ")));
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.cs
+15 -11
View File
@@ -332,7 +332,11 @@ namespace FineUIPro.Web.HJGL.TestPackage
var pipeline = db.HJGL_Pipeline.FirstOrDefault(x => x.PipelineId == pipelineItem.PipelineId);
var totalJoint = from x in db.HJGL_WeldJoint
join y in db.HJGL_Pipeline on x.PipelineId equals y.PipelineId
where y.UnitWorkId == pipeline.UnitWorkId && y.DetectionRateId == pipeline.DetectionRateId && y.DetectionType.Contains(pipeline.DetectionType)
join z in db.PTP_PipelineList on y.PipelineId equals z.PipelineId
//where y.UnitWorkId == pipeline.UnitWorkId
where z.PTP_ID == this.PTP_ID
&& y.DetectionRateId == pipeline.DetectionRateId
&& y.DetectionType.Contains(pipeline.DetectionType)
select x;
string rateStr = string.Empty;
var rate = Funs.DB.Base_DetectionRate.FirstOrDefault(x => x.DetectionRateId == pipeline.DetectionRateId);
@@ -340,7 +344,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
{
rateStr = rate.DetectionRateValue + "%";
}
this.lab12.Label = "本单位工程检测比例为" + rateStr + "的管线未焊接焊口数";
this.lab12.Label = "本试压包检测比例为" + rateStr + "的管线未焊接焊口数";
int totalJointNum = totalJoint.Count(); //总焊口
int totalWeldingJointNum = totalJoint.Count(x => x.WeldingDailyId != null); //已焊总焊口
int notCloseBatch = (from x in db.HJGL_Batch_PointBatch
@@ -534,9 +538,9 @@ namespace FineUIPro.Web.HJGL.TestPackage
string isnoHot = BLL.TestPackageEditService.IsExistNoHotHardItem(this.PTP_ID);
if (string.IsNullOrEmpty(isnoHot))
{
string inspectionIsoRate = BLL.TestPackageEditService.InspectionIsoRate(this.PTP_ID);
if (string.IsNullOrEmpty(inspectionIsoRate))
{
//string inspectionIsoRate = BLL.TestPackageEditService.InspectionIsoRate(this.PTP_ID);
//if (string.IsNullOrEmpty(inspectionIsoRate))
//{
updateTestPackage.Check1 = drpInstallationSpecification.SelectedValue;
updateTestPackage.Check2 = drpPressureTest.SelectedValue;
updateTestPackage.Check3 = drpWorkRecord.SelectedValue;
@@ -555,12 +559,12 @@ namespace FineUIPro.Web.HJGL.TestPackage
this.InitTreeMenu();
this.BindGrid();
ShowNotify("保存成功！", MessageBoxIcon.Success);
}
else
{
Alert.ShowInTop(inspectionIsoRate, MessageBoxIcon.Warning);
return;
}
//}
//else
//{
// Alert.ShowInTop(inspectionIsoRate, MessageBoxIcon.Warning);
// return;
//}
}
else
{