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/CQMS/Material/ConstructionTestEdit.aspx.cs
-7
View File
@@ -1,12 +1,5 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Material
{
SGGL/FineUIPro.Web/CQMS/Material/ConstructionTestView.aspx.cs
-7
View File
@@ -1,12 +1,5 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Material
{
SGGL/FineUIPro.Web/CQMS/Material/EquipmentIn.aspx.cs
+1 -3
View File
@@ -5,8 +5,6 @@ using System.Data;
using System.Data.OleDb;
using System.IO;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Material
@@ -199,7 +197,7 @@ namespace FineUIPro.Web.CQMS.Material
//else
//{
if (!string.IsNullOrEmpty(row2))
{
{
var mainItem = mainItems.FirstOrDefault(x => x.MainItemName == row2);
if (mainItem == null)
{
SGGL/FineUIPro.Web/CQMS/Material/EquipmentSearch.aspx.cs
-1
View File
@@ -3,7 +3,6 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.CQMS.Material
{
SGGL/FineUIPro.Web/CQMS/Material/EquipmentStatistics.aspx.cs
-1
View File
@@ -3,7 +3,6 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.CQMS.Material
{
SGGL/FineUIPro.Web/CQMS/Material/EquipmentView.aspx.cs
+1 -3
View File
@@ -1,6 +1,4 @@
using BLL;
using System;
using System.Linq;
using System;
namespace FineUIPro.Web.CQMS.Material
{
SGGL/FineUIPro.Web/CQMS/Material/Inspection.aspx.cs
-1
View File
@@ -4,7 +4,6 @@ using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Threading.Tasks;
namespace FineUIPro.Web.CQMS.Material
{
SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs
+1 -4
View File
@@ -1,12 +1,9 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Material
{
SGGL/FineUIPro.Web/CQMS/Material/InspectionView.aspx.cs
+1 -5
View File
@@ -1,12 +1,8 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Material
{
SGGL/FineUIPro.Web/CQMS/Material/MaterialEdit.aspx.cs
+1 -1
View File
@@ -116,7 +116,7 @@ namespace FineUIPro.Web.CQMS.Material
}
else
{
var oldView = Funs.DB.Material_Material.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.UnitId== Material.UnitId && x.ArrivalDate == Material.ArrivalDate
var oldView = Funs.DB.Material_Material.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.UnitId == Material.UnitId && x.ArrivalDate == Material.ArrivalDate
&& x.MaterialName == Material.MaterialName && x.SpecificationAndModel == Material.SpecificationAndModel);
if (oldView == null)
{
SGGL/FineUIPro.Web/CQMS/Material/MaterialIn.aspx.cs
+2 -4
View File
@@ -5,8 +5,6 @@ using System.Data;
using System.Data.OleDb;
using System.IO;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Material
@@ -161,13 +159,13 @@ namespace FineUIPro.Web.CQMS.Material
var oldViewInfos = from x in Funs.DB.Material_Material
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == this.CurrUser.LoginProjectId
select new { x.ProjectId,y.UnitName,x.MaterialName,x.SpecificationAndModel,x.ArrivalDate};
select new { x.ProjectId, y.UnitName, x.MaterialName, x.SpecificationAndModel, x.ArrivalDate };
var units = from x in Funs.DB.Base_Unit
select x;
var mainItems = from x in Funs.DB.ProjectData_MainItem where x.ProjectId == this.CurrUser.LoginProjectId select x;
for (int i = 0; i < ir; i++)
{
var oldViewInfo = oldViewInfos.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.UnitName== pds.Rows[i][1].ToString()
var oldViewInfo = oldViewInfos.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.UnitName == pds.Rows[i][1].ToString()
&& x.MaterialName == pds.Rows[i][3].ToString() && x.SpecificationAndModel == pds.Rows[i][4].ToString() && x.ArrivalDate == Funs.GetNewDateTime(pds.Rows[i][10].ToString()));
if (oldViewInfo == null)
{
SGGL/FineUIPro.Web/CQMS/Material/MaterialSearch.aspx.cs
-1
View File
@@ -3,7 +3,6 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.CQMS.Material
{
SGGL/FineUIPro.Web/CQMS/Material/MaterialStatistics.aspx.cs
+1 -2
View File
@@ -3,7 +3,6 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.CQMS.Material
{
@@ -86,7 +85,7 @@ namespace FineUIPro.Web.CQMS.Material
{
BindGrid();
}
/// <summary>
/// 搜索
/// </summary>
SGGL/FineUIPro.Web/CQMS/Material/MaterialTest.aspx.cs
+1 -1
View File
@@ -190,7 +190,7 @@ namespace FineUIPro.Web.CQMS.Material
}
if (buttonList.Contains(BLL.Const.BtnDelete))
{
//this.btnMenuDel.Hidden = false;
//this.btnMenuDel.Hidden = false;
}
}
}
SGGL/FineUIPro.Web/CQMS/Material/MaterialTestEdit.aspx.cs
+2 -6
View File
@@ -1,12 +1,8 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Material
{
@@ -214,7 +210,7 @@ namespace FineUIPro.Web.CQMS.Material
materialTest.CompileDate = DateTime.Now;
CQMS_MaterialTestService.UpdateMaterialTest(materialTest);
Model.Material_Inspection inspection = BLL.CQMS_InspectionService.GetInspectionByInspectionId(materialTest.InspectionId);
if (inspection != null)
if (inspection != null)
{
if (inspection.State == BLL.Const.Inspection_SpotCheck) //若状态为正在抽检，则更新报验单状态为总包工程师审核
{
SGGL/FineUIPro.Web/CQMS/Material/MaterialTestView.aspx.cs
+1 -5
View File
@@ -1,12 +1,8 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Material
{
SGGL/FineUIPro.Web/CQMS/Material/MaterialView.aspx.cs
+1 -2
View File
@@ -1,5 +1,4 @@
using BLL;
using System;
using System;
namespace FineUIPro.Web.CQMS.Material
{
SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervisionEdit.aspx.cs
+1 -5
View File
@@ -1,12 +1,8 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Material
{
SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervisionView.aspx.cs
+1 -5
View File
@@ -1,12 +1,8 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Material
{