包装管理修改

SGGL/BLL/BLL.csproj

@@ -405,7 +405,7 @@
     <Compile Include="HJGL\PointTrust\PointBatchDetailService.cs" />
     <Compile Include="HJGL\PointTrust\PointBatchService.cs" />
     <Compile Include="HJGL\PreDesign\HJGL_MaterialService.cs" />
-    <Compile Include="HJGL\PreDesign\PackagingmanagedetailService.cs" />
+    <Compile Include="HJGL\PreDesign\HJGLPackagingmanagedetailService.cs" />
     <Compile Include="HJGL\PreDesign\PackagingManageService .cs" />
     <Compile Include="HJGL\PreDesign\TrainNumberManageService.cs" />
     <Compile Include="HJGL\PreDesign\YardPlanningService.cs" />

SGGL/BLL/HJGL/PreDesign/HJGLPackagingmanagedetailService.cs

@@ -1,4 +1,5 @@
 using FineUIPro;
+using Model;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -9,11 +10,8 @@ using System.Text;
 namespace BLL
 {
 
-    public static class PackagingmanagedetailService
+    public static class HJGLPackagingmanagedetailService
-    {
+    { 
-
-
-
         #region 获取列表
         /// <summary>
         /// 记录数
@@ -122,32 +120,71 @@ namespace BLL
         {
             return Funs.DB.HJGL_PackagingManageDetail.FirstOrDefault(x => x.Id == Id);
         }
-        public static IEnumerable GetPackagingData(string PackagingManageId)
+        public static IEnumerable<Model.PipelinePrefabricatedComponentsItem> GetPackagingData(string PackagingManageId)
         {
-             var q = from detail in Funs.DB.HJGL_PackagingManageDetail
+            if (string.IsNullOrEmpty(PackagingManageId))
-                     join lib in Funs.DB.HJGL_MaterialCodeLib on detail.MaterialCode equals lib.MaterialCode into libJoin
+            {
-                     from libItem in libJoin.DefaultIfEmpty()
+                return null;
-                     join line in Funs.DB.HJGL_Pipeline on detail.PipelineId equals line.PipelineId into lineJoin
+            }
-                     from lineItem in lineJoin.DefaultIfEmpty() 
+            var pack = HJGL_PackagingmanageService.GetHJGL_PackagingManageById(PackagingManageId);
-                     where detail.PackagingManageId == PackagingManageId
+            if (pack == null)
-                     select new
+            {
-                     {
+                return null;
-                         detail.Id,
+            }
-                         libItem.MaterialCode,
+            var result = new List<Model.PipelinePrefabricatedComponentsItem>();
-                         libItem.MaterialName,
+            if (pack.TypeInt == (int)HJGL_PackagingmanageService.TypeInt.预制散件)
-                         libItem.MaterialUnit,
+            {
-                         libItem.MaterialSpec,
+                var q = from detail in Funs.DB.HJGL_PackagingManageDetail 
-                         libItem.MaterialMade,
+                        join lib in Funs.DB.HJGL_MaterialCodeLib on detail.MaterialCode equals lib.MaterialCode into libJoin
-                         libItem.MaterialDef,
+                        from libItem in libJoin.DefaultIfEmpty()
-                         detail.Number, 
+                        join line in Funs.DB.HJGL_Pipeline on detail.PipelineId equals line.PipelineId into lineJoin
-                         lineItem.PipelineId,
+                        from lineItem in lineJoin.DefaultIfEmpty()
-                         lineItem.PipelineCode,
+                        where detail.PackagingManageId == PackagingManageId /*&& (detail.PipelineId != null  || detail.PipelineId != "") &&   (detail.PipelineComponentId == null || detail.PipelineComponentId == "")*/
+                        select new PipelinePrefabricatedComponentsItem
+                        {
+                            Id = detail.Id,
+                            MaterialCode = libItem.MaterialCode,
+                            MaterialName = libItem.MaterialName,
+                            MaterialUnit = libItem.MaterialUnit,
+                            MaterialSpec = libItem.MaterialSpec,
+                            MaterialMade = libItem.MaterialMade,
+                            MaterialDef = libItem.MaterialDef,
+                            Number = detail.Number,
+                            PipelineId = lineItem.PipelineId,
+                            PipelineCode = lineItem.PipelineCode,
+                            UnitWorkId=lineItem.UnitWorkId,
 
-                     };
+                        };
-            return q;
+               result= q.ToList();
+            }
+            else if(pack.TypeInt == (int)HJGL_PackagingmanageService.TypeInt.其他材料)
+            {
+                var q = from detail in Funs.DB.HJGL_PackagingManageDetail
+                        join lib in Funs.DB.HJGL_MaterialCodeLib on detail.MaterialCode equals lib.MaterialCode into libJoin
+                        from libItem in libJoin.DefaultIfEmpty()
+                        join line in Funs.DB.HJGL_Pipeline on detail.PipelineId equals line.PipelineId into lineJoin
+                        from lineItem in lineJoin.DefaultIfEmpty()
+                        where detail.PackagingManageId == PackagingManageId /*&&   (detail.PipelineId == null || detail.PipelineId == "")*/
+                        select new PipelinePrefabricatedComponentsItem
+                        {
+                            Id = detail.Id,
+                            MaterialCode = libItem.MaterialCode,
+                            MaterialName = libItem.MaterialName,
+                            MaterialUnit = libItem.MaterialUnit,
+                            MaterialSpec = libItem.MaterialSpec,
+                            MaterialMade = libItem.MaterialMade,
+                            MaterialDef = libItem.MaterialDef,
+                            Number = detail.Number,
+                            PipelineId = lineItem.PipelineId,
+                            PipelineCode = lineItem.PipelineCode,
+
+                        };
+                result = q.ToList();
+
+            }
+            return result;
         }
 
-
         public static void Add(Model.HJGL_PackagingManageDetail newtable)
         {
 
@@ -165,8 +202,6 @@ namespace BLL
             Funs.DB.HJGL_PackagingManageDetail.InsertOnSubmit(table);
             Funs.DB.SubmitChanges();
         }
-
-
         public static void Update(Model.HJGL_PackagingManageDetail newtable)
         {
 

SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs

@@ -8,11 +8,11 @@ using System.Data.SqlClient;
 using System.Linq;
 using System.Text;
 
-
 namespace BLL
 {
-
+    /// <summary>
-
+    /// 包装管理服务类
+    /// </summary>
     public static class HJGL_PackagingmanageService
     {
         public class PackagingManageItem
@@ -28,6 +28,8 @@ namespace BLL
             public string ContactPhone { get; set; }
             public string StackingPosition { get; set; }
             public int? State { get; set; }
+            public int? TypeInt { get; set; }
+            public string TypeString { get; set; }
 
             public string ReceiveMan { get; set; }
             public string ReceiveDate { get; set; }
@@ -36,22 +38,23 @@ namespace BLL
             public string Code { get; set; }
             public string TrainNumber { get; set; }
             public string TrainNumberOld { get; set; }
-
-
         }
 
         /// <summary>
         /// 未到场
         /// </summary>
         public static int state_0 = 0;
+
         /// <summary>
         /// 已发货
         /// </summary>
         public static int state_1 = 1;
+
         /// <summary>
         /// 已到场
         /// </summary>
         public static int state_2 = 2;
+
         public static ListItem[] GetState()
         {
             ListItem[] list = new ListItem[3];
@@ -67,12 +70,19 @@ namespace BLL
             预制散件 = 20,
             其他材料 = 30,
         }
+
         public static Dictionary<string, int> TypeIntMap = new Dictionary<string, int>
         {
             {  "预制组件" ,(int)TypeInt.预制组件},
             {  "预制散件" ,(int)TypeInt.预制散件},
             {  "其他材料" ,(int)TypeInt.其他材料},
         };
+
+        public static string GetTypeString(int? TypeInt)
+        {
+            return TypeIntMap.FirstOrDefault(c => c.Value == TypeInt).Key;
+        }
+
         public static Model.HJGL_PackagingManage GetHJGL_PackagingManageById(string PackagingManageId)
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
@@ -80,6 +90,7 @@ namespace BLL
                 return db.HJGL_PackagingManage.FirstOrDefault(x => x.PackagingManageId == PackagingManageId);
             }
         }
+
         public static string GetMinPlanStartDate(string PackagingManageId)
         {
             string PlanStartDate = "";
@@ -95,39 +106,40 @@ namespace BLL
             }
             return PlanStartDate;
         }
+
         public static (List<PackagingManageItem> Data, int Total) GetPackagingManageList(string projectId, string PackagingCode, int pageIndex = 0, int pageSize = 20)
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
-
                 var baseQuery = (from x in db.HJGL_PackagingManage
-                         join n in db.Base_Project on x.ProjectId equals n.ProjectId
+                                 join n in db.Base_Project on x.ProjectId equals n.ProjectId
-                         join m in db.Person_Persons on x.ReceiveMan equals m.PersonId into tt 
+                                 join m in db.Person_Persons on x.ReceiveMan equals m.PersonId into tt
-                         from t in tt.DefaultIfEmpty()
+                                 from t in tt.DefaultIfEmpty()
                                  join train in db.HJGL_TrainNumberManage on x.TrainNumberId equals train.Id into trains
                                  from train in trains.DefaultIfEmpty()
                                  where x.ProjectId == projectId
                          && (string.IsNullOrEmpty(PackagingCode) || x.PackagingCode.Contains(PackagingCode))
-                         select new PackagingManageItem
+                                 select new PackagingManageItem
-                         {
+                                 {
-                             PackagingManageId = x.PackagingManageId,
+                                     PackagingManageId = x.PackagingManageId,
-                             PackagingCode = x.PackagingCode,
+                                     PackagingCode = x.PackagingCode,
-                             ProjectName = n.ProjectName,
+                                     ProjectName = n.ProjectName,
-                             ContactName = train.ContactName,
+                                     ContactName = train.ContactName,
-                             ContactPhone = train.ContactPhone,
+                                     ContactPhone = train.ContactPhone,
-                             DriverName = train.DriverName,
+                                     DriverName = train.DriverName,
-                             DriverPhone = train.DriverPhone,
+                                     DriverPhone = train.DriverPhone,
-                             LicensePlateNumber = train.LicensePlateNumber,
+                                     LicensePlateNumber = train.LicensePlateNumber,
-                             StackingPosition = x.StackingPosition,
+                                     StackingPosition = x.StackingPosition,
-                             State = x.State,
+                                     State = x.State,
-                             ReceiveMan = t.PersonName,
+                                     TypeInt = x.TypeInt,
-                             ReceiveDate = x.ReceiveDate.HasValue ? string.Format("{0:g}", x.ReceiveDate) : "",
+                                     TypeString = GetTypeString(x.TypeInt),
-                             PlanStartDate = GetMinPlanStartDate(x.PackagingManageId),
+                                     ReceiveMan = t.PersonName,
-                             TrainNumberOld = x.TrainNumber,
+                                     ReceiveDate = x.ReceiveDate.HasValue ? string.Format("{0:g}", x.ReceiveDate) : "",
-                             TrainNumber = train.TrainNumber,
+                                     PlanStartDate = GetMinPlanStartDate(x.PackagingManageId),
-                             Code = x.PackagingCode.Substring(0, x.PackagingCode.LastIndexOf("-")).Substring(x.PackagingCode.Substring(0, x.PackagingCode.LastIndexOf("-")).LastIndexOf("-") + 1),
+                                     TrainNumberOld = x.TrainNumber,
-
+                                     TrainNumber = train.TrainNumber,
-                         }).Distinct();
+                                     Code = x.PackagingCode.Substring(0, x.PackagingCode.LastIndexOf("-")).Substring(x.PackagingCode.Substring(0, x.PackagingCode.LastIndexOf("-")).LastIndexOf("-") + 1),
+                                 }).Distinct();
 
                 var pagedData = baseQuery
                             .OrderByDescending(x => x.Code)
@@ -136,11 +148,11 @@ namespace BLL
                            .ToList();
 
                 // 获取总记录数（延迟计数优化）
-                var totalCount = baseQuery.Count(); 
+                var totalCount = baseQuery.Count();
-                return (pagedData, totalCount); 
+                return (pagedData, totalCount);
-
             }
-        } 
+        }
+
         /// <summary>
         /// 形成出库单
         /// </summary>
@@ -153,8 +165,8 @@ namespace BLL
                 model.State = state_1;
                 UpdateHJGL_PackagingManage(model);
             }
-
         }
+
         /// <summary>
         /// 根据主键获取装箱明细
         /// </summary>
@@ -168,7 +180,7 @@ namespace BLL
             {
                 var PipelineComponentIds = model.PipelineComponentId.Split(',');
                 string strSql = @"select com.PipelineComponentId, com.PipelineComponentCode,isnull(pipe.PlanStartDate,getdate()) as PlanStartDate,unitwork.UnitWorkName,'1' as num ,'个' as CU
-                                        from HJGL_Pipeline_Component com 
+                                        from HJGL_Pipeline_Component com
                                         left join HJGL_Pipeline pipe on com.PipelineId=pipe.PipelineId
                                         left join WBS_UnitWork unitwork on pipe.UnitWorkId=unitwork.UnitWorkId
 										 ";
@@ -179,7 +191,6 @@ namespace BLL
                 tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             }
             return tb;
-
         }
 
         /// <summary>
@@ -195,13 +206,36 @@ namespace BLL
                      select x.PackagingCode).Distinct().ToList();
             return q;
         }
+        public static List<Model.HJGL_PackagingManage> GetPackagingManage(string trainNumberId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var q = (from x in db.HJGL_PackagingManage
+                     where x.TrainNumberId==trainNumberId
+                     select x).Distinct().ToList();
+            return q;
+        }
+        public static string GetNewPackagingCode(string projectid)
+        {
+            string code = ProjectService.GetProjectCodeByProjectId(projectid) + "-" + string.Format("{0:yyyyMMdd}", DateTime.Now) + "-";
+
+            var q = GetPackagingManageList(projectid, code);
+            if (q.Total > 0)
+            {
+                code = code + (q.Total + 1).ToString().PadLeft(3, '0');
+            }
+            else
+            {
+                code = code + "001";
+            }
+            return code;
+        }
+
         /// <summary>
         /// 新增实体
         /// </summary>
         /// <param name="newtable"></param>
         public static void AddHJGL_PackagingManage(Model.HJGL_PackagingManage newtable)
         {
-
             Model.HJGL_PackagingManage table = new Model.HJGL_PackagingManage
             {
                 PackagingManageId = newtable.PackagingManageId,
@@ -224,7 +258,6 @@ namespace BLL
             db1.SubmitChanges();
         }
 
-
         public static void UpdateHJGL_PackagingManage(Model.HJGL_PackagingManage newtable)
         {
             var db1 = Funs.DB;
@@ -247,8 +280,8 @@ namespace BLL
                 table.TypeInt = newtable.TypeInt;
                 db1.SubmitChanges();
             }
-
         }
+
         public static void DeleteHJGL_PackagingManageById(string PackagingManageId)
         {
             var db1 = Funs.DB;
@@ -258,10 +291,8 @@ namespace BLL
                 db1.HJGL_PackagingManage.DeleteOnSubmit(table);
                 db1.SubmitChanges();
             }
-
         }
 
-
         /// <summary>
         ///  管线下拉框
         /// </summary>
@@ -278,6 +309,5 @@ namespace BLL
                 Funs.FineUIPleaseSelect(dropName);
             }
         }
-
     }
 }

SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs

@@ -85,6 +85,95 @@ namespace BLL
             return Funs.DB.HJGL_Pipeline_Component.FirstOrDefault(e => e.PipeLineMatId == pipeLineMatId);
         }
 
+        /// <summary>
+        /// 获取预制散件
+        /// </summary>
+        /// <param name="unitworkId">单位工程Id</param>
+        /// <param name="pipelineId">管线Id</param>
+        /// <returns></returns>
+        public static IEnumerable<PipelinePrefabricatedComponentsItem> GetPipelinePrefabricatedComponent(string unitworkId, string pipelineId)
+        {
+            var query = from pipe in Funs.DB.HJGL_PipeLineMat
+                        join lib in Funs.DB.HJGL_MaterialCodeLib on pipe.MaterialCode equals lib.MaterialCode into libJoin
+                        from libItem in libJoin.DefaultIfEmpty()
+                        join line in Funs.DB.HJGL_Pipeline on pipe.PipelineId equals line.PipelineId into lineJoin
+                        from lineItem in lineJoin.DefaultIfEmpty()
+                        where lineItem != null && lineItem.UnitWorkId == unitworkId && lineItem.PipeArea == "1"
+                              && (pipe.PrefabricatedComponents == null || pipe.PrefabricatedComponents == "")
+                        select new PipelinePrefabricatedComponentsItem
+                        {
+                            Id = pipe.PipeLineMatId,
+                            MaterialCode = libItem.MaterialCode,
+                            MaterialName = libItem.MaterialName,
+                            MaterialUnit = libItem.MaterialUnit,
+                            MaterialSpec = libItem.MaterialSpec,
+                            MaterialMade = libItem.MaterialMade,
+                            MaterialDef = libItem.MaterialDef,
+                            Number = pipe.Number,
+                            PrefabricatedComponents = pipe.PrefabricatedComponents,
+                            PipelineId = lineItem.PipelineId,
+                        };
+
+            if (!string.IsNullOrEmpty(pipelineId))
+            {
+                query = query.Where(x => x.PipelineId == pipelineId);
+            }
+
+            query = query.OrderBy(x => x.PrefabricatedComponents);
+
+           
+            return query.ToList();
+        }
+        /// <summary>
+        /// 获取预制散件
+        /// </summary>
+        /// <param name="pipelineId">管线Id</param>
+        /// <returns></returns>
+        public static IEnumerable<PipelinePrefabricatedComponentsItem> GetPipelinePrefabricatedComponent(string pipelineId)
+        {
+            var query = from pipe in Funs.DB.HJGL_PipeLineMat
+                        join lib in Funs.DB.HJGL_MaterialCodeLib on pipe.MaterialCode equals lib.MaterialCode into libJoin
+                        from libItem in libJoin.DefaultIfEmpty()
+                        join line in Funs.DB.HJGL_Pipeline on pipe.PipelineId equals line.PipelineId into lineJoin
+                        from lineItem in lineJoin.DefaultIfEmpty()
+                        where lineItem != null  && lineItem.PipeArea == "1"
+                              && (pipe.PrefabricatedComponents == null || pipe.PrefabricatedComponents == "")
+                        select new PipelinePrefabricatedComponentsItem
+                        {
+                            Id = pipe.PipeLineMatId,
+                            MaterialCode = libItem.MaterialCode,
+                            MaterialName = libItem.MaterialName,
+                            MaterialUnit = libItem.MaterialUnit,
+                            MaterialSpec = libItem.MaterialSpec,
+                            MaterialMade = libItem.MaterialMade,
+                            MaterialDef = libItem.MaterialDef,
+                            Number = pipe.Number,
+                            PrefabricatedComponents = pipe.PrefabricatedComponents,
+                            PipelineId = lineItem.PipelineId,
+                        };
+
+            if (!string.IsNullOrEmpty(pipelineId))
+            {
+                query = query.Where(x => x.PipelineId == pipelineId);
+            }
+
+            query = query.OrderBy(x => x.PrefabricatedComponents);
+
+            var inoutplandetail = (from x in Funs.DB.HJGL_PackagingManageDetail  
+                                   where x.PipelineId == pipelineId
+                                   && (x.PipelineComponentId == null || x.PipelineComponentId == "")
+                                   select x).ToList();
+            var queryList = query.ToList();
+            // 优化 Linq 过滤条件
+            var result = (from x in queryList
+                          join y in inoutplandetail on x.MaterialCode equals y.MaterialCode into yy
+                          from y in yy.DefaultIfEmpty()
+                          where y == null
+                          select x).ToList();
+            return result;
+
+        }
+
         /// <summary>
         /// 获取打印实体
         /// </summary>
@@ -92,8 +181,7 @@ namespace BLL
         /// <param name="PipelineId"></param>
         /// <param name="IsCheckPrint"></param>
         /// <returns></returns>
-        public static IEnumerable<PipelineComponentPrintDto> GetPrintModelByPipelineComponentIds(
+        public static IEnumerable<PipelineComponentPrintDto> GetPrintModelByPipelineComponentIds(string[] PipelineComponentId, string[] PipelineId, bool IsCheckPrint)
-    string[] PipelineComponentId, string[] PipelineId, bool IsCheckPrint)
         {
             var db = Funs.DB;
             var query =
@@ -154,9 +242,6 @@ namespace BLL
             return result;
         }
 
-
-
-
         /// <summary>
         /// 判断管线组件Code是否存在
         /// </summary>
@@ -226,7 +311,7 @@ namespace BLL
 
         }
         /// <summary>
-        /// 添加作业管线
+        /// 添加管线预制组件
         /// </summary>
         /// <param name="pipeline"></param>
         public static void AddPipelineComponent(Model.HJGL_Pipeline_Component pipeline)
@@ -258,7 +343,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// 修改作业管线
+        /// 修改管线预制组件
         /// </summary>
         /// <param name="pipeline"></param>
         public static void UpdatePipelineComponent(Model.HJGL_Pipeline_Component pipeline)
@@ -289,7 +374,7 @@ namespace BLL
             }
         }
         /// <summary>
-        /// 修改出库状态
+        /// 修改组件出库状态
         /// </summary>
         /// <param name="pipelineComponentId"></param>
         /// <param name="BoxNumber"></param>
@@ -306,7 +391,7 @@ namespace BLL
         
         }
         /// <summary>
-        /// 修改打印状态
+        /// 修改组件打印状态
         /// </summary>
         /// <param name="PipelineComponentId"></param>
         public static void UpdateIsPrint(string[] PipelineComponentId)
@@ -324,7 +409,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// 修改生产状态
+        /// 修改组件生产状态
         /// </summary>
         /// <param name="pipelineComponentId"></param>
         /// <param name="BoxNumber"></param>
@@ -358,7 +443,7 @@ namespace BLL
 
         }
         /// <summary>
-        /// 根据作业管线Id删除一个作业管线信息
+        /// 根据管线组件Id删除一个管线组件信息
         /// </summary>
         /// <param name="pipelineId"></param>
         public static void DeletePipelineComponent(string pipelineComponentId)
@@ -372,7 +457,7 @@ namespace BLL
             }
         }
         /// <summary>
-        /// 根据管线材料id删除对应组件
+        /// 根据管线组件id删除对应组件
         /// </summary>
         /// <param name="pipeLineMatId"></param>
         public static void DeletePipelineComponentByMatId(string pipeLineMatId)
@@ -387,7 +472,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// 根据管线id删除组件
+        /// 根据管线组件id删除组件
         /// </summary>
         /// <param name="pipelineId"></param>
         public static void DeletePipelineComponentBypipelineId(string pipelineId)
@@ -473,25 +558,4 @@ namespace BLL
         }
     }
 
-    public class PipelineComponentPrintDto
-
-    {
-        public string PipelineComponentId { get; set; }
-        public string PipelineComponentCode { get; set; }
-        public string BoxNumber { get; set; }
-        public string UnitWorkName { get; set; }
-        public string PipelineId { get; set; }
-        public string PreUnit { get; set; }
-        public string AssembleUnit { get; set; }
-        public string PrefabricatedComponents { get; set; }
-        public string QRCode { get; set; }
-        public int? State { get; set; }
-        public string PlanStartDate { get; set; }
-        public string PipelineCode { get; set; }
-        public string FlowingSection { get; set; }
-        public string QRCode2 { get; set; }
-        public string MaterialCode { get; set; }
-        public bool? IsPrint { get; set; }
-    }
-
 }

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -1559,6 +1559,7 @@
     <Content Include="HJGL\PreDesign\PrePipelineQRCodeIn.aspx" />
     <Content Include="HJGL\PreDesign\TrainNumberManager.aspx" />
     <Content Include="HJGL\PreDesign\TrainNumberManageEdit.aspx" />
+    <Content Include="HJGL\PreDesign\TrainNumberManagerView.aspx" />
     <Content Include="HJGL\PreDesign\YardPlanning.aspx" />
     <Content Include="HJGL\PreDesign\PipelingDivide.aspx" />
     <Content Include="HJGL\PreDesign\PipelingDivideChart.aspx" />
@@ -10590,6 +10591,13 @@
     <Compile Include="HJGL\PreDesign\TrainNumberManageEdit.aspx.designer.cs">
       <DependentUpon>TrainNumberManageEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="HJGL\PreDesign\TrainNumberManagerView.aspx.cs">
+      <DependentUpon>TrainNumberManagerView.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\PreDesign\TrainNumberManagerView.aspx.designer.cs">
+      <DependentUpon>TrainNumberManagerView.aspx</DependentUpon>
+    </Compile>
     <Compile Include="HJGL\PreDesign\YardPlanning.aspx.cs">
       <DependentUpon>YardPlanning.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx

@@ -43,7 +43,9 @@
                         <f:RenderField Width="120px" ColumnID="PackagingCode" DataField="PackagingCode"
                             FieldType="String" HeaderText="包装编号" HeaderTextAlign="Center" TextAlign="Center">
                         </f:RenderField>
-
+                        <f:RenderField Width="120px" ColumnID="TypeString" DataField="TypeString"
+                            FieldType="String" HeaderText="包装编号" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
                         <%--<f:RenderField Width="120px" ColumnID="PlanStartDate" DataField="PlanStartDate" FieldType="String"
                         HeaderText="最早安装时间" HeaderTextAlign="Center" TextAlign="Center">
                     </f:RenderField>--%>

SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.cs

@@ -1,4 +1,5 @@
 using BLL;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -34,27 +35,26 @@ namespace FineUIPro.Web.HJGL.PreDesign
                 drpTypeInt.DataBind();
  
 
-                BindGrid();
                 btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 if (!string.IsNullOrEmpty(PackagingManageId))
                 {
                     var model = HJGL_PackagingmanageService.GetHJGL_PackagingManageById(PackagingManageId);
+                    drpTypeInt.Enabled = false;
                     txtPackagingCode.Text = model.PackagingCode;
                     dropPipelineComponentCode.Values = model.PipelineComponentId?.Split(',');
                     txtStackingPosition.Text = model.StackingPosition; 
                     drpTrainNumber.SelectedValue = model.TrainNumberId;
                     drpTypeInt.SelectedValue = model.TypeInt.ToString();
-                    BindGrid2(this.PackagingManageId);
                     if (model.State== HJGL_PackagingmanageService.state_0)
                     {
                         btnSave.Hidden = false;
                     }
                 }
                 else
-                {
+                { 
+                    drpTypeInt.Enabled = true;
                     btnSave.Hidden = false;
-                    txtPackagingCode.Text = ProjectService.GetProjectCodeByProjectId(this.CurrUser.LoginProjectId)+"-"+ string.Format("{0:yyyyMMdd}", DateTime.Now)+"-";
+                    txtPackagingCode.Text = HJGL_PackagingmanageService.GetNewPackagingCode(this.CurrUser.LoginProjectId);
-
                 }
                 drpTypeInt_SelectedIndexChanged(null, null);
             }
@@ -70,25 +70,9 @@ namespace FineUIPro.Web.HJGL.PreDesign
 
         private void BindGrid2(string PackagingManageId)
         {  
-            Grid2.DataSource = PackagingmanagedetailService.GetPackagingData(PackagingManageId);
+            Grid2.DataSource = HJGLPackagingmanagedetailService.GetPackagingData(PackagingManageId);
             Grid2.DataBind();
-        }
+        } 
-
-        //protected void drpPipelineComponentCode_SelectedIndexChanged(object sender, EventArgs e)
-        //{
-        //    if (!string .IsNullOrEmpty(drpPipelineComponentCode.SelectedValue))
-        //    {
-        //        var model_Component = BLL.HJGL_PipelineComponentService.GetPipelineComponentById(drpPipelineComponentCode.SelectedValue);
-        //        var model_pipe=BLL.PipelineService.GetPipelineByPipelineId(model_Component.PipelineId);
-        //        txtPlanStartDate.Text= model_Component.PlanStartDate.ToString();
-        //    }
-        //    else
-        //    {
-        //        txtPlanStartDate.Text =String.Empty;
-
-        //    }
-
-        //}
 
         protected void btnSave_Click(object sender, EventArgs e)
         { 
@@ -112,7 +96,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
                 //table.ContactPhone = txtContactPhone.Text;
                 table.TrainNumberId = drpTrainNumber.SelectedValue;
                 table.TypeInt = int.Parse(drpTypeInt.SelectedValue);
-                if (drpTypeInt.SelectedValue == HJGL_PackagingmanageService.TypeInt.预制组件.ToString())
+                if (drpTypeInt.SelectedValue == ((int)HJGL_PackagingmanageService.TypeInt.预制组件).ToString())
                 {
                     table.PipelineComponentId = string.Join(",", dropPipelineComponentCode.Values);
 
@@ -134,7 +118,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
                     //table.ContactPhone =txtContactPhone.Text;
                     table.TrainNumberId = drpTrainNumber.SelectedValue;
                     table.TypeInt = int.Parse(drpTypeInt.SelectedValue);
-                    if (drpTypeInt.SelectedValue == HJGL_PackagingmanageService.TypeInt.预制组件.ToString())
+                    if (drpTypeInt.SelectedValue ==((int)HJGL_PackagingmanageService.TypeInt.预制组件).ToString())
                     {
                         table.PipelineComponentId = string.Join(",", dropPipelineComponentCode.Values);
 
@@ -142,6 +126,29 @@ namespace FineUIPro.Web.HJGL.PreDesign
                 }
                 BLL.HJGL_PackagingmanageService.UpdateHJGL_PackagingManage(table);
             }
+            SaveDetail();
+        }
+
+        private void SaveDetail()
+        {
+
+            //根据列表中的明细项添加
+            List<Model.PipelinePrefabricatedComponentsItem> detailLists = new List<Model.PipelinePrefabricatedComponentsItem>();
+            JArray teamGroupData = Grid2.GetMergedData();
+            foreach (JObject teamGroupRow in teamGroupData)
+            {
+                JObject values = teamGroupRow.Value<JObject>("values");
+                int rowIndex = teamGroupRow.Value<int>("index");
+                string id = teamGroupRow.Value<string>("id");
+
+                var mdoel = HJGLPackagingmanagedetailService.GetModelById(id);
+                if (mdoel != null)
+                {
+                    mdoel.Number = values.Value<decimal>("Number");
+                }
+                HJGLPackagingmanagedetailService.Update(mdoel);
+            }
+
         }
 
         protected void btnFind_Click1(object sender, EventArgs e)
@@ -175,25 +182,34 @@ namespace FineUIPro.Web.HJGL.PreDesign
             {
                 dropPipelineComponentCode.Hidden=false;
                 Grid2.Hidden=true;
+                BindGrid();
             }
             else if (drpTypeInt.SelectedValue == ((int)HJGL_PackagingmanageService.TypeInt.预制散件).ToString())
             {
                 dropPipelineComponentCode.Hidden = true;
                 Grid2.Hidden = false;
+                btnSelect.Hidden = false;
+                btnSelectStock.Hidden = true;
+                BindGrid2(this.PackagingManageId);
+
             }
             else if (drpTypeInt.SelectedValue == ((int)HJGL_PackagingmanageService.TypeInt.其他材料).ToString())
             {
                 dropPipelineComponentCode.Hidden = true;
                 Grid2.Hidden = false;
+                btnSelect.Hidden = true;
+                btnSelectStock.Hidden = false;
+                BindGrid2(this.PackagingManageId);
+
             }
-             
+
         }
         protected void Grid2_RowCommand(object sender, GridCommandEventArgs e)
         {
             if (e.CommandName == "delete")
             {
                 string id = e.RowID;
-                PackagingmanagedetailService.DeleteById(id);
+                HJGLPackagingmanagedetailService.DeleteById(id);
                 BindGrid2(this.PackagingManageId);
             }
         }

SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageSelect.aspx

@@ -65,8 +65,8 @@
                     <Items>
                         <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title=""     
                             EnableCollapse="true" KeepCurrentSelection="true" runat="server" BoxFlex="1" DisableUnselectableRows="true"
-                            DataKeyNames="PipeLineMatId" EnableColumnLines="true"
+                            DataKeyNames="Id" EnableColumnLines="true"
-                            DataIDField="PipeLineMatId" EnableTextSelection="True" AllowSorting="true" SortField="MaterialCode"
+                            DataIDField="Id" EnableTextSelection="True" AllowSorting="true" SortField="MaterialCode"
                             SortDirection="ASC"   AllowPaging="false" IsDatabasePaging="true"
                             PageSize="1000" EnableCheckBoxSelect="true">
                             <Toolbars>

SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageSelect.aspx.cs

@@ -1,7 +1,9 @@
 using BLL;
 using FastReport.DevComponents.DotNetBar;
 using FineUIPro.Web.HJGL.WeldingManage;
+using Model;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
@@ -287,50 +289,21 @@ namespace FineUIPro.Web.HJGL.PreDesign
 
         #region 数据绑定
 
-        private void BindGrid(string pipelineId, string unitworkid)
+        private void BindGrid(string pipelineId, string unitworkid) 
         {
-            var query = from pipe in Funs.DB.HJGL_PipeLineMat
+            var Prelist = HJGL_PipelineComponentService.GetPipelinePrefabricatedComponent(unitworkid, pipelineId);
-                        join lib in Funs.DB.HJGL_MaterialCodeLib on pipe.MaterialCode equals lib.MaterialCode into libJoin
+             
-                        from libItem in libJoin.DefaultIfEmpty()
-                        join line in Funs.DB.HJGL_Pipeline on pipe.PipelineId equals line.PipelineId into lineJoin
-                        from lineItem in lineJoin.DefaultIfEmpty()
-                        where lineItem != null && lineItem.UnitWorkId == unitworkid && lineItem.PipeArea == "1"
-                              && (pipe.PrefabricatedComponents == null || pipe.PrefabricatedComponents == "")
-                        select new
-                        {
-                            pipe.PipeLineMatId,
-                            libItem.MaterialCode,
-                            libItem.MaterialName,
-                            libItem.MaterialUnit,
-                            libItem.MaterialSpec,
-                            libItem.MaterialMade,
-                            libItem.MaterialDef,
-                            pipe.Number,
-                            pipe.PrefabricatedComponents,
-                            lineItem.PipelineId,
-                        };
-
-            if (!string.IsNullOrEmpty(pipelineId))
-            {
-                query = query.Where(x => x.PipelineId == pipelineId);
-            }
-
-            query = query.OrderBy(x => x.PrefabricatedComponents);
-
             var inoutplandetail = (from x in Funs.DB.HJGL_PackagingManageDetail
-                                       //where x.InOutPlanMasterId == Id && x.PipelineId == this.tvControlItem.SelectedNodeID
+                                        where x.PipelineId == pipelineId
-                                   where x.PipelineId == pipelineId
+                                        && (x.PipelineComponentId == null || x.PipelineComponentId == "")
-                                   && (x.PipelineComponentId == null || x.PipelineComponentId == "")
+                                        select x).ToList();
-                                   select x).ToList();
+            var queryList = Prelist;
-            var  queryList=query.ToList();
+            // 优化 Linq 过滤条件,过滤已经进入包装的预制散件
-            // 优化 Linq 过滤条件
+            var result = (from x in queryList
-            var result  = (from x in queryList
+                          join y in inoutplandetail on x.MaterialCode equals y.MaterialCode into yy
-                           join y in inoutplandetail on x.MaterialCode equals y.MaterialCode into yy
+                          from y in yy.DefaultIfEmpty()
-                     from y in yy.DefaultIfEmpty()
+                          where y == null
-                     where y == null
+                          select x).ToList();
-                     select x).ToList();
-
-            // 2.获取当前分页数据
             Grid1.DataSource = result;
             Grid1.DataBind();
         }
@@ -388,7 +361,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
                             CreateTime = DateTime.Now,
                             CreateUser = this.CurrUser.PersonId,
                         };
-                        PackagingmanagedetailService.Add(model);
+                        HJGLPackagingmanagedetailService.Add(model);
                     }
                 }
             }

SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageSelectStock.aspx

@@ -78,9 +78,9 @@
                         <f:RenderField Width="150px" ColumnID="MaterialUnit" DataField="MaterialUnit" SortField="MaterialUnit"
                             FieldType="String" HeaderText="单位" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="StockNum" DataField="StockNum" SortField="StockNum"
+                        <%--<f:RenderField Width="150px" ColumnID="StockNum" DataField="StockNum" SortField="StockNum"
                             FieldType="String" HeaderText="库存数量" TextAlign="Left" HeaderTextAlign="Center">
-                        </f:RenderField>
+                        </f:RenderField>--%>
                          
                     </Columns>
                     <%--                <Listeners>

SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageSelectStock.aspx.cs

@@ -1,31 +1,33 @@
 using BLL;
+using Model;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel;
 
 namespace FineUIPro.Web.HJGL.PreDesign
 {
 	public partial class PackagingManageSelectStock : PageBase
     {
-        public string Id
+        public string PackagingManageId
         {
             get
             {
-                return (string)ViewState["Id"];
+                return (string)ViewState["PackagingManageId"];
             }
             set
             {
-                ViewState["Id"] = value;
+                ViewState["PackagingManageId"] = value;
             }
         }
         protected void Page_Load(object sender, EventArgs e)
         {
             if (!IsPostBack)
             {
-                Id = Request.QueryString["Id"];
+                PackagingManageId = Request.QueryString["PackagingManageId"];
                 // 绑定表格
                 this.BindGrid();
             }
@@ -36,33 +38,25 @@ namespace FineUIPro.Web.HJGL.PreDesign
         /// 绑定数据
         /// </summary>
         private void BindGrid()
-        {
+        { 
-
-            var inoutplanmaster = TwInOutplanmasterService.GetById(Id);
-            if (inoutplanmaster == null)
-            {
-                return;
-            }
-
             Model.Tw_MaterialStockOutput table = new Model.Tw_MaterialStockOutput();
             table.PipeLineMatCode = txtMatCode.Text.Trim();
-            table.WarehouseCode = inoutplanmaster.WarehouseCode;
+            table.WarehouseCode = "工厂预制";
-            table.ProjectId = this.CurrUser.LoginProjectId;
+            table.ProjectId = this.CurrUser.LoginProjectId; 
-            if (inoutplanmaster.Category == (int)TwConst.Category.管段)
+            var tb = BLL.TwMaterialstockService.GetTw_MaterialStockByModle(table);
-            {
-                table.MaterialUnit = "米";
 
-            }
+            var inoutplandetail = (from x in Funs.DB.HJGL_PackagingManageDetail
-            else if (inoutplanmaster.Category == (int)TwConst.Category.管件)
+                                   where x.PackagingManageId == PackagingManageId 
-            {
+                                   select x).ToList();
-                table.MaterialUnit = "个";
+            var queryList = tb;
-
+            // 优化 Linq 过滤条件,过滤已经进入包装的预制散件
-            }
+            var result = (from x in queryList
-
+                          join y in inoutplandetail on x.PipeLineMatCode equals y.MaterialCode into yy
-            var tb = BLL.TwMaterialstockService.GetListData(table, Grid1);
+                          from y in yy.DefaultIfEmpty()
-            Grid1.RecordCount = TwMaterialstockService.Count;
+                          where y == null
-            //tb = GetFilteredTable(Grid1.FilteredData, tb);
+                          select x).ToList();
-            Grid1.DataSource = tb;
+            Grid1.RecordCount = result.Count; 
+            Grid1.DataSource = result;
             Grid1.DataBind();
         }
         #endregion
@@ -90,28 +84,21 @@ namespace FineUIPro.Web.HJGL.PreDesign
             {
                 foreach (var id in List_Id)
                 {
-                    var StockModel = TwMaterialstockService.GetTw_MaterialStockById(id);
+                    var StockModel = TwMaterialstockService.GetTw_MaterialStockById(id); 
-                    var querydetail = new Model.Tw_InOutDetailOutput()
+                    var model = new Model.HJGL_PackagingManageDetail()
                     {
-                        InOutPlanMasterId = Id,
+                        Id = SQLHelper.GetNewID(),
+                        PackagingManageId = this.PackagingManageId, 
                         MaterialCode = StockModel.PipeLineMatCode,
+                        Number = 0,
+                        CreateTime = DateTime.Now,
+                        CreateUser = this.CurrUser.PersonId,
                     };
-                    var detail = TwInOutplandetailService.GetByModle(querydetail).FirstOrDefault();
+                    HJGLPackagingmanagedetailService.Add(model);
-                    if (detail == null)
-                    {
-                        var tw_InOutPlanDetail = new Model.Tw_InOutPlanDetail
-                        {
-                            Id = Guid.NewGuid().ToString(),
-                            InOutPlanMasterId = Id,
-                            MaterialCode = StockModel.PipeLineMatCode,
-                            PlanNum = 0,
-                        };
-                        TwInOutplandetailService.Add(tw_InOutPlanDetail);
-                    }
                 }
             }
-
         }
+ 
         #endregion
 
         #region GV 数据操作

SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageView.aspx.cs

@@ -1,9 +1,11 @@
 using BLL;
+using Model;
 using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.IO;
+using System.Linq;
 using System.Text;
 using AspNet = System.Web.UI.WebControls;
 namespace FineUIPro.Web.HJGL.PreDesign
@@ -43,14 +45,36 @@ namespace FineUIPro.Web.HJGL.PreDesign
         /// </summary>
         private void BindGrid()
         {
-           
+            var pack = HJGL_PackagingmanageService.GetHJGL_PackagingManageById(PackagingManageId);
-            DataTable tb = BLL.HJGL_PackagingmanageService.GetPackagingDetailById(PackagingManageId);
+            if (pack == null) return;
+            if (pack.TypeInt == (int)HJGL_PackagingmanageService.TypeInt.预制组件)
+            {
+                DataTable tb = BLL.HJGL_PackagingmanageService.GetPackagingDetailById(PackagingManageId);
 
-            Grid1.RecordCount = tb.Rows.Count;
+                Grid1.RecordCount = tb.Rows.Count;
-            tb = GetFilteredTable(Grid1.FilteredData, tb);
+                tb = GetFilteredTable(Grid1.FilteredData, tb);
-            var table = this.GetPagedDataTable(Grid1, tb);
+                var table = this.GetPagedDataTable(Grid1, tb);
-            Grid1.DataSource = table;
+                Grid1.DataSource = table;
-            Grid1.DataBind();
+                Grid1.DataBind();
+            }
+            else  
+            {
+                var result = HJGLPackagingmanagedetailService.GetPackagingData(PackagingManageId).ToList();
+                var detailList = from x in result
+                        select new
+                        {
+                            PipelineComponentId = x.Id,
+                            PipelineComponentCode = x.MaterialCode,
+                            num = x.Number,
+                            CU = x.MaterialUnit,
+                            UnitWorkName = x.UnitWorkId == null ? "" : UnitWorkService.GetNameById(x.UnitWorkId)
+                        };
+                Grid1.RecordCount = detailList.Count();  
+                Grid1.DataSource = detailList;
+                Grid1.DataBind();
+            } 
+
+           
         }
         #endregion
 

SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx

@@ -5,114 +5,119 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>车次管理表</title>
     <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
     <style type="text/css">
         .f-grid-row .f-grid-cell-inner {
             white-space: normal;
             word-break: break-all;
-        }   
+        }
-        .f-grid-row.yellow
+
-        {
+        .f-grid-row.yellow {
             background-color: YellowGreen;
             background-image: none;
         }
-        
+
-        .f-grid-row.red
+        .f-grid-row.red {
-        {
             background-color: Yellow;
         }
     </style>
 </head>
 <body>
     <form id="form1" runat="server">
-    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" AutoScroll="true"
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" AutoScroll="true"
-        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-        <Items>
+            <Items>
-            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="车次管理表" EnableCollapse="true"  
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="车次管理表" EnableCollapse="true"
-                runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"  ForceFit="true"
+                    runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" ForceFit="true"
-                ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="Id"
+                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="Id"
-                SortDirection="DESC" OnSort="Grid1_Sort"  EnableColumnLines="true"
+                    SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true"
-                AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" OnRowCommand="Grid1_RowCommand">
-                <Toolbars>
+                    <Toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
-                        <Items>
+                            <Items>
-                            <f:Button ID="btnNew" ToolTip="新增" Text="新增" Hidden="true" Icon="Add" runat="server" 
+                                <f:Button ID="btnNew" ToolTip="新增" Text="新增" Hidden="true" Icon="Add" runat="server"
-                                OnClick="btnNew_Click">
+                                    OnClick="btnNew_Click">
-                            </f:Button>
+                                </f:Button>
-                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
-                                EnableAjax="false" DisableControlBeforePostBack="false">
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
-                            </f:Button>                            
+                                </f:Button>
-                        </Items>
+                            </Items>
-                    </f:Toolbar>
+                        </f:Toolbar>
-                </Toolbars>
+                    </Toolbars>
-                <Columns>
+                    <Columns>
-                    <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
+                        <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
-                        TextAlign="Center">
+                            TextAlign="Center">
-                        <ItemTemplate>
+                            <ItemTemplate>
-                            <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                        </ItemTemplate>
+                            </ItemTemplate>
-                    </f:TemplateField>    
+                        </f:TemplateField>
-                               
+
-                          <f:RenderField Width="150px" ColumnID="TrainNumber" DataField="TrainNumber" SortField="TrainNumber"
+                        <f:RenderField Width="150px" ColumnID="TrainNumber" DataField="TrainNumber" SortField="TrainNumber"
-                             FieldType="String" HeaderText="车次" TextAlign="Left" HeaderTextAlign="Center" >
+                            FieldType="String" HeaderText="车次" TextAlign="Left" HeaderTextAlign="Center">
-                           </f:RenderField> 
+                        </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="DriverName" DataField="DriverName" SortField="DriverName"
+                        <f:RenderField Width="150px" ColumnID="DriverName" DataField="DriverName" SortField="DriverName"
-                             FieldType="String" HeaderText="驾驶员姓名" TextAlign="Left" HeaderTextAlign="Center" >
+                            FieldType="String" HeaderText="驾驶员姓名" TextAlign="Left" HeaderTextAlign="Center">
-                           </f:RenderField>
+                        </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="DriverPhone" DataField="DriverPhone" SortField="DriverPhone"
+                        <f:RenderField Width="150px" ColumnID="DriverPhone" DataField="DriverPhone" SortField="DriverPhone"
-                             FieldType="String" HeaderText="驾驶员电话" TextAlign="Left" HeaderTextAlign="Center" >
+                            FieldType="String" HeaderText="驾驶员电话" TextAlign="Left" HeaderTextAlign="Center">
-                           </f:RenderField>
+                        </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="LicensePlateNumber" DataField="LicensePlateNumber" SortField="LicensePlateNumber"
+                        <f:RenderField Width="150px" ColumnID="LicensePlateNumber" DataField="LicensePlateNumber" SortField="LicensePlateNumber"
-                             FieldType="String" HeaderText="车牌号" TextAlign="Left" HeaderTextAlign="Center" >
+                            FieldType="String" HeaderText="车牌号" TextAlign="Left" HeaderTextAlign="Center">
-                           </f:RenderField>
+                        </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="ContactName" DataField="ContactName" SortField="ContactName"
+                        <f:RenderField Width="150px" ColumnID="ContactName" DataField="ContactName" SortField="ContactName"
-                             FieldType="String" HeaderText="联系人姓名" TextAlign="Left" HeaderTextAlign="Center" >
+                            FieldType="String" HeaderText="联系人姓名" TextAlign="Left" HeaderTextAlign="Center">
-                           </f:RenderField>
+                        </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="ContactPhone" DataField="ContactPhone" SortField="ContactPhone"
+                        <f:RenderField Width="150px" ColumnID="ContactPhone" DataField="ContactPhone" SortField="ContactPhone"
-                             FieldType="String" HeaderText="联系人电话" TextAlign="Left" HeaderTextAlign="Center" >
+                            FieldType="String" HeaderText="联系人电话" TextAlign="Left" HeaderTextAlign="Center">
-                           </f:RenderField>
+                        </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="Remark" DataField="Remark" SortField="Remark"
+                        <f:RenderField Width="150px" ColumnID="Remark" DataField="Remark" SortField="Remark"
-                             FieldType="String" HeaderText="备注" TextAlign="Left" HeaderTextAlign="Center" >
+                            FieldType="String" HeaderText="备注" TextAlign="Left" HeaderTextAlign="Center">
-                           </f:RenderField>
+                        </f:RenderField>
-                     
+                        <f:LinkButtonField Width="120px" TextAlign="Center" CommandName="TrainDetail" Text="车次明细" />
-                </Columns>
+
-                <Listeners>
+
-                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Columns>
-                </Listeners>
+                    <Listeners>
-                <PageItems>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                    </Listeners>
-                    </f:ToolbarSeparator>
+                    <PageItems>
-                    <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                    </f:ToolbarText>
+                        </f:ToolbarSeparator>
-                    <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                        </f:ToolbarText>
-                        <f:ListItem Text="10" Value="10" />
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                        <f:ListItem Text="15" Value="15" />
+                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                        <f:ListItem Text="20" Value="20" />
+                            <f:ListItem Text="10" Value="10" />
-                        <f:ListItem Text="25" Value="25" />
+                            <f:ListItem Text="15" Value="15" />
-                        <f:ListItem Text="所有行" Value="100000" />
+                            <f:ListItem Text="20" Value="20" />
-                    </f:DropDownList>
+                            <f:ListItem Text="25" Value="25" />
-                </PageItems>
+                            <f:ListItem Text="所有行" Value="100000" />
-            </f:Grid>
+                        </f:DropDownList>
-        </Items>
+                    </PageItems>
-    </f:Panel>
+                </f:Grid>
-    <f:Window ID="Window1" runat="server" Hidden="true" ShowHeader="true"
+            </Items>
-        IsModal="true" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window1_Close"
+        </f:Panel>
-        Title="编辑" EnableIFrame="true" Height="650px"
+        <f:Window ID="Window1" runat="server" Hidden="true" ShowHeader="true"
-        Width="1200px">
+            IsModal="true" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window1_Close"
-    </f:Window>
+            Title="编辑" EnableIFrame="true" Height="650px"
-    <f:Menu ID="Menu1" runat="server">      
+            Width="1200px">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnEdit_Click" EnablePostBack="true"
+        </f:Window>
-            Hidden="true" runat="server" Text="编辑" Icon="TableEdit" >
+        <f:Window ID="Window2" Title="车次明细" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        </f:MenuButton>
+            Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
-        <f:MenuButton ID="btnMenuDelete" OnClick="btnDelete_Click" EnablePostBack="true"  Icon="Delete"
+            Width="900px" Height="660px">
-            Hidden="true" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
+        </f:Window>
-        </f:MenuButton>
+        <f:Menu ID="Menu1" runat="server">
-    </f:Menu>
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnEdit_Click" EnablePostBack="true"
+                Hidden="true" runat="server" Text="编辑" Icon="TableEdit">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuDelete" OnClick="btnDelete_Click" EnablePostBack="true" Icon="Delete"
+                Hidden="true" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
+            </f:MenuButton>
+        </f:Menu>
     </form>
     <script type="text/javascript">
         var menuID = '<%= Menu1.ClientID %>';

SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx.cs

@@ -244,5 +244,15 @@ namespace FineUIPro.Web.HJGL.PreDesign
             return sb.ToString();
         }
         #endregion
+
+        protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
+        {
+            if (e.CommandName == "TrainDetail")
+            {
+                string id = Grid1.SelectedRowID;
+                string url = "TrainNumberManagerView.aspx?TrainNumberId={0}";
+                PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format(url, id, "操作 - ")));
+            }
+        }
     }
 }

SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx.designer.cs

@@ -122,6 +122,15 @@ namespace FineUIPro.Web.HJGL.PreDesign
         /// </remarks>
         protected global::FineUIPro.Window Window1;
 
+        /// <summary>
+        /// Window2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window2;
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>

SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManagerView.aspx

@@ -0,0 +1,56 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TrainNumberManagerView.aspx.cs" Inherits="FineUIPro.Web.HJGL.PreDesign.TrainNumberManagerView" %>
+ 
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <Items>
+            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="明细" EnableCollapse="true" ForceFit="true"
+                runat="server" BoxFlex="1" DataKeyNames="PackagingManageId" AllowCellEditing="true"
+                ClicksToEdit="2" DataIDField="PackagingManageId" AllowSorting="true" SortField="PackagingCode"
+                SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" EnableColumnLines="true"
+                PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange"
+                EnableTextSelection="True" EnableRowDoubleClickEvent="true" >
+                <Columns>
+                    <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
+                        TextAlign="Center">
+                        <ItemTemplate>
+                            <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                        </ItemTemplate>
+                    </f:TemplateField>
+                    <f:RenderField Width="160px" ColumnID="PackagingCode" DataField="PackagingCode"
+                        FieldType="String" HeaderText="包装编号" HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>  
+                </Columns>
+ 
+                <PageItems>
+                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                    </f:ToolbarSeparator>
+                    <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                    </f:ToolbarText>
+                    <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                        OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                        <f:ListItem Text="10" Value="10" />
+                        <f:ListItem Text="15" Value="15" />
+                        <f:ListItem Text="20" Value="20" />
+                        <f:ListItem Text="25" Value="25" />
+                    </f:DropDownList>
+                </PageItems>
+            </f:Grid>
+        </Items>
+    </f:Panel>
+    </form>
+    <script type="text/javascript">
+        
+    </script>
+</body>
+</html>
+

SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManagerView.aspx.cs

@@ -0,0 +1,104 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.HJGL.PreDesign
+{
+    public partial class TrainNumberManagerView : PageBase
+    {
+        public string TrainNumberId
+        {
+            get
+            {
+                return (string)ViewState["TrainNumberId"];
+            }
+            set
+            {
+                ViewState["TrainNumberId"] = value;
+            }
+        }
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                TrainNumberId = Request.Params["TrainNumberId"];
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+
+            var result = HJGL_PackagingmanageService.GetPackagingManage(TrainNumberId); 
+            Grid1.RecordCount = result.Count();
+            Grid1.DataSource = result;
+            Grid1.DataBind();
+
+
+        }
+        #endregion
+
+
+        #region 表头过滤
+        protected void Grid1_FilterChange(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 页索引改变事件
+        /// <summary>
+        /// 页索引改变事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            Grid1.PageIndex = e.NewPageIndex;
+            BindGrid();
+        }
+        #endregion
+
+        #region 排序
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            Grid1.SortDirection = e.SortDirection;
+            Grid1.SortField = e.SortField;
+            BindGrid();
+        }
+        #endregion
+
+        #region 分页选择下拉改变事件
+        /// <summary>
+        /// 分页选择下拉改变事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+        #endregion
+    }
+}

SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManagerView.aspx.designer.cs

@@ -0,0 +1,89 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HJGL.PreDesign
+{
+
+
+    public partial class TrainNumberManagerView
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// lblNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}

SGGL/Model/HJGL/PipelineComponentPrintDto.cs

@@ -0,0 +1,23 @@
+namespace Model
+{
+    public class PipelineComponentPrintDto 
+    {
+        public string PipelineComponentId { get; set; }
+        public string PipelineComponentCode { get; set; }
+        public string BoxNumber { get; set; }
+        public string UnitWorkName { get; set; }
+        public string PipelineId { get; set; }
+        public string PreUnit { get; set; }
+        public string AssembleUnit { get; set; }
+        public string PrefabricatedComponents { get; set; }
+        public string QRCode { get; set; }
+        public int? State { get; set; }
+        public string PlanStartDate { get; set; }
+        public string PipelineCode { get; set; }
+        public string FlowingSection { get; set; }
+        public string QRCode2 { get; set; }
+        public string MaterialCode { get; set; }
+        public bool? IsPrint { get; set; }
+    }
+
+}

SGGL/Model/HJGL/PipelinePrefabricatedComponentsItem.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    /// <summary>
+    /// 管线预制散件
+    /// </summary>
+    public class PipelinePrefabricatedComponentsItem
+    {
+        public string Id { get; set; }
+        public string MaterialCode { get; set; }
+        public string MaterialName { get; set; }
+        public string MaterialUnit { get; set; }
+        public string MaterialSpec { get; set; }
+        public string MaterialMade { get; set; }
+        public string MaterialDef { get; set; }
+        public decimal? Number { get; set; }
+        public string PrefabricatedComponents { get; set; }
+        public string PipelineId { get; set; }
+        public string PipelineCode { get; set; }
+        public string UnitWorkId { get; set; }
+        public string ProjectId { get; set; }
+    }
+}

SGGL/Model/Model.csproj

@@ -225,7 +225,9 @@
     <Compile Include="HJGL\3DParameter.cs" />
     <Compile Include="HJGL\MaterialStockItem.cs" />
     <Compile Include="APIItem\HJGL\PackagingManageItem.cs" />
+    <Compile Include="HJGL\PipelineComponentPrintDto.cs" />
     <Compile Include="HJGL\PipeLineIdCodeItem.cs" />
+    <Compile Include="HJGL\PipelinePrefabricatedComponentsItem.cs" />
     <Compile Include="HJGL\Pipeline_ComponentQRCodeItem.cs" />
     <Compile Include="HJGL\PointBatch.cs" />
     <Compile Include="HJGL\PointBatchItem.cs" />