增加焊接任务单打印

SGGL/BLL/API/HJGL/APIPipelineComponentService.cs

@@ -52,8 +52,7 @@ namespace BLL
                          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()
-
+                         from unitwork in unitworks.DefaultIfEmpty() 
                          where x.PipelineComponentId== PipelineComponentId
                          select new PipelineComponentItem
                          {
@@ -62,8 +61,7 @@ namespace BLL
                              PreUnit = t.UnitName,
                              DrawingName = x.DrawingName,
                              BoxNumber = x.BoxNumber,
-                             State = x.State,
-                             StateStr = HJGL_PipelineComponentService.GetState().FirstOrDefault(q=>q.Value==x.State.ToString()).Text.Trim(),
+                             State = x.State, 
                              PlanStartDate = string.Format("{0:g}", y.PlanStartDate),
                              QRCode = x.QRCode,
                              ReceiveMan = p.PersonName,
@@ -71,9 +69,17 @@ namespace BLL
                              UnitWorkName=unitwork.UnitWorkName,
                              Remark = x.Remark
                          }).FirstOrDefault();
+                if (q != null)
+                {
+                    q.StateStr = HJGL_PipelineComponentService.GetState()
+                        .FirstOrDefault(x => x.Value == q.State.ToString())
+                        ?.Text.Trim();
+
+                }
                 bool isPower = Person_PersonsService.IsGeneralUnitByPersonId(personId, projectId);
                 pipelineComponentDetail.pipelineComponentItem = q;
-                pipelineComponentDetail.isPower=isPower;
+                pipelineComponentDetail.isPower = isPower;
+
                 return pipelineComponentDetail;
 
             }