2022-10-15 焊接修改

DataBase/版本日志/SGGLDB_V2022-10-15.sql

@@ -0,0 +1,6 @@
+ 
+
+alter table HJGL_PackagingManage add ReceiveMan varchar(50)
+alter table HJGL_PackagingManage add ReceiveDate Datetime
+alter table HJGL_Pipeline_Component add ReceiveMan varchar(50)
+alter table HJGL_Pipeline_Component add ReceiveDate Datetime

SGGL/BLL/API/HJGL/APIPackagingManageService.cs

@@ -16,6 +16,8 @@ namespace BLL
             {
                 var q = (from x in db.HJGL_PackagingManage
                         join n in db.Base_Project on x.ProjectId equals n.ProjectId
+                        join m in db.Person_Persons on x.ReceiveMan equals m.PersonId into tt
+                        from t in tt.DefaultIfEmpty()
                         where x.ProjectId == projectId
                         select new PackagingManageDetailItem
                         {
@@ -26,6 +28,8 @@ namespace BLL
                             ContactPhone = x.ContactPhone,
                             StackingPosition = x.StackingPosition,
                             State= x.State,
+                            ReceiveMan=t.PersonName,
+                            ReceiveDate=x.ReceiveDate,
                         }).Distinct();
                 return q.ToList();
 
@@ -39,6 +43,8 @@ namespace BLL
                 PackagingManageItem packagingManageItem = new PackagingManageItem();
                 var q = (from x in db.HJGL_PackagingManage
                          join n in db.Base_Project on x.ProjectId equals n.ProjectId
+                         join m in db.Person_Persons on x.ReceiveMan equals m.PersonId into tt
+                         from t in tt.DefaultIfEmpty()
                          where x.PackagingManageId == packagingManageId
                          select new PackagingManageDetailItem
                          {
@@ -49,7 +55,9 @@ namespace BLL
                              ContactName = x.ContactName,
                              ContactPhone = x.ContactPhone,
                              StackingPosition = x.StackingPosition,
-                             State =x.State
+                             State =x.State,
+                             ReceiveMan = t.PersonName,
+                             ReceiveDate = x.ReceiveDate,
                          }).FirstOrDefault();
                 var tb_packing = (from x in db.HJGL_PackagingManage where x.PackagingManageId==packagingManageId  select x ).FirstOrDefault()  ;
                 var PipelineComponentIdList = tb_packing.PipelineComponentId.Split(',');
@@ -74,12 +82,14 @@ namespace BLL
             }
 
         }
-        public static void GetPackingInfoConfirmArrival(string packagingManageId)
+        public static void GetPackingInfoConfirmArrival(string packagingManageId,string PersonId)
         {
             var q= BLL.HJGL_PackagingmanageService.GetHJGL_PackagingManageById(packagingManageId);
             if (q!=null)
             {
                 q.State = HJGL_PackagingmanageService.state_2;
+                q.ReceiveMan = PersonId;
+                q.ReceiveDate = DateTime.Now;
                 HJGL_PackagingmanageService.UpdateHJGL_PackagingManage(q);
             }
         }

SGGL/BLL/API/HJGL/APIPipelineComponentService.cs

@@ -18,7 +18,9 @@ namespace BLL
                 var q = (from x in db.HJGL_Pipeline_Component
                         join y in db.HJGL_Pipeline on x.PipelineId equals y.PipelineId 
                         join z in db.Base_Unit on x.PreUnit equals z.UnitId into tt
-                        from t in tt.DefaultIfEmpty()
+                        join m in db.Person_Persons on x.ReceiveMan equals m.PersonId into pp
+                         from t in tt.DefaultIfEmpty()
+                         from p in pp.DefaultIfEmpty()
                          where y.ProjectId == projectid
                         select new PipelineComponentItem
                         {
@@ -30,6 +32,8 @@ namespace BLL
                             State = x.State,
                             PlanStartDate = y.PlanStartDate,
                             QRCode = x.QRCode,
+                            ReceiveMan=p.PersonName,
+                            ReceiveDate=x.ReceiveDate
                         }).Distinct();
                 return q.ToList();
 
@@ -44,7 +48,9 @@ namespace BLL
                 var q = (from x in db.HJGL_Pipeline_Component
                          join y in db.HJGL_Pipeline on x.PipelineId equals y.PipelineId
                          join z in db.Base_Unit on x.PreUnit equals z.UnitId into tt
+                         join m in db.Person_Persons on x.ReceiveMan equals m.PersonId into pp
                          from t in tt.DefaultIfEmpty()
+                         from p in pp.DefaultIfEmpty()
                          where x.PipelineComponentId== PipelineComponentId
                          select new PipelineComponentItem
                          {
@@ -56,6 +62,8 @@ namespace BLL
                              State = x.State,
                              PlanStartDate = y.PlanStartDate,
                              QRCode = x.QRCode,
+                             ReceiveMan = p.PersonName,
+                             ReceiveDate = x.ReceiveDate
                          }).FirstOrDefault();
                 bool isPower = Person_PersonsService.IsGeneralUnitByPersonId(personId, projectId);
                 pipelineComponentDetail.pipelineComponentItem = q;
@@ -64,12 +72,14 @@ namespace BLL
 
             }
         }
-        public static void GetComponentConfirmArrival(string PipelineComponentId)
+        public static void GetComponentConfirmArrival(string PipelineComponentId,string PersonId)
         {
             var q = BLL.HJGL_PipelineComponentService.GetPipelineComponentById(PipelineComponentId);
             if (q != null)
             {
                 q.State = HJGL_PipelineComponentService.state_1;
+                q.ReceiveMan = PersonId;
+                q.ReceiveDate = DateTime.Now;
                 HJGL_PipelineComponentService.UpdatePipelineComponent(q);
             }
         }

SGGL/BLL/HJGL/DataImport/DataImportService.cs

@@ -179,7 +179,7 @@ namespace BLL
                      }
                      ).FirstOrDefault();
             //where t.Key == UnitWorkId & x.FileType == "1" select  x.Version).Distinct().ToList();
-            if (!string.IsNullOrEmpty(q.FileName))
+            if (q!=null&&!string.IsNullOrEmpty(q.FileName))
             {
                 result=q.FileName.Substring (0,q.FileName.LastIndexOf('.'));
 

SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs

@@ -158,6 +158,8 @@ namespace BLL
                 ContactName = newtable.ContactName,
                 ContactPhone = newtable.ContactPhone,
                 Remark = newtable.Remark,
+                ReceiveDate = newtable.ReceiveDate,
+                ReceiveMan = newtable.ReceiveMan,
             };
             db.HJGL_PackagingManage.InsertOnSubmit(table);
             db.SubmitChanges();
@@ -179,6 +181,8 @@ namespace BLL
                 table.ContactName = newtable.ContactName;
                 table.ContactPhone = newtable.ContactPhone;
                 table.Remark = newtable.Remark;
+                table.ReceiveMan=newtable.ReceiveMan;
+                table.ReceiveDate=newtable.ReceiveDate;
                 db.SubmitChanges();
             }
 

SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs

@@ -133,6 +133,8 @@ namespace BLL
             newPipeline.ActStartDate = pipeline.ActStartDate;
             newPipeline.ActEndDate = pipeline.ActEndDate;
             newPipeline.DrawingName = pipeline.DrawingName;
+            newPipeline.ReceiveMan= pipeline.ReceiveMan;
+            newPipeline.ReceiveDate= pipeline.ReceiveDate;
             db.HJGL_Pipeline_Component.InsertOnSubmit(newPipeline);
             db.SubmitChanges();
         }
@@ -160,15 +162,19 @@ namespace BLL
                 newPipeline.ActStartDate = pipeline.ActStartDate;
                 newPipeline.ActEndDate = pipeline.ActEndDate;
                 newPipeline.DrawingName = pipeline.DrawingName;
+                newPipeline.ReceiveMan = pipeline.ReceiveMan;
+                newPipeline.ReceiveDate = pipeline.ReceiveDate;
+
                 db.SubmitChanges();
             }
         }
-        public static void UpdateOutState(string pipelineComponentId)
+        public static void UpdateOutState(string pipelineComponentId,string BoxNumber)
         {
             var q=GetPipelineComponentById(pipelineComponentId);
             if (q.State==state_1)
             {
                 q.State = state_2;
+                q.BoxNumber=BoxNumber;
                 UpdatePipelineComponent(q);
 
             }

SGGL/FineUIPro.Web/Controls/_3DLook.ascx

@@ -22,7 +22,7 @@
     function BindData(dataList, Url_item,Url) {
         receiver.src = Url_item;
        // var newdatalist = dataList.split(",");
-       // console.log(dataList);
+         console.log(dataList);
         receiver.contentWindow.postMessage(dataList, Url);
     }
     function iFrameHeight() {

SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx

@@ -94,23 +94,25 @@
                                                 <asp:Label ID="labNumber" runat="server" Text=' <%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1%>'></asp:Label>
                                             </ItemTemplate>
                                         </f:TemplateField>
+                                        <f:RenderField HeaderText="焊口号" ColumnID="WeldJointCode"
+                                            DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
+                                            Width="100px">
+                                        </f:RenderField>
+                                         <f:RenderField HeaderText="完成状态" ColumnID="UnitWorkCode1" DataField="UnitWorkCode1"
+                                            SortField="UnitWorkCode" FieldType="String" HeaderTextAlign="Center" Width="100px">
+                                        </f:RenderField>
                                         <f:RenderField HeaderText="单位名称" ColumnID="UnitName" DataField="UnitName"
                                             SortField="UnitName" FieldType="String" HeaderTextAlign="Center" Width="180px">
                                         </f:RenderField>
                                         <%--<f:RenderField HeaderText="单位工程" ColumnID="UnitWorkCode" DataField="UnitWorkCode"
                                             SortField="UnitWorkCode" FieldType="String" HeaderTextAlign="Center" Width="100px">
                                         </f:RenderField>--%>
-                                        <f:RenderField HeaderText="完成状态" ColumnID="UnitWorkCode1" DataField="UnitWorkCode1"
+                                       
-                                            SortField="UnitWorkCode" FieldType="String" HeaderTextAlign="Center" Width="100px">
+                                        <%--<f:RenderField HeaderText="管线号" ColumnID="PipelineCode"
-                                        </f:RenderField>
-                                        <f:RenderField HeaderText="管线号" ColumnID="PipelineCode"
                                             DataField="PipelineCode" SortField="PipelineCode" FieldType="String" HeaderTextAlign="Center"
                                             Width="150px">
-                                        </f:RenderField>
+                                        </f:RenderField>--%>
-                                        <f:RenderField HeaderText="焊口号" ColumnID="WeldJointCode"
+                                        
-                                            DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
-                                            Width="100px">
-                                        </f:RenderField>
 
                                         <f:RenderField HeaderText="材质1" ColumnID="Material1Code" DataField="Material1Code" SortField="Material1Code" FieldType="String" HeaderTextAlign="Center"
                                             TextAlign="Left" Width="90px">

SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs

@@ -173,7 +173,22 @@ namespace FineUIPro.Web.HJGL.InfoQuery
             parameter3D.TagNum = "";
             parameter3D.ButtonType = "0,2";
             parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
+            if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
+            {
+                parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
 
+
+            }
+            else if (this.tvControlItem.SelectedNode.CommandName == "管线")
+            {
+                var model = PipelineService.GetPipelineByPipelineId(tvControlItem.SelectedNodeID);
+                if (model != null&&!string.IsNullOrEmpty(model.UnitWorkId))
+                {
+                    parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(model.UnitWorkId);
+
+                }
+
+            }
             ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
             ctlAuditFlow.data = parameter3D;
             ctlAuditFlow.BindData();
@@ -377,7 +392,22 @@ namespace FineUIPro.Web.HJGL.InfoQuery
             parameter3D.ColorModel = colorModel;
             parameter3D.TagNum = pipecode;
             parameter3D.ButtonType = "0,2";
-            parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
+            if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
+            {
+                parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
+
+
+            }
+            else if (this.tvControlItem.SelectedNode.CommandName == "管线")
+            {
+                var model = PipelineService.GetPipelineByPipelineId(tvControlItem.SelectedNodeID);
+                if (model != null && !string.IsNullOrEmpty(model.UnitWorkId))
+                {
+                    parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(model.UnitWorkId);
+
+                }
+
+            }
             ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
             ctlAuditFlow.data = parameter3D;
             ctlAuditFlow.BindData();

SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs

@@ -370,12 +370,12 @@ namespace FineUIPro.Web.HJGL.PointTrust
                     }
                 }
             }
-            Model.Parameter3D parameter3D = new Model.Parameter3D();
+            //Model.Parameter3D parameter3D = new Model.Parameter3D();
-            Model.ColorModel colorModel = new Model.ColorModel();
+            //Model.ColorModel colorModel = new Model.ColorModel();
-            colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
+            //colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
-            parameter3D.ColorModel = colorModel;
+            //parameter3D.ColorModel = colorModel;
-            parameter3D.TagNum = "/E-9001,/E-9002";
+            //parameter3D.TagNum = "/E-9001,/E-9002";
-            parameter3D.ButtonType = "0,4";
+            //parameter3D.ButtonType = "0,4";
 
             //ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7CArea-15A";
             //ctlAuditFlow.data = parameter3D;

SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx

@@ -61,6 +61,12 @@
                     </f:RenderField>
                     <f:RenderField Width="120px" ColumnID="ContactPhone" DataField="ContactPhone" FieldType="String"
                         HeaderText="联系人电话" HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="120px" ColumnID="PersonName" DataField="PersonName" FieldType="String"
+                        HeaderText="接收人" HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="120px" ColumnID="ReceiveDate" DataField="ReceiveDate"  FieldType="Date"
+                        HeaderText="接收时间" HeaderTextAlign="Center" TextAlign="Center">
                     </f:RenderField>
                      <f:LinkButtonField Width="120px" TextAlign="Center" CommandName="cmd_detail" Text="装箱明细" />
                      <f:LinkButtonField Width="120px" TextAlign="Center" CommandName="cmd_print" Text="预览打印" />

SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx.cs

@@ -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);

SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx

@@ -93,7 +93,7 @@
                                 </f:Toolbar>
                             </Toolbars>
                             <Items>
-                                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管线信息"
+                                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管线信息"  ForceFit="true"
                                     EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipelineId" AllowCellEditing="true"
                                     AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineId"
                                     AllowSorting="true" SortField="PipelineCode" SortDirection="ASC" OnSort="Grid1_Sort" EnableCheckBoxSelect="true"

SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs

@@ -4,11 +4,35 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
+using System.Web.UI.DataVisualization.Charting;
 
 namespace FineUIPro.Web.HJGL.PreDesign
 {
+      
     public partial class PipelingDivide : PageBase
     {
+        public decimal PipelineComplete
+        {
+            get
+            {
+                return (decimal)ViewState["PipelineComplete"];
+            }
+            set
+            {
+                ViewState["PipelineComplete"] = value;
+            }
+        }
+        public decimal PipelineNOComplete
+        {
+            get
+            {
+                return (decimal)ViewState["PipelineNOComplete"];
+            }
+            set
+            {
+                ViewState["PipelineNOComplete"] = value;
+            }
+        }
         protected void Page_Load(object sender, EventArgs e)
         {
             ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId);
@@ -17,6 +41,8 @@ namespace FineUIPro.Web.HJGL.PreDesign
             {
                 this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
                 this.InitTreeMenu();//加载树
+                PipelineComplete = 0;
+                PipelineNOComplete = 0;
             }
         }
 
@@ -120,7 +146,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
             colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
             parameter3D.ColorModel = colorModel;
             parameter3D.TagNum = "";
-            parameter3D.ButtonType = "0,4";
+            parameter3D.ButtonType = "0,1";
             parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
 
             ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
@@ -168,7 +194,10 @@ namespace FineUIPro.Web.HJGL.PreDesign
             }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-
+            var q = tb.AsEnumerable().Where(x => x["PipeArea"].ToString() == "工厂预制");
+            var q2 = tb.AsEnumerable().Where(x => x["PipeArea"].ToString() == "现场施工");
+            PipelineComplete = q.Count();
+            PipelineNOComplete = q2.Count();
             // 2.获取当前分页数据
             //var table = this.GetPagedDataTable(Grid1, tb1);
             Grid1.RecordCount = tb.Rows.Count;
@@ -240,14 +269,20 @@ namespace FineUIPro.Web.HJGL.PreDesign
         }
         protected void Grid1_RowClick(object sender, GridRowClickEventArgs e)
         {
-            var q = PipelineService.GetPipelineByPipelineId(Grid1.SelectedRowID);
+            var Id =Grid1.SelectedRowIDArray;
-            var pipecode = "/" + q.PipelineCode;
+             List<string > listpipecode=new List<string> () ;
+            foreach (var item in Id)
+            {
+                var q = PipelineService.GetPipelineByPipelineId(item);
+                listpipecode.Add("/" + q.PipelineCode);
+            }
+            var pipecode = string.Join(",", listpipecode);
             Model.Parameter3D parameter3D = new Model.Parameter3D();
             Model.ColorModel colorModel = new Model.ColorModel();
             colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
             parameter3D.ColorModel = colorModel;
             parameter3D.TagNum = pipecode;
-            parameter3D.ButtonType = "0,4";
+            parameter3D.ButtonType = "0,1";
             parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
             ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
             ctlAuditFlow.data = parameter3D;
@@ -288,36 +323,11 @@ namespace FineUIPro.Web.HJGL.PreDesign
         }
         #endregion
 
-        protected string ConvertDetectionType(object detectionType)
+        #region 按钮事件
-        {
-            string detectionName = string.Empty;
-            if (detectionType != null)
-            {
-                string[] types = detectionType.ToString().Split('|');
-                foreach (string t in types)
-                {
-                    var type = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(t);
-                    if (type != null)
-                    {
-                        detectionName += type.DetectionTypeCode + ",";
-                    }
-                }
-            }
-            if (detectionName != string.Empty)
-            {
-                return detectionName.Substring(0, detectionName.Length - 1);
-            }
-            else
-            {
-                return "";
-            }
-        }
-
         protected void btnGetChart_Click(object sender, EventArgs e)
         {
-            decimal PipelineComplete = 0;
+            
-            decimal PipelineNoComplete = 0;
+            PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("PipelingDivideChart.aspx?PipelineComplete={0}&&PipelineNOComplete={1}", PipelineComplete, PipelineNOComplete, "编辑 - ")));
-            PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("PipelingDivideChart.aspx?PipelineComplete={0}&&PipelineNOComplete={1}", PipelineComplete, PipelineNoComplete, "编辑 - ")));
 
         }
 
@@ -351,5 +361,33 @@ namespace FineUIPro.Web.HJGL.PreDesign
             txtMaterialCode.Text = String.Empty;
             BindGrid();
         }
+
+        #endregion
+        protected string ConvertDetectionType(object detectionType)
+        {
+            string detectionName = string.Empty;
+            if (detectionType != null)
+            {
+                string[] types = detectionType.ToString().Split('|');
+                foreach (string t in types)
+                {
+                    var type = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(t);
+                    if (type != null)
+                    {
+                        detectionName += type.DetectionTypeCode + ",";
+                    }
+                }
+            }
+            if (detectionName != string.Empty)
+            {
+                return detectionName.Substring(0, detectionName.Length - 1);
+            }
+            else
+            {
+                return "";
+            }
+        }
+
+       
     }
 }

SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivideChart.aspx

@@ -53,7 +53,7 @@
 
                 var data = [
                     {
-                        name: '未完成', value: options.n, label: {
+                        name: '现场施工', value: options.n, label: {
                             rich: {
                                 name: {
                                     fontSize: 10,
@@ -69,7 +69,7 @@
                         }
                     },
                     {
-                        name: '已完成', value: options.y, label: {
+                        name: '工厂预制', value: options.y, label: {
                             rich: {
                                 name: {
                                     fontSize: 10,

SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx

@@ -79,7 +79,7 @@
                         </f:Toolbar>
                     </Toolbars>
                     <Items>
-                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="组件信息"
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="组件信息"  ForceFit="true"
                             EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipelineComponentId" AllowCellEditing="true"
                             AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineComponentId"
                             AllowSorting="true" SortField="PipelineComponentCode" SortDirection="ASC" OnSort="Grid1_Sort"  OnRowCommand="Grid1_RowCommand"
@@ -124,6 +124,12 @@
                                     FieldType="String" HeaderText="预制图纸名称" HeaderTextAlign="Center"
                                     TextAlign="Left">
                                 </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="PersonName" DataField="PersonName" FieldType="String"
+                                    HeaderText="接收人" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="ReceiveDate" DataField="ReceiveDate" FieldType="Date"
+                                    HeaderText="接收时间" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
                             </Columns>                         
                             <PageItems>
                                 <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">

SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs

@@ -161,11 +161,13 @@ namespace FineUIPro.Web.HJGL.PreDesign
         {
             string strSql = @"	SELECT com.PipelineComponentId,com.PipelineComponentCode,com.BoxNumber,
                                      com.PipelineId, punit.UnitName AS PreUnit,aunit.UnitName AS AssembleUnit,
-									 com.QRCode,com.State,pipe.PlanStartDate,com.DrawingName
+									 com.QRCode,com.State,pipe.PlanStartDate,com.DrawingName,com.ReceiveDate,
+									 person.PersonName
                               FROM HJGL_Pipeline_Component com 
 							  LEFT JOIN HJGL_Pipeline pipe  ON pipe.PipelineId =com.PipelineId
 							  LEFT JOIN dbo.Base_Unit punit ON punit.UnitId=com.PreUnit
 							  LEFT JOIN dbo.Base_Unit aunit ON aunit.UnitId=com.AssembleUnit
+							  LEFT JOIN Person_Persons person on com.ReceiveMan=person.PersonId
 							  WHERE  com.PipelineId =@PipelineId ";
             List<SqlParameter> listStr = new List<SqlParameter> { };
 

SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs

@@ -226,8 +226,21 @@ namespace FineUIPro.Web.HJGL.TestPackage
             parameter3D.ColorModel = colorModel;
             parameter3D.TagNum = "";
             parameter3D.ButtonType = "0,4";
-            parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
+            if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
+            {
+                parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
 
+
+            }
+            else if (this.tvControlItem.SelectedNode.CommandName == "TestPackage")
+            {
+                var testPackageManage = BLL.TestPackageEditService.GetTestPackageByID(this.PTP_ID);
+                if (testPackageManage != null && !string.IsNullOrEmpty(testPackageManage.UnitWorkId))
+                {
+                    parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(testPackageManage.UnitWorkId);
+                 }
+
+            }
             ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
             ctlAuditFlow.data = parameter3D;
             ctlAuditFlow.BindData();
@@ -542,7 +555,21 @@ namespace FineUIPro.Web.HJGL.TestPackage
             parameter3D.ColorModel = colorModel;
             parameter3D.TagNum = pipecode;
             parameter3D.ButtonType = "0,4";
-            parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
+            if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
+            {
+                parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
+
+
+            }
+            else if (this.tvControlItem.SelectedNode.CommandName == "TestPackage")
+            {
+                var testPackageManage = BLL.TestPackageEditService.GetTestPackageByID(this.PTP_ID);
+                if (testPackageManage != null && !string.IsNullOrEmpty(testPackageManage.UnitWorkId))
+                {
+                    parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(testPackageManage.UnitWorkId);
+                }
+
+            }
             ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
             ctlAuditFlow.data = parameter3D;
             ctlAuditFlow.BindData();

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs

@@ -167,7 +167,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                         newNode.CssClass = "tn-color-green";
                     }
                     newNode.Text = item.PipelineCode+suf; //+ "【" + jotCount.ToString() + " " + "焊口" + "】";
-
+                    newNode.CommandName = "管线";
                     newNode.NodeID = item.PipelineId;
                     newNode.EnableClickEvent = true;
                     e.Node.Nodes.Add(newNode);
@@ -232,8 +232,22 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 parameter3D.ColorModel = colorModel;
                 parameter3D.TagNum = "";
                 parameter3D.ButtonType = "0,3";
-                parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
+                if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
+                {
+                    parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
 
+
+                }
+                else if (this.tvControlItem.SelectedNode.CommandName == "管线")
+                {
+                    var model = PipelineService.GetPipelineByPipelineId(tvControlItem.SelectedNodeID);
+                    if (model != null && !string.IsNullOrEmpty(model.UnitWorkId))
+                    {
+                        parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(model.UnitWorkId);
+
+                    }
+
+                }
                 ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
                 ctlAuditFlow.data = parameter3D;
                 ctlAuditFlow.BindData();
@@ -309,16 +323,28 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         }
         protected void Grid1_RowClick(object sender, GridRowClickEventArgs e)
         {
-            var model = PipelineMatService.GetPipeLineMat(Grid1.SelectedRowID);
-            var q = PipelineService.GetPipelineByPipelineId(model.PipelineId);
-            var pipecode = "/" + q.PipelineCode;
             Model.Parameter3D parameter3D = new Model.Parameter3D();
             Model.ColorModel colorModel = new Model.ColorModel();
             colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
             parameter3D.ColorModel = colorModel;
-            parameter3D.TagNum = pipecode;
+            parameter3D.ButtonType = "0,3";
-            parameter3D.ButtonType = "0,2";
+            if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
-            parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
+            {
+                parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
+
+
+            }
+            else if (this.tvControlItem.SelectedNode.CommandName == "管线")
+            {
+                var modelpipe = PipelineService.GetPipelineByPipelineId(tvControlItem.SelectedNodeID);
+                if (modelpipe != null && !string.IsNullOrEmpty(modelpipe.UnitWorkId))
+                {
+                    parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(modelpipe.UnitWorkId);
+                    var pipecode = "/" + modelpipe.PipelineCode;
+                    parameter3D.TagNum = pipecode;
+                }
+
+            }
             ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
             ctlAuditFlow.data = parameter3D;
             ctlAuditFlow.BindData();

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs

@@ -152,7 +152,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
                 parameter3D.ColorModel = colorModel;
                 parameter3D.TagNum = "";
-                parameter3D.ButtonType = "0,4";
+                parameter3D.ButtonType = "0,2";
                 parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
 
                 ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);

SGGL/Model/APIItem/HJGL/PackagingManageItem.cs

@@ -16,7 +16,11 @@ namespace Model
         public string ContactPhone { get; set; }
         public string StackingPosition { get; set; }
         public int? State { get; set; }
-      
+
+        public string ReceiveMan { get; set; }
+        public DateTime? ReceiveDate { get; set; }
+
+
     }
     public class PackagingPrepipeItem
     { 

SGGL/Model/APIItem/HJGL/PipelineComponentItem.cs

@@ -16,6 +16,8 @@ namespace Model
         public int? State { get; set; }
         public DateTime? PlanStartDate { get; set; }
         public string QRCode { get; set; }
+        public string ReceiveMan { get; set; }
+        public DateTime? ReceiveDate { get; set; }
     }
     public class PipelineComponentDetail
     { 

SGGL/Model/HJGL/3DParameter.cs

@@ -12,7 +12,9 @@ namespace Model
         /// 按钮类别
         /// </summary>
         public string ButtonType { get; set; }
-
+        /// <summary>
+        /// 主项名称
+        /// </summary>
         public string ModelName { get; set; }
         /// <summary>
         /// 颜色模型

SGGL/WebAPI/Controllers/HJGL/PackagingManageController.cs

@@ -50,12 +50,12 @@ namespace WebAPI.Controllers
 
             return responeData;
         }
-        public Model.ResponeData GetPackingInfoConfirmArrival( string packagingManageId)
+        public Model.ResponeData GetPackingInfoConfirmArrival( string packagingManageId,string PersonId)
         {
             var responeData = new Model.ResponeData();
             try
             {
-               BLL.APIPackagingManageService.GetPackingInfoConfirmArrival( packagingManageId);
+               BLL.APIPackagingManageService.GetPackingInfoConfirmArrival( packagingManageId, PersonId);
             }
             catch (Exception ex)
             {

SGGL/WebAPI/Controllers/HJGL/PipelineComponentController.cs

@@ -50,12 +50,12 @@ namespace WebAPI.Controllers
 
             return responeData;
         }
-        public Model.ResponeData GetComponentConfirmArrival(string PipelineComponentId)
+        public Model.ResponeData GetComponentConfirmArrival(string PipelineComponentId, string PersonId)
         {
             var responeData = new Model.ResponeData();
             try
             {
-                BLL.APIPipelineComponentService.GetComponentConfirmArrival(PipelineComponentId);
+                BLL.APIPipelineComponentService.GetComponentConfirmArrival(PipelineComponentId, PersonId);
             }
             catch (Exception ex)
             {