lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

预制组件编号不能为空,无损监测委托单排序混乱,散件出库时对于已出散件需要过滤，新增时不再显示。

Browse Source
This commit is contained in:
李超
2025-02-07 16:01:49 +08:00
parent 7eb0c0d59c
commit 012194002e
5 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs
+4 -1
View File
@@ -195,7 +195,7 @@ namespace BLL
var model_mat = BLL.PipelineMatService.GetPipeLineMat(pipeLineMatId); var model_mat = BLL.PipelineMatService.GetPipeLineMat(pipeLineMatId);
var PipelineId = model_mat.PipelineId; var PipelineId = model_mat.PipelineId;
var PipeArea = BLL.PipelineService.GetPipelineByPipelineId(PipelineId).PipeArea; var PipeArea = BLL.PipelineService.GetPipelineByPipelineId(PipelineId).PipeArea;
if (PipeArea=="1") if (PipeArea=="1" &&!string.IsNullOrEmpty(model_mat.PrefabricatedComponents))
{ {
// var model = GetPipelineComponentByMatId(pipeLineMatId); // var model = GetPipelineComponentByMatId(pipeLineMatId);
var model = GetPipelineComponentByCodeandpipelineId(model_mat.PrefabricatedComponents,PipelineId); var model = GetPipelineComponentByCodeandpipelineId(model_mat.PrefabricatedComponents,PipelineId);
@@ -223,6 +223,9 @@ namespace BLL
} }
} }
/// <summary> /// <summary>
/// 添加作业管线 /// 添加作业管线
SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs
+7 -1
View File
@@ -228,6 +228,9 @@ namespace FineUIPro.Web.CLGL
&& y.UnitWorkId == this.UnitWorkId && y.UnitWorkId == this.UnitWorkId
&& y.PipelineId == this.tvControlItem.SelectedNodeID && y.PipelineId == this.tvControlItem.SelectedNodeID
&& (x.PrefabricatedComponents==null||x.PrefabricatedComponents=="") && (x.PrefabricatedComponents==null||x.PrefabricatedComponents=="")
select new select new
{ {
x.PipeLineMatId, x.PipeLineMatId,
@@ -250,7 +253,8 @@ namespace FineUIPro.Web.CLGL
} }
var inoutplandetail = (from x in Funs.DB.Tw_InOutPlanDetail_Relation var inoutplandetail = (from x in Funs.DB.Tw_InOutPlanDetail_Relation
where x.InOutPlanMasterId == Id && x.PipelineId == this.tvControlItem.SelectedNodeID //where x.InOutPlanMasterId == Id && x.PipelineId == this.tvControlItem.SelectedNodeID
where x.PipelineId == this.tvControlItem.SelectedNodeID
select x).ToList(); select x).ToList();
// 优化 Linq 过滤条件 // 优化 Linq 过滤条件
@@ -261,6 +265,8 @@ namespace FineUIPro.Web.CLGL
select x).ToList(); select x).ToList();
Grid1.RecordCount = tb.Count; Grid1.RecordCount = tb.Count;
Grid1.DataSource = tb; Grid1.DataSource = tb;
Grid1.DataBind(); Grid1.DataBind();
SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs
+1
View File
@@ -376,6 +376,7 @@ namespace FineUIPro.Web.HJGL.PointTrust
pointManages = pointManages.Where(x => x.UnitId == this.drpUnit.SelectedValue); pointManages = pointManages.Where(x => x.UnitId == this.drpUnit.SelectedValue);
} }
pointManages = pointManages.OrderBy(x => x.StartDate);
foreach (var item in pointManages) foreach (var item in pointManages)
{ {
SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs
+6 -3
View File
@@ -225,10 +225,13 @@ namespace FineUIPro.Web.HJGL.PointTrust
{ {
pointManages = pointManages.Where(x => x.UnitId == this.drpUnit.SelectedValue); pointManages = pointManages.Where(x => x.UnitId == this.drpUnit.SelectedValue);
} }
pointManages = pointManages.OrderBy(x => x.StartDate);
foreach (var item in pointManages) foreach (var item in pointManages)
{ {
var pipeline = PointBatchService.GetPointBatchById(item.PointBatchId);
string startdate = string.Format("{0:yyyy-MM-dd}", pipeline.StartDate);
TreeNode newNode = new TreeNode TreeNode newNode = new TreeNode
{ {
@@ -240,12 +243,12 @@ namespace FineUIPro.Web.HJGL.PointTrust
// 未委托批次红色显示 // 未委托批次红色显示
if (BLL.Batch_BatchTrustService.GetBatchTrustViewByPointBatchId(item.PointBatchId) == null) if (BLL.Batch_BatchTrustService.GetBatchTrustViewByPointBatchId(item.PointBatchId) == null)
{ {
newNode.Text = "<font color='#EE0000'>" + code + "【" + item.UnitName + "】" + "</font>"; newNode.Text = "<font color='#EE0000'>" + code + "【" + startdate + "】" + "【" + item.UnitName + "】" + "</font>";
newNode.ToolTip = "未委托"; newNode.ToolTip = "未委托";
} }
else else
{ {
newNode.Text = code + "【" + item.UnitName + "】"; newNode.Text = code + "【" + startdate + "】" + "【" + item.UnitName + "】";
} }
e.Node.Nodes.Add(newNode); e.Node.Nodes.Add(newNode);
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs
+1 -1
View File
@@ -425,7 +425,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
} }
else else
{ {
// result.Add((i + 2) + "Line, [预制组件] 不能为空</br>"); // result.Add((i + 2) + "Line, [预制组件] 不能为空</br>");
} }
} }
var model = matList.Where(x => x.PipelineId == item.PipelineId && x.MaterialCode == item.MaterialCode && x.PrefabricatedComponents == item.PrefabricatedComponents); var model = matList.Where(x => x.PipelineId == item.PipelineId && x.MaterialCode == item.MaterialCode && x.PrefabricatedComponents == item.PrefabricatedComponents);