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/CLGL/OutPlanMasterSelect.aspx.cs
+12 -15
View File
@@ -1,9 +1,6 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CLGL
@@ -52,7 +49,7 @@ namespace FineUIPro.Web.CLGL
{
if (!IsPostBack)
{
UnitWorkId=Request.QueryString["UnitWorkId"];
UnitWorkId = Request.QueryString["UnitWorkId"];
Id = Request.QueryString["Id"];
this.InitTreeMenu();//加载树
InitDropList();
@@ -124,7 +121,7 @@ namespace FineUIPro.Web.CLGL
foreach (var item in pipeline)
{
TreeNode newNode = new TreeNode();
//bool istrue = BLL.HJGL_MaterialService.isInStockByPipeline(item.PipelineId, this.CurrUser.LoginProjectId);
//if (istrue)
//{
@@ -214,10 +211,10 @@ namespace FineUIPro.Web.CLGL
// 确保 SelectedNodeID 不为空
if (this.tvControlItem.SelectedNodeID == null)
{
return; // 或者显示一个提示
}
int Category=(int)TwInOutplanmasterService.GetById(Id).Category;
int Category = (int)TwInOutplanmasterService.GetById(Id).Category;
var tb = (from x in Funs.DB.HJGL_PipeLineMat
join y in Funs.DB.HJGL_Pipeline on x.PipelineId equals y.PipelineId
join z in Funs.DB.Tw_MaterialStock on x.MaterialCode equals z.PipeLineMatCode into zz
@@ -227,9 +224,9 @@ namespace FineUIPro.Web.CLGL
&& z.ProjectId == this.CurrUser.LoginProjectId
&& y.UnitWorkId == this.UnitWorkId
&& y.PipelineId == this.tvControlItem.SelectedNodeID
&& (x.PrefabricatedComponents==null||x.PrefabricatedComponents=="")
&& (x.PrefabricatedComponents == null || x.PrefabricatedComponents == "")
select new
{
@@ -240,12 +237,12 @@ namespace FineUIPro.Web.CLGL
lib.MaterialSpec,
lib.MaterialUnit,
PlanNum = x.Number,
StockNum=z.StockNum??0,
StockNum = z.StockNum ?? 0,
x.IsLooseParts,
}).ToList();
if (Category == (int)TwConst.Category.管段)
{
tb=tb.Where(x=>x.MaterialUnit.Contains("米")).ToList();
tb = tb.Where(x => x.MaterialUnit.Contains("米")).ToList();
}
else
{
@@ -253,8 +250,8 @@ namespace FineUIPro.Web.CLGL
}
var inoutplandetail = (from x in Funs.DB.Tw_InOutPlanDetail_Relation
//where x.InOutPlanMasterId == Id && x.PipelineId == this.tvControlItem.SelectedNodeID
where x.PipelineId == this.tvControlItem.SelectedNodeID
//where x.InOutPlanMasterId == Id && x.PipelineId == this.tvControlItem.SelectedNodeID
where x.PipelineId == this.tvControlItem.SelectedNodeID
&& (x.PrefabricatedComponents == null || x.PrefabricatedComponents == "")
select x).ToList();
@@ -262,7 +259,7 @@ namespace FineUIPro.Web.CLGL
tb = (from x in tb
join y in inoutplandetail on x.MaterialCode equals y.MaterialCode into yy
from y in yy.DefaultIfEmpty()
where y == null
where y == null
select x).ToList();
@@ -353,7 +350,7 @@ namespace FineUIPro.Web.CLGL
}
}
}
}
TwInOutplandetailService.GenInOutPlanDetailByInoutPlanMasterId(Id);
}