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/PreDesign/PipelingDivide.aspx.cs
+52 -55
View File
@@ -1,18 +1,15 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web.UI.DataVisualization.Charting;
namespace FineUIPro.Web.HJGL.PreDesign
{
public partial class PipelingDivide : PageBase
{
public static List<Model.HJGL_Pipeline> view_HJGL_Pipelines =new List<Model.HJGL_Pipeline>();
public static List<Model.HJGL_Pipeline> view_HJGL_Pipelines = new List<Model.HJGL_Pipeline>();
public decimal PipelineComplete
{
get
@@ -35,11 +32,11 @@ namespace FineUIPro.Web.HJGL.PreDesign
ViewState["PipelineNOComplete"] = value;
}
}
public string Line_No
public string Line_No
{
get
{
return (string)ViewState["Line_No"];
return (string)ViewState["Line_No"];
}
set
{
@@ -48,11 +45,11 @@ namespace FineUIPro.Web.HJGL.PreDesign
}
protected void Page_Load(object sender, EventArgs e)
{
// ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId);
// ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId);
if (!IsPostBack)
{
// this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
// this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
this.InitTreeMenu();//加载树
PipelineComplete = 0;
PipelineNOComplete = 0;
@@ -110,8 +107,8 @@ namespace FineUIPro.Web.HJGL.PreDesign
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
//}
if (unitWork1.Count() > 0)
@@ -154,27 +151,27 @@ namespace FineUIPro.Web.HJGL.PreDesign
protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
{
this.BindGrid();
// var q = view_HJGL_Pipelines.Where(x => x.PipeArea == PipelineService.PipeArea_SHOP);
// if (q.Any())
// {
// List<string> listpipecode = new List<string>();
// foreach (var item in q)
// {
// listpipecode.Add("/" + item.PipelineCode);
// }
// Line_No = string.Join(",", listpipecode);
// }
// Model.Parameter3D parameter3D = new Model.Parameter3D();
// Model.ColorModel colorModel = new Model.ColorModel();
// colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
// parameter3D.ColorModel = colorModel;
// parameter3D.TagNum = Line_No;
// parameter3D.ButtonType = "1";
// parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
//// parameter3D.Line_No = Line_No;
// ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
// ctlAuditFlow.data = parameter3D;
// ctlAuditFlow.BindData();
// var q = view_HJGL_Pipelines.Where(x => x.PipeArea == PipelineService.PipeArea_SHOP);
// if (q.Any())
// {
// List<string> listpipecode = new List<string>();
// foreach (var item in q)
// {
// listpipecode.Add("/" + item.PipelineCode);
// }
// Line_No = string.Join(",", listpipecode);
// }
// Model.Parameter3D parameter3D = new Model.Parameter3D();
// Model.ColorModel colorModel = new Model.ColorModel();
// colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
// parameter3D.ColorModel = colorModel;
// parameter3D.TagNum = Line_No;
// parameter3D.ButtonType = "1";
// parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
//// parameter3D.Line_No = Line_No;
// ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
// ctlAuditFlow.data = parameter3D;
// ctlAuditFlow.BindData();
}
#endregion
@@ -193,23 +190,23 @@ namespace FineUIPro.Web.HJGL.PreDesign
view_HJGL_Pipeline.SingleName = this.txtSingleName.Text.Trim();
// view_HJGL_Pipeline.MaterialCode=this.txtMaterialCode.Text.Trim();
var list = BLL.PipelineService.GetHJGL_PipelineList(view_HJGL_Pipeline);
if (!string .IsNullOrEmpty(this.txtMaterialCode.Text.Trim()))
if (!string.IsNullOrEmpty(this.txtMaterialCode.Text.Trim()))
{
list = (from x in list
join y in Funs.DB.HJGL_PipeLineMat on x.PipelineId equals y.PipelineId
where y.MaterialCode.Contains(txtMaterialCode.Text.Trim())
select x).Distinct().ToList();
}
view_HJGL_Pipelines = list;
view_HJGL_Pipelines = list;
// 2.获取当前分页数据
Grid1.RecordCount = list.Count();
// 2.获取当前分页数据
// 3.绑定到Grid
var table = this.GetPagedDataTable(Grid1, list);
var table = this.GetPagedDataTable(Grid1, list);
Grid1.DataSource = table;
Grid1.DataBind();
//lbSinglePreRate.Text= GetSinglePreRateByUnitWork(this.tvControlItem.SelectedNodeID);
@@ -252,7 +249,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
// Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
// Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid();
}
#endregion
@@ -277,8 +274,8 @@ namespace FineUIPro.Web.HJGL.PreDesign
}
protected void Grid1_RowClick(object sender, GridRowClickEventArgs e)
{
var Id =Grid1.SelectedRowIDArray;
List<string > listpipecode=new List<string> () ;
var Id = Grid1.SelectedRowIDArray;
List<string> listpipecode = new List<string>();
foreach (var item in Id)
{
var q = PipelineService.GetPipelineByPipelineId(item);
@@ -292,7 +289,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
parameter3D.TagNum = pipecode;
parameter3D.ButtonType = "1";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
// parameter3D.Line_No = Line_No;
// parameter3D.Line_No = Line_No;
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D;
@@ -371,7 +368,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
{
txtPipelineCode.Text = String.Empty;
txtSingleName.Text = String.Empty;
txtMaterialCode.Text = String.Empty;
txtMaterialCode.Text = String.Empty;
BindGrid();
}
@@ -382,13 +379,13 @@ namespace FineUIPro.Web.HJGL.PreDesign
if (PipeArea != null)
{
var q = PipelineService.GetPipeArea().Where(x => x.Value == PipeArea.ToString());
if (q!=null&&q.Count()>0)
if (q != null && q.Count() > 0)
{
PipeAreaValue = q.First().Text;
}
}
else
{
return "";
@@ -403,11 +400,11 @@ namespace FineUIPro.Web.HJGL.PreDesign
private string GetSinglePreRateByUnitWork(string unitworkid)
{
var db = Funs.DB;
var pipeline=from x in db.View_HJGL_Pipeline where x.UnitWorkId == unitworkid && x.PipeArea=="1" select x;
var pipeline = from x in db.View_HJGL_Pipeline where x.UnitWorkId == unitworkid && x.PipeArea == "1" select x;
var q = from x in db.View_HJGL_WeldJoint where x.UnitWorkId == unitworkid select x;
string rate = "";
if (q != null && q.Count() > 0&&pipeline.Count()>0)
if (q != null && q.Count() > 0 && pipeline.Count() > 0)
{
var proSum = (from x in q
join y in pipeline on x.PipelineId equals y.PipelineId into temp
@@ -419,12 +416,12 @@ namespace FineUIPro.Web.HJGL.PreDesign
SizeSum = g.Sum(x => x.Size)
}).FirstOrDefault().SizeSum;
var AllSum = (from x in pipeline
group x by x.UnitWorkId into g
select new
{
SizeSum = g.Sum(x => x.TotalDin)
}).FirstOrDefault().SizeSum;
group x by x.UnitWorkId into g
select new
{
SizeSum = g.Sum(x => x.TotalDin)
}).FirstOrDefault().SizeSum;
proSum = (proSum != null) ? proSum : 0;
if (AllSum > 0)
{