焊接修改

2025-09-24 17:31:28 +08:00
parent cb92dcb730
commit 0f70405339
64 changed files with 2492 additions and 2040 deletions
@@ -21,6 +21,58 @@ namespace BLL
            get;
            set;
        }
+        public static List<Model.HJGL_PackagingManageDetail> GetListByQueryModle(Model.HJGL_PackagingManageDetail table)
+        {
+            return GetByQueryModle(table).ToList();
+
+        }
+
+        public static (List<Model.HJGL_PackagingManageDetail> Data, int Total) GetListByQueryModle(Model.HJGL_PackagingManageDetail table, int pageIndex = 0, int pageSize = 20)
+        {
+            var baseQuery = GetByQueryModle(table);
+            var pagedData = baseQuery
+                            .Skip((pageIndex) * pageSize)
+                            .Take(pageSize)
+                            .ToList();
+
+            // 获取总记录数（延迟计数优化）
+            var totalCount = baseQuery.Count();
+
+            return (pagedData, totalCount);
+
+        }
+
+        /// <summary>
+        /// 获取分页列表
+        /// </summary>
+        /// <param name="table"></param>
+        /// <param name="grid1"></param>
+        /// <returns></returns>
+        public static IEnumerable GetListData(Model.HJGL_PackagingManageDetail table, Grid grid1)
+        {
+            var q = GetByQueryModle(table);
+            Count = q.Count();
+            if (Count == 0)
+            {
+                return null;
+            }
+            q = q.Skip(grid1.PageSize * grid1.PageIndex).Take(grid1.PageSize);
+            // q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
+            return from x in q
+                   select new
+                   {
+                       x.Id,
+                       x.PackagingManageId,
+                       x.PipelineId,
+                       x.PipelineComponentId,
+                       x.MaterialCode,
+                       x.Number,
+                       x.CreateTime,
+                       x.CreateUser,
+
+                   };
+        }
+
        private static IQueryable<Model.HJGL_PackagingManageDetail> GetByQueryModle(Model.HJGL_PackagingManageDetail table)
        {
            var q = from x in Funs.DB.HJGL_PackagingManageDetail select x;
@@ -64,128 +116,9 @@ namespace BLL

            return q;
        }
-        public static List<Model.HJGL_PackagingManageDetail> GetListByQueryModle(Model.HJGL_PackagingManageDetail table)
-        {
-            return GetByQueryModle(table).ToList();
-
-        }
-        public static (List<Model.HJGL_PackagingManageDetail> Data, int Total) GetListByQueryModle(Model.HJGL_PackagingManageDetail table, int pageIndex = 0, int pageSize = 20)
-        {
-            var baseQuery = GetByQueryModle(table);
-            var pagedData = baseQuery
-                            .Skip((pageIndex) * pageSize)
-                            .Take(pageSize)
-                            .ToList();
-
-            // 获取总记录数（延迟计数优化）
-            var totalCount = baseQuery.Count();
-
-            return (pagedData, totalCount);
-
-        }
-        /// <summary>
-        /// 获取分页列表
-        /// </summary>
-        /// <param name="table"></param>
-        /// <param name="grid1"></param>
-        /// <returns></returns>
-        public static IEnumerable GetListData(Model.HJGL_PackagingManageDetail table, Grid grid1)
-        {
-            var q = GetByQueryModle(table);
-            Count = q.Count();
-            if (Count == 0)
-            {
-                return null;
-            }
-            q = q.Skip(grid1.PageSize * grid1.PageIndex).Take(grid1.PageSize);
-            // q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
-            return from x in q
-                   select new
-                   {
-                       x.Id,
-                       x.PackagingManageId,
-                       x.PipelineId,
-                       x.PipelineComponentId,
-                       x.MaterialCode,
-                       x.Number,
-                       x.CreateTime,
-                       x.CreateUser,
-
-                   };
-        }
-
        #endregion

-        public static Model.HJGL_PackagingManageDetail GetModelById(string Id)
-        {
-            return Funs.DB.HJGL_PackagingManageDetail.FirstOrDefault(x => x.Id == Id);
-        }
-        public static IEnumerable<Model.PipelinePrefabricatedComponentsItem> GetPackagingData(string PackagingManageId)
-        {
-            if (string.IsNullOrEmpty(PackagingManageId))
-            {
-                return null;
-            }
-            var pack = HJGL_PackagingmanageService.GetHJGL_PackagingManageById(PackagingManageId);
-            if (pack == null)
-            {
-                return null;
-            }
-            var result = new List<Model.PipelinePrefabricatedComponentsItem>();
-            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 != "") &&   (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,
-                            FlowingSection = lineItem.FlowingSection,
-
-                        };
-               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,
-                            FlowingSection = lineItem.FlowingSection,
-
-                        };
-                result = q.ToList();
-
-            }
-            return result;
-        }
+        #region Methods

        public static void Add(Model.HJGL_PackagingManageDetail newtable)
        {
@@ -200,10 +133,84 @@ namespace BLL
                Number = newtable.Number,
                CreateTime = newtable.CreateTime,
                CreateUser = newtable.CreateUser,
+                TwOutputDetailId = newtable.TwOutputDetailId,
            };
            Funs.DB.HJGL_PackagingManageDetail.InsertOnSubmit(table);
            Funs.DB.SubmitChanges();
        }
+
+        public static void AddBulk(List<Model.HJGL_PackagingManageDetail> newtables)
+        {
+
+            Funs.DB.HJGL_PackagingManageDetail.InsertAllOnSubmit(newtables);
+            Funs.DB.SubmitChanges();
+        }
+
+        public static void DeleteById(string Id)
+        {
+
+            Model.HJGL_PackagingManageDetail table = Funs.DB.HJGL_PackagingManageDetail.FirstOrDefault(x => x.Id == Id);
+            if (table != null)
+            {
+                Funs.DB.HJGL_PackagingManageDetail.DeleteOnSubmit(table);
+                Funs.DB.SubmitChanges();
+            }
+
+        }
+
+        public static void DeleteByPackagingManageId(string packagingManageId)
+        {
+
+            var list = Funs.DB.HJGL_PackagingManageDetail.Where(x => x.PackagingManageId == packagingManageId).ToList();
+            if (list.Count > 0)
+            {
+                Funs.DB.HJGL_PackagingManageDetail.DeleteAllOnSubmit(list);
+                Funs.DB.SubmitChanges();
+            }
+
+        }
+
+        public static Model.HJGL_PackagingManageDetail GetModelById(string Id)
+        {
+            return Funs.DB.HJGL_PackagingManageDetail.FirstOrDefault(x => x.Id == Id);
+        }
+        public static IEnumerable<Model.PipelinePrefabricatedComponentsItem> GetPackagingData(string PackagingManageId)
+        {
+            if (string.IsNullOrEmpty(PackagingManageId))
+            {
+                return null;
+            }
+            var pack = HJGLPackagingmanageService.GetHJGL_PackagingManageById(PackagingManageId);
+            if (pack == null)
+            {
+                return null;
+            }
+            var result = new List<Model.PipelinePrefabricatedComponentsItem>();
+            var q = from tb in Funs.DB.HJGL_PackagingManageDetail
+                    join lib in Funs.DB.HJGL_MaterialCodeLib on tb.MaterialCode equals lib.MaterialCode into libJoin
+                    from libItem in libJoin.DefaultIfEmpty()
+                    join twOutDetail in Funs.DB.Tw_OutputDetail on tb.TwOutputDetailId equals twOutDetail.Id into twOutDetailJoin
+                    from twOutDetailItem in twOutDetailJoin.DefaultIfEmpty()
+                    join twOut in Funs.DB.Tw_OutputMaster on twOutDetailItem.OutputMasterId equals twOut.Id into twOutJoin
+                    from twOutItem in twOutJoin.DefaultIfEmpty()
+                    join twOutPlan in Funs.DB.Tw_InOutPlanMaster on twOutItem.InOutPlanMasterId equals twOutPlan.Id into twOutPlanJoin
+                    from twOutPlanItem in twOutPlanJoin.DefaultIfEmpty()
+                    where tb.PackagingManageId == PackagingManageId /*&& (detail.PipelineId != null  || detail.PipelineId != "") &&   (detail.PipelineComponentId == null || detail.PipelineComponentId == "")*/
+                    select new PipelinePrefabricatedComponentsItem
+                    {
+                        Id = tb.Id,
+                        MaterialCode = libItem.MaterialCode,
+                        MaterialName = libItem.MaterialName,
+                        MaterialUnit = libItem.MaterialUnit,
+                        MaterialSpec = libItem.MaterialSpec,
+                        MaterialMade = libItem.MaterialMade,
+                        MaterialDef = libItem.MaterialDef,
+                        Number = tb.Number,
+                        CusBillCode = twOutItem.CusBillCode, 
+                    };
+            result = q.ToList();
+            return result;
+        }
        public static void Update(Model.HJGL_PackagingManageDetail newtable)
        {

@@ -218,38 +225,12 @@ namespace BLL
                table.Number = newtable.Number;
                table.CreateTime = newtable.CreateTime;
                table.CreateUser = newtable.CreateUser;
+                table.TwOutputDetailId = newtable.TwOutputDetailId;
                Funs.DB.SubmitChanges();
            }

        }
-        public static void DeleteById(string Id)
-        {
-
-            Model.HJGL_PackagingManageDetail table = Funs.DB.HJGL_PackagingManageDetail.FirstOrDefault(x => x.Id == Id);
-            if (table != null)
-            {
-                Funs.DB.HJGL_PackagingManageDetail.DeleteOnSubmit(table);
-                Funs.DB.SubmitChanges();
-            }
-
-        }
-        public static void DeleteByPackagingManageId(string packagingManageId)
-        {
-
-             var  list = Funs.DB.HJGL_PackagingManageDetail.Where(x => x.PackagingManageId == packagingManageId).ToList();
-            if (list.Count>0)
-            {
-                Funs.DB.HJGL_PackagingManageDetail.DeleteAllOnSubmit(list);
-                Funs.DB.SubmitChanges();
-            }
-
-        }
-        public static void AddBulk(List<Model.HJGL_PackagingManageDetail> newtables)
-        {
-
-            Funs.DB.HJGL_PackagingManageDetail.InsertAllOnSubmit(newtables);
-            Funs.DB.SubmitChanges();
-        }

+        #endregion Methods
    }
 }