2022-10-15 焊接修改

2022-10-15 15:40:49 +08:00
parent 9183f74b55
commit 0ec0031e20
26 changed files with 1623 additions and 167 deletions
@@ -42,11 +42,14 @@ namespace FineUIPro.Web.HJGL.PreDesign
 		                                pack.StackingPosition,
 		                                pack.State,
                                        pack.ContactName,
-                                        pack.ContactPhone
+                                        pack.ContactPhone,
+										pack.ReceiveDate,
+										person.PersonName
                                from HJGL_PackagingManage as pack
                                left join HJGL_Pipeline_Component com on com.PipelineComponentId=pack.PipelineComponentId
                                left join HJGL_Pipeline pipe on pipe.PipelineId =com.PipelineId
                                left join WBS_UnitWork unit on  pipe.UnitWorkId=unit.UnitWorkId
+                                left join Person_Persons person on pack.ReceiveMan=person.PersonId 
                                WHERE pack.ProjectId = @ProjectId ";
            List<SqlParameter> listStr = new List<SqlParameter>();
            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
@@ -306,7 +309,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
            var PipelineComponent = model.PipelineComponentId.Split(',');
            foreach (var item in PipelineComponent)
            {
-                HJGL_PipelineComponentService.UpdateOutState(item);
+                HJGL_PipelineComponentService.UpdateOutState(item, model.PackagingCode);
            }
            HJGL_PackagingmanageService.PutOutOrder(Id);
            Pring(Id);