1

2024-11-06 09:59:54 +08:00
parent bfdffc4ccf
commit 92f20a5913
4 changed files with 26 additions and 17 deletions
@@ -63,11 +63,13 @@ namespace BLL
                             DrawingName = x.DrawingName,
                             BoxNumber = x.BoxNumber,
                             State = x.State,
+                             StateStr = HJGL_PipelineComponentService.GetState().FirstOrDefault(q=>q.Value==x.State.ToString()).Text.Trim(),
                             PlanStartDate = string.Format("{0:g}", y.PlanStartDate),
                             QRCode = x.QRCode,
                             ReceiveMan = p.PersonName,
                             ReceiveDate = string.Format("{0:g}", x.ReceiveDate),
                             UnitWorkName=unitwork.UnitWorkName,
+                             Remark = x.Remark
                         }).FirstOrDefault();
                bool isPower = Person_PersonsService.IsGeneralUnitByPersonId(personId, projectId);
                pipelineComponentDetail.pipelineComponentItem = q;
@@ -83,12 +85,12 @@ namespace BLL
            {
                if (!string.IsNullOrEmpty(message))
                {
-                    q.State = HJGL_PipelineComponentService.state_Msg;
+                    q.State = HJGL_PipelineComponentService.StatePenRec;
                    q.Remark=message;
                }
                else
                {
-                    q.State = HJGL_PipelineComponentService.state_1;
+                    q.State = HJGL_PipelineComponentService.State1;

                }
                q.ReceiveMan = PersonId;