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/PHTGL/ContractCompile/ContractWBS.aspx.cs
+44 -48
View File
@@ -1,11 +1,7 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.PHTGL.ContractCompile
@@ -45,9 +41,9 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
private void BindGrid()
{
var db = Funs.DB;
var q =
var q =
from x in db.PHTGL_ContractTrack
join y in db.PHTGL_ContractTrackMatchWBS on x.Id equals y.ContractTrackId into g
join y in db.PHTGL_ContractTrackMatchWBS on x.Id equals y.ContractTrackId into g
from y in g.DefaultIfEmpty()
join z in db.WBS_ControlItemAndCycle on y.ControlItemAndCycleId equals z.ControlItemAndCycleId into _ControlJoin
from z in _ControlJoin.DefaultIfEmpty()
@@ -58,55 +54,55 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
(string.IsNullOrEmpty(this.txtProjectName.Text.Trim()) || x.ProjectName.Contains(this.txtProjectName.Text.Trim())) &&
(string.IsNullOrEmpty(this.txtMainItemName.Text.Trim()) || x.MainItemName.Contains(this.txtMainItemName.Text.Trim()))
select new
{
MatchWbsId= y.Id ,
y.ContractTrackId,
y.ControlItemAndCycleId,
z.WBSCode,
z.ControlItemContent,
z.Weights,
y.WorkPackageEstimate,
x.Id,
x.ContractNum,
x.MainItemCode,
x.MainItemName,
x.MajorName,
x.MajorCode,
x.SubProject,
x.SubItemProject,
x.ProjectCode,
x.ProjectName,
x.ProjectDescription,
x.UnitOfMeasurement,
x.Quantity,
x.TotalCostFixedComprehensiveUnitPrice,
x.MainMaterialCost,
x.TotalPrice,
x.CalculationRule,
x.WorkContent,
x.Remarks,
x.ConstructionSubcontractor,
x.ContractWeight,
x.MaterialSupplier,
x.IsWithinGeneralContractScope,
x.EstimatedQuantity,
x.EstimatedAmount,
x.SettledQuantity,
x.SettledAmount,
x.ContractId,
x.SerialNumber
{
MatchWbsId = y.Id,
y.ContractTrackId,
y.ControlItemAndCycleId,
z.WBSCode,
z.ControlItemContent,
z.Weights,
y.WorkPackageEstimate,
x.Id,
x.ContractNum,
x.MainItemCode,
x.MainItemName,
x.MajorName,
x.MajorCode,
x.SubProject,
x.SubItemProject,
x.ProjectCode,
x.ProjectName,
x.ProjectDescription,
x.UnitOfMeasurement,
x.Quantity,
x.TotalCostFixedComprehensiveUnitPrice,
x.MainMaterialCost,
x.TotalPrice,
x.CalculationRule,
x.WorkContent,
x.Remarks,
x.ConstructionSubcontractor,
x.ContractWeight,
x.MaterialSupplier,
x.IsWithinGeneralContractScope,
x.EstimatedQuantity,
x.EstimatedAmount,
x.SettledQuantity,
x.SettledAmount,
x.ContractId,
x.SerialNumber
};
;
if (drpMajorItems.SelectedValue != Const._Null)
{
q= q.Where(x =>
x.MajorName.Contains(this.drpMajorItems.SelectedValue));
q = q.Where(x =>
x.MajorName.Contains(this.drpMajorItems.SelectedValue));
}
Grid1.RecordCount = q.Count();
Grid1.DataSource = q.ToList().OrderBy(x => x.SerialNumber, new CustomComparer()).ToList().Skip(Grid1.PageSize * Grid1.PageIndex).Take(Grid1.PageSize);
Grid1.DataBind();
}
protected void DropMainContractCode_SelectedIndexChanged(object sender, EventArgs e)
@@ -185,7 +181,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
return;
}
string ID = Grid1.SelectedRow.DataKeys[0].ToString();
string ID = Grid1.SelectedRow.DataKeys[0].ToString();
var model = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackById(ID);
if (model != null) ///已上报时不能删除
{
@@ -216,7 +212,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
ShowNotify("删除数据成功!", MessageBoxIcon.Success);
}
}
protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
{
if (Grid1.SelectedRowIndexArray.Length == 0)