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

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
+21 -31
View File
@@ -1,21 +1,11 @@
using Apache.NMS.ActiveMQ.Threads;
using BLL;
using FineUIPro.Web.HSSE.EduTrain;
using FineUIPro.Web.ProjectData;
using BLL;
using Model;
using Newtonsoft.Json.Linq;
using NPOI.SS.Formula.Functions;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Web;
namespace FineUIPro.Web.CLGL
{
@@ -37,7 +27,7 @@ namespace FineUIPro.Web.CLGL
private void InitDrpList()
{
{
drpWarehouse.DataTextField = "Text";
drpWarehouse.DataValueField = "Value";
drpWarehouse.DataSource = BLL.DropListService.HJGL_WarehouseCode();
@@ -116,7 +106,7 @@ namespace FineUIPro.Web.CLGL
if (inOutPlanMasterModel != null)
{
if (inOutPlanMasterModel.State== (int)TwConst.State.|| inOutPlanMasterModel.State == (int)TwConst.State.)
if (inOutPlanMasterModel.State == (int)TwConst.State. || inOutPlanMasterModel.State == (int)TwConst.State.)
{
TabStrip2.Hidden = true;
TabStrip3.Hidden = false;
@@ -143,9 +133,9 @@ namespace FineUIPro.Web.CLGL
}
}
}
#endregion
@@ -213,11 +203,11 @@ namespace FineUIPro.Web.CLGL
{
foreach (var q in unitWork1)
{
var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName ;
tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位:" + unitNamesUnitIds;
tn1.EnableClickEvent = true;
rootNode1.Nodes.Add(tn1);
@@ -227,11 +217,11 @@ namespace FineUIPro.Web.CLGL
{
foreach (var q in unitWork2)
{
var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName ;
tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位:" + unitNamesUnitIds;
tn2.EnableClickEvent = true;
rootNode2.Nodes.Add(tn2);
@@ -330,7 +320,7 @@ namespace FineUIPro.Web.CLGL
MaterialDef = y.MaterialDef,
MaterialSpec = y.MaterialSpec,
MaterialUnit = y.MaterialUnit,
PlanNum = (x.Number ??0).ToString(),
PlanNum = (x.Number ?? 0).ToString(),
UnitWorkName = m.UnitWorkName,
}).ToList();
var UnitWorkName = tw_PrintDetailRelation.FirstOrDefault()?.UnitWorkName;
@@ -441,7 +431,7 @@ namespace FineUIPro.Web.CLGL
else
{
BLL.TwInOutplanmasterService.DeleteById(rowID);
ShowNotify("删除数据成功!", MessageBoxIcon.Success);
}
}
@@ -455,7 +445,7 @@ namespace FineUIPro.Web.CLGL
}
protected void btnGenInOutMaster_Click(object sender, EventArgs e)
{
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
@@ -485,7 +475,7 @@ namespace FineUIPro.Web.CLGL
}
string planId = Grid1.SelectedRowID;
string message = TwOutputmasterService.RevokeGenOutMasterByPlanId(planId);
if (string .IsNullOrEmpty(message))
if (string.IsNullOrEmpty(message))
{
ShowNotify("撤销出库成功!", MessageBoxIcon.Success);
BindGrid();
@@ -495,7 +485,7 @@ namespace FineUIPro.Web.CLGL
Alert.ShowInTop(message, MessageBoxIcon.Warning);
return;
}
}
}
@@ -506,9 +496,9 @@ namespace FineUIPro.Web.CLGL
Alert.ShowInTop("请至少选择一条记录!", MessageBoxIcon.Warning);
return;
}
string planId = Grid1.SelectedRowID;
string planId = Grid1.SelectedRowID;
var planMaster = BLL.TwInOutplanmasterService.GetById(planId);
if (planMaster.State == (int)TwConst.State. &&( planMaster.TypeInt == (int)TwConst.TypeInt. || planMaster.TypeInt == (int)TwConst.TypeInt.))
if (planMaster.State == (int)TwConst.State. && (planMaster.TypeInt == (int)TwConst.TypeInt. || planMaster.TypeInt == (int)TwConst.TypeInt.))
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("OutPlanMasterEdit.aspx?UnitWorkId={0}&Id={1} ", tvControlItem.SelectedNodeID, planId, "新增 - ")));
@@ -517,7 +507,7 @@ namespace FineUIPro.Web.CLGL
{
Alert.ShowInTop("请选择有效的计划!", MessageBoxIcon.Warning);
return;
return;
}
}
@@ -559,7 +549,7 @@ namespace FineUIPro.Web.CLGL
{
Alert.ShowInTop("请选择有效的计划!", MessageBoxIcon.Warning);
return;
}
}
else
{
if (string.IsNullOrEmpty(planMaster.AuditMan))
@@ -609,12 +599,12 @@ namespace FineUIPro.Web.CLGL
{
if (this.TabStrip1.ActiveTabIndex == 0)
{
}
else if (this.TabStrip1.ActiveTabIndex == 1)
{
}
}
@@ -700,6 +690,6 @@ namespace FineUIPro.Web.CLGL
#endregion
}
}