焊接修改

SGGL/BLL/CLGL/TwInOutplandetailRelationService.cs

@@ -203,5 +203,29 @@ namespace BLL
             TwInoutplandetailRelationService.AddList(twinoutplandetailRelationList, inOutPlanMasterId);
 
         }
+
+          
+        public static IEnumerable GetPrintListByOutputMasterIds(List<string> outputMasterIds)
+        {
+            var q = from x in Funs.DB.Tw_InOutPlanDetail_Relation
+                    join y in Funs.DB.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
+                    join plan in Funs.DB.Tw_InOutPlanMaster on x.InOutPlanMasterId  equals plan.Id
+                    join master in Funs.DB.Tw_OutputMaster on plan.Id equals master.InOutPlanMasterId
+                    join pipe in Funs.DB.HJGL_Pipeline on x.PipelineId equals pipe.PipelineId
+                    where outputMasterIds.Contains(master.Id)
+                orderby master.CusBillCode
+                select new
+                {
+                    出库单编号 = master.CusBillCode,
+                    管线号=pipe.PipelineCode,
+                    预制组件号= x.PrefabricatedComponents,
+                    材料编码 = x.MaterialCode,
+                    材料名称 = y.MaterialName,
+                    材料描述 = y.MaterialDef,
+                    单位=y.MaterialUnit,
+                    所需量 = x.Number, 
+                };
+            return q;
+        }
     }
 }

SGGL/BLL/CLGL/TwOutputdetailService..cs

@@ -129,5 +129,24 @@ namespace BLL
 
         }
 
+        public static IEnumerable GetPrintListByOutputMasterIds(List<string> outputMasterIds)
+        {
+           var q=  from x in Funs.DB.Tw_OutputDetail
+                join y in Funs.DB.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
+                join master in Funs.DB.Tw_OutputMaster on x.OutputMasterId equals master.Id
+                where outputMasterIds.Contains(x.OutputMasterId)
+                orderby master.CusBillCode
+                   select new
+                {
+                    出库单编号 = master.CusBillCode,
+                    材料编码 = x.MaterialCode,
+                    材料名称 = y.MaterialName,
+                    材料描述 = y.MaterialDef,
+                    计划数量 = x.PlanNum,
+                    实际数量 = x.ActNum,
+                };
+            return q;
+        }
+
     }
 }

SGGL/BLL/CLGL/TwOutputmasterService.cs

@@ -52,6 +52,7 @@ namespace BLL
                     (table.TypeInt == null || x.TypeInt == table.TypeInt) &&
                     (table.Category == null || x.Category == table.Category) &&
                     (table.State == null || x.State == table.State)
+                    orderby x.CreateDate descending 
                 select new Model.Tw_InOutMasterOutput
                 {
                     Id = x.Id,