焊接材料管理修改

SGGL/BLL/API/HJGL/APIPackagingManageService.cs

@@ -29,7 +29,8 @@ namespace BLL
                             StackingPosition = x.StackingPosition,
                             State= x.State,
                             ReceiveMan=t.PersonName,
-                            ReceiveDate = string.Format("{0:g}", x.ReceiveDate)
+                            ReceiveDate = string.Format("{0:g}", x.ReceiveDate),
+                            TrainNumber=x.TrainNumber,
                         }).Distinct();
                 return q.ToList();
 
@@ -57,7 +58,8 @@ namespace BLL
                              StackingPosition = x.StackingPosition,
                              State =x.State,
                              ReceiveMan = t.PersonName,
-                             ReceiveDate = string.Format("{0:g}", x.ReceiveDate)
+                             ReceiveDate = string.Format("{0:g}", x.ReceiveDate),
+                             TrainNumber = x.TrainNumber,
                          }).FirstOrDefault();
                 var tb_packing = (from x in db.HJGL_PackagingManage where x.PackagingManageId==packagingManageId  select x ).FirstOrDefault()  ;
                 var PipelineComponentIdList = tb_packing.PipelineComponentId.Split(',');

SGGL/BLL/API/HJGL/APIPipelineComponentService.cs

@@ -51,6 +51,9 @@ namespace BLL
                          join m in db.Person_Persons on x.ReceiveMan equals m.PersonId into pp
                          from t in tt.DefaultIfEmpty()
                          from p in pp.DefaultIfEmpty()
+                         join unitwork in db.WBS_UnitWork on y.UnitWorkId equals unitwork.UnitWorkId into unitworks
+                         from unitwork in unitworks.DefaultIfEmpty()
+
                          where x.PipelineComponentId== PipelineComponentId
                          select new PipelineComponentItem
                          {
@@ -63,7 +66,8 @@ namespace BLL
                              PlanStartDate = string.Format("{0:g}", y.PlanStartDate),
                              QRCode = x.QRCode,
                              ReceiveMan = p.PersonName,
-                             ReceiveDate = string.Format("{0:g}", x.ReceiveDate)
+                             ReceiveDate = string.Format("{0:g}", x.ReceiveDate),
+                             UnitWorkName=unitwork.UnitWorkName,
                          }).FirstOrDefault();
                 bool isPower = Person_PersonsService.IsGeneralUnitByPersonId(personId, projectId);
                 pipelineComponentDetail.pipelineComponentItem = q;

SGGL/BLL/API/HJGL/APIPreWeldingDailyService.cs

@@ -237,7 +237,7 @@ namespace BLL
                     ProjectId = newItem.ProjectId,
                     UnitWorkId = newItem.UnitWorkId,
                     UnitId = newItem.UnitId,
-                    WeldingDate = newItem.WeldingDate,
+                    WeldingDate = newItem.WeldingDate, 
                     Tabler = newItem.Tabler,
                     TableDate = newItem.TableDate,
                     Remark = newItem.Remark,