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

代码无效引用清理，试压包资料界面看板修改

Browse Source
This commit is contained in:
李鹏飞
2025-10-10 14:33:21 +08:00
parent 87fb529521
commit 55b798135c
933 changed files with 5897 additions and 7541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx.cs
+29 -34
View File
@@ -1,15 +1,10 @@
using BLL;
using FineUIPro.Web.ProjectData;
using MiniExcelLibs;
using NPOI.POIFS.Crypt.Dsig;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.HJGL.TestPackage
@@ -191,7 +186,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
if (unitWork != null)
{
pipeline.UnitWorkId = Request.Params["UnitWorkId"];
pipeline.UnitId = unitWork.UnitId;
pipeline.UnitId = unitWork.UnitId;
}
if (pds[i].B != null)
@@ -255,7 +250,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
{
result.Add("第" + (i + 1).ToString() + "行," + "管线号" + "," + "此项为必填项！" + "|");
}
pipeline.Tabler = this.CurrUser.PersonId;
pipeline.TableDate = DateTime.Now;
@@ -392,12 +387,12 @@ namespace FineUIPro.Web.HJGL.TestPackage
ProjectId = this.CurrUser.LoginProjectId,
UnitId = x.UnitId,
UnitWorkId = x.UnitWorkId,
TestPackageNo=x.TestPackageNo,
TestPackageName=x.TestPackageName,
Tabler =x.Tabler,
TableDate=x.TableDate,
TestPackageNo = x.TestPackageNo,
TestPackageName = x.TestPackageName,
Tabler = x.Tabler,
TableDate = x.TableDate,
Remark = x.Remark,
AdjustTestPressure=x.AdjustTestPressure
AdjustTestPressure = x.AdjustTestPressure
}).DistinctBy(temp => new
{
temp.PTP_ID,
@@ -441,16 +436,16 @@ namespace FineUIPro.Web.HJGL.TestPackage
Model.SGGLDB db = Funs.DB;
var getTestPackage = from y in db.PTP_TestPackage where y.UnitWorkId == UnitWorkId select y;
var allPipelineLists = from x in db.PTP_PipelineList
join y in db.PTP_TestPackage on x.PTP_ID equals y.PTP_ID
where y.UnitWorkId == UnitWorkId
select x;
join y in db.PTP_TestPackage on x.PTP_ID equals y.PTP_ID
where y.UnitWorkId == UnitWorkId
select x;
List<Model.PTP_PipelineList> pipelineList_add = new List<Model.PTP_PipelineList>();
var weldJoints = (from x in PipelineList
select new Model.PTP_PipelineList
{
{
PTP_ID = x.PTP_ID,
TestPackageNo=x.TestPackageNo,
TestPackageNo = x.TestPackageNo,
PipelineId = x.PipelineId,
//TestPressure = x.TestPressure,
}).DistinctBy(temp => new
@@ -517,20 +512,20 @@ namespace FineUIPro.Web.HJGL.TestPackage
{
string UnitWorkId = Request.Params["UnitWorkId"];
var queryList = from x in Funs.DB.View_HJGL_Pipeline
join y in Funs.DB.PTP_PipelineList on x.PipelineId equals y.PipelineId into yGroup
from y in yGroup.DefaultIfEmpty()
where x.UnitWorkId == UnitWorkId && y==null
select new
{
x.PipelineId,
x.PipelineCode,
x.PipingClassCode,
x.MediumName,
x.DesignPress,
x.DesignTemperature,
x.TestMediumCode,
x.TestPressure
};
join y in Funs.DB.PTP_PipelineList on x.PipelineId equals y.PipelineId into yGroup
from y in yGroup.DefaultIfEmpty()
where x.UnitWorkId == UnitWorkId && y == null
select new
{
x.PipelineId,
x.PipelineCode,
x.PipingClassCode,
x.MediumName,
x.DesignPress,
x.DesignTemperature,
x.TestMediumCode,
x.TestPressure
};
// materialize and add sequence number
var list = queryList.ToList();
@@ -557,9 +552,9 @@ namespace FineUIPro.Web.HJGL.TestPackage
{
var value = new
{
model = ""
model = new List<object>()
};
MiniExcel.SaveAsByTemplate(path, uploadfilepath, value);
MiniExcel.SaveAsByTemplate(path, uploadfilepath, value);
}
FileInfo info = new FileInfo(path);
long fileSize = info.Length;
@@ -569,7 +564,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
System.Web.HttpContext.Current.Response.ContentEncoding = System.Text.Encoding.UTF8;
System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString().Trim());
System.Web.HttpContext.Current.Response.TransmitFile(path, 0, fileSize);
System.Web.HttpContext.Current.Response.Flush();
System.Web.HttpContext.Current.Response.Flush();
File.Delete(path);
System.Web.HttpContext.Current.Response.End();