From 012194002e170c87bfb1045c830dbb51c3a1b44c Mon Sep 17 00:00:00 2001 From: 10191 <506754232@qq.com> Date: Fri, 7 Feb 2025 16:01:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E5=88=B6=E7=BB=84=E4=BB=B6=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA,=E6=97=A0?= =?UTF-8?q?=E6=8D=9F=E7=9B=91=E6=B5=8B=E5=A7=94=E6=89=98=E5=8D=95=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E6=B7=B7=E4=B9=B1,=E6=95=A3=E4=BB=B6=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E6=97=B6=E5=AF=B9=E4=BA=8E=E5=B7=B2=E5=87=BA=E6=95=A3?= =?UTF-8?q?=E4=BB=B6=E9=9C=80=E8=A6=81=E8=BF=87=E6=BB=A4=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=97=B6=E4=B8=8D=E5=86=8D=E6=98=BE=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs | 5 ++++- SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs | 8 +++++++- SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs | 1 + SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs | 9 ++++++--- .../HJGL/WeldingManage/PipelineMatIn.aspx.cs | 2 +- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs b/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs index 1eb1927d..b095ca20 100644 --- a/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs @@ -195,7 +195,7 @@ namespace BLL var model_mat = BLL.PipelineMatService.GetPipeLineMat(pipeLineMatId); var PipelineId = model_mat.PipelineId; var PipeArea = BLL.PipelineService.GetPipelineByPipelineId(PipelineId).PipeArea; - if (PipeArea=="1") + if (PipeArea=="1" &&!string.IsNullOrEmpty(model_mat.PrefabricatedComponents)) { // var model = GetPipelineComponentByMatId(pipeLineMatId); var model = GetPipelineComponentByCodeandpipelineId(model_mat.PrefabricatedComponents,PipelineId); @@ -223,6 +223,9 @@ namespace BLL } + + + } /// /// 添加作业管线 diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs index 6f441cfc..04012728 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs @@ -228,6 +228,9 @@ namespace FineUIPro.Web.CLGL && y.UnitWorkId == this.UnitWorkId && y.PipelineId == this.tvControlItem.SelectedNodeID && (x.PrefabricatedComponents==null||x.PrefabricatedComponents=="") + + + select new { x.PipeLineMatId, @@ -250,7 +253,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.InOutPlanMasterId == Id && x.PipelineId == this.tvControlItem.SelectedNodeID + where x.PipelineId == this.tvControlItem.SelectedNodeID select x).ToList(); // 优化 Linq 过滤条件 @@ -261,6 +265,8 @@ namespace FineUIPro.Web.CLGL select x).ToList(); + + Grid1.RecordCount = tb.Count; Grid1.DataSource = tb; Grid1.DataBind(); diff --git a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs index 61842a18..f636dc99 100644 --- a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs @@ -376,6 +376,7 @@ namespace FineUIPro.Web.HJGL.PointTrust pointManages = pointManages.Where(x => x.UnitId == this.drpUnit.SelectedValue); } + pointManages = pointManages.OrderBy(x => x.StartDate); foreach (var item in pointManages) { diff --git a/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs index 0dafbe30..56165d31 100644 --- a/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs @@ -225,10 +225,13 @@ namespace FineUIPro.Web.HJGL.PointTrust { pointManages = pointManages.Where(x => x.UnitId == this.drpUnit.SelectedValue); } - + pointManages = pointManages.OrderBy(x => x.StartDate); 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 { @@ -240,12 +243,12 @@ namespace FineUIPro.Web.HJGL.PointTrust // 未委托批次红色显示 if (BLL.Batch_BatchTrustService.GetBatchTrustViewByPointBatchId(item.PointBatchId) == null) { - newNode.Text = "" + code + "【" + item.UnitName + "】" + ""; + newNode.Text = "" + code + "【" + startdate + "】" + "【" + item.UnitName + "】" + ""; newNode.ToolTip = "未委托"; } else { - newNode.Text = code + "【" + item.UnitName + "】"; + newNode.Text = code + "【" + startdate + "】" + "【" + item.UnitName + "】"; } e.Node.Nodes.Add(newNode); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs index 2f66d61b..8013ee37 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs @@ -425,7 +425,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage } else { - // result.Add((i + 2) + "Line, [预制组件] 不能为空
"); + // result.Add((i + 2) + "Line, [预制组件] 不能为空
"); } } var model = matList.Where(x => x.PipelineId == item.PipelineId && x.MaterialCode == item.MaterialCode && x.PrefabricatedComponents == item.PrefabricatedComponents);