材料管理修改

SGGL/BLL/CLGL/TwArrivalStatisticsService.cs

@@ -16,6 +16,7 @@ namespace BLL
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
+                ///所需材料数量列表
                 var NeedOutMateriaList = from x in db.HJGL_PipeLineMat
                                      join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
                                      join z in db.HJGL_Pipeline on x.PipelineId equals z.PipelineId
@@ -27,7 +28,7 @@ namespace BLL
                                          g.Key,
                                          NeedNum = g.Sum(x => x.Number) ?? 0, 
                                      };
-
+                ///实际材料入库数量列表
                 var RealInMateriaList = from x in db.Tw_InputDetail
                                         join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
                                         group x by x.MaterialCode
@@ -44,9 +45,12 @@ namespace BLL
                                     from y in gg.DefaultIfEmpty()
                                     join z in db.HJGL_MaterialCodeLib on x.Key equals z.MaterialCode into zz
                                     from z in zz.DefaultIfEmpty() 
+                                    join m in db.Tw_MaterialStock on x.Key equals m.PipeLineMatCode into mm
+                                    from m in mm.DefaultIfEmpty()
                                     select new Tw_ArrivalStatisticsOutPut
                                     {
                                         MaterialCode = x.Key,
+                                        StockNum = m==null?0: (decimal)m.StockNum,
                                         NeedNum = x.NeedNum,
                                         RealNum = y==null?0:y.RealNum,
                                         MaterialName = z.MaterialName,
@@ -75,12 +79,15 @@ namespace BLL
                 var requiredMaterials = (from x in db.HJGL_PipeLineMat
                                          join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
                                          join z in db.HJGL_Pipeline on x.PipelineId equals z.PipelineId
+                                         join m in db.WBS_UnitWork on z.UnitWorkId equals m.UnitWorkId
                                          where z.ProjectId == projectid && pipelineIds.Contains(z.PipelineId)
                                          select new  Tw_PipeMatMatchOutput
                                          {
                                              Id= Guid.NewGuid().ToString(),
                                              PipelineId =x.PipelineId,
                                              PipelineCode=z.PipelineCode,
+                                             UnitWorkId=z.UnitWorkId,
+                                             UnitWorkName=m.UnitWorkName,
                                              PrefabricatedComponents=x.PrefabricatedComponents,
                                              MaterialCode = x.MaterialCode,
                                              MaterialName=  y.MaterialName,

SGGL/BLL/CLGL/TwInOutplandetailRelationService.cs

@@ -80,7 +80,14 @@ namespace BLL
             return Funs.DB.Tw_InOutPlanDetail_Relation.FirstOrDefault(x => x.Id == Id);
         }
 
-
+        public static Model.Tw_InOutPlanDetail_Relation GetByPipelineId(string pipelineId,string WarehouseCode)
+        {
+            var q= from x in  Funs.DB.Tw_InOutPlanDetail_Relation
+                   join y in Funs.DB .Tw_InOutPlanMaster on x.InOutPlanMasterId equals y.Id
+                   where x.PipelineId == pipelineId && y.WarehouseCode == WarehouseCode
+                   select x;
+            return q.FirstOrDefault(); 
+        }
         public static void Add(Model.Tw_InOutPlanDetail_Relation newtable)
         {
 

SGGL/BLL/CLGL/TwInputmasterService.cs

@@ -254,7 +254,7 @@ namespace BLL
                 ReqUnitId = plan.ReqUnitId,
                 AuditMan = plan.CreateMan,
                 AuditDate = plan.AuditDate,
-                Remark=plan.Remark
+                Remark= remark
             };
             if ((TwConst.TypeInt)plan.TypeInt!= TwConst.TypeInt.采购入库)
             {