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
 
             }
 
+
+
+
         }
         /// <summary>
         /// 添加作业管线
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 = "<font color='#EE0000'>" + code + "【" + item.UnitName + "】" + "</font>";
+                        newNode.Text = "<font color='#EE0000'>" + code + "【" + startdate + "】" + "【" + item.UnitName + "】" + "</font>";
                         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, [预制组件] 不能为空</br>");
+                            // result.Add((i + 2) + "Line, [预制组件] 不能为空</br>");
                         }
                     }
                     var model = matList.Where(x => x.PipelineId == item.PipelineId && x.MaterialCode == item.MaterialCode && x.PrefabricatedComponents == item.PrefabricatedComponents);