From 75fb02a45c89f7c7e8ad73c6fa03920c6ae943ba Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Mon, 24 Oct 2022 00:57:03 +0800
Subject: [PATCH] =?UTF-8?q?2022-10-24=20=E7=84=8A=E6=8E=A5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HJGL/WeldingManage/JotTwoDesign.aspx.cs   |  6 +--
 .../WeldingManage/SelectTaskWeldJoint.aspx    |  2 +-
 .../WeldingManage/SelectTaskWeldJoint.aspx.cs | 20 +++++++++
 .../HJGL/WeldingManage/WeldJointList.aspx     |  8 ++--
 .../HJGL/WeldingManage/WeldReport.aspx        |  8 ++--
 .../HJGL/WeldingManage/WeldReport.aspx.cs     | 42 +++++++++----------
 .../WeldingManage/WeldReport.aspx.designer.cs | 27 ------------
 .../HJGL/WeldingManage/WeldTask.aspx          |  2 +-
 8 files changed, 54 insertions(+), 61 deletions(-)

diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
index 01a61994..6af04ff2 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
@@ -145,17 +145,17 @@ namespace FineUIPro.Web.HJGL.WeldingManage
 
                 if (jotCount== AuditCount) //全部审核
                 {
-                    newNode.Text = "<font color='##00FF00'>" + item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】" + "</font>";
+                    newNode.Text = "<font color='#00FF00'>" + item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】" + "</font>";
 
                 }
                 else if ( AuditCount==0) //全部未审核
                 {
-                    newNode.Text = "<font color='##FF0000'>" + item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】" + "</font>";
+                    newNode.Text = "<font color='#FF0000'>" + item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】" + "</font>";
 
                 }
                 else //部分审核
                 {
-                    newNode.Text = "<font color='##FFFF00'>" + item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】" + "</font>";
+                    newNode.Text = "<font color='#B9B925'>" + item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】" + "</font>";
 
                 }
                 //if (jotCount > weldJotCount)
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx
index 45372b2d..45c53283 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx
@@ -51,7 +51,7 @@
                     </Toolbars>
                     <Items>
                         <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊口信息"
-                            EnableCollapse="true" KeepCurrentSelection="true" runat="server" BoxFlex="1"
+                            EnableCollapse="true" KeepCurrentSelection="true" runat="server" BoxFlex="1" OnRowDataBound="Grid1_RowDataBound"   DisableUnselectableRows="true"
                             DataKeyNames="WeldJointId" AllowColumnLocking="true" EnableColumnLines="true"
                             DataIDField="WeldJointId" EnableTextSelection="True" AllowSorting="true" SortField="WeldJointCode"
                             SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="false" IsDatabasePaging="true"
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs
index 3bd096b6..7e752f22 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs
@@ -196,6 +196,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 TreeNode newNode = new TreeNode();
                 int totalJointNum = joints.Count(x => x.PipelineId == item.PipelineId);
                 int weldJointNum = joints.Count(x => x.PipelineId == item.PipelineId && x.WeldingDailyId != null);
+                bool istrue = BLL.HJGL_MaterialService.isInStockByPipeline(item.PipelineId, this.CurrUser.LoginProjectId);
+                if (istrue)
+                {
+                    newNode.CssClass = "tn-color-green";
+                }
                 newNode.Text = item.PipelineCode + "(" + (totalJointNum - weldJointNum).ToString() + ")";
                 newNode.NodeID = item.PipelineId;
                 newNode.ToolTip = item.PipelineCode;
@@ -474,5 +479,20 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         {
             BindGrid();
         }
+
+        /// <summary>
+        /// 行绑定事件（没有焊接方法无法选择）
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
+        {
+            DataRowView row = e.DataItem as DataRowView;
+            if (string.IsNullOrEmpty(row["WeldingMethodCode"].ToString()))
+            {
+                e.RowSelectable = false;
+
+            };      
+        }
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx
index b275fa0d..5ae63ba1 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx
@@ -90,7 +90,7 @@
                                 </f:Toolbar>
                             </Toolbars>
                             <Items>
-                                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管线信息"
+                                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管线信息" 
                                     EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipelineId"
                                     AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineId"
                                     AllowSorting="true" SortField="PipelineCode" SortDirection="ASC" OnSort="Grid1_Sort"
@@ -189,14 +189,14 @@
                         </f:Panel>
 
                         <f:Panel runat="server" ID="panelBottomRegion" RegionPosition="Bottom" RegionSplit="true" RegionSplitWidth="20px" EnableCollapse="true"
-                            Title="底部面板" ShowBorder="false"  RegionPercent="70%" ShowHeader="false" BodyPadding="1px" Layout="Fit">
+                            Title="底部面板" ShowBorder="false"  RegionPercent="70%" ShowHeader="false" BodyPadding="1px" Layout="Fit" >
                             <Items>
                                 <f:TabStrip ID="TabStrip1" ShowBorder="false" TabPosition="Top"
                                     EnableTabCloseMenu="false" ActiveTabIndex="0" runat="server" AutoPostBack="true" OnTabIndexChanged="TabStrip1_TabIndexChanged">
                                     <Tabs>
                                         <f:Tab ID="TabJoint" Title="焊口信息" BodyPadding="1px" Layout="VBox" runat="server" AutoScroll="true">
                                             <Items>
-                                                <f:Grid ID="Grid3" ShowBorder="true" ShowHeader="false"
+                                                <f:Grid ID="Grid3" ShowBorder="true" ShowHeader="false" ForceFit="true"
                                                     EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="WeldJointId"
                                                     AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="WeldJointId"
                                                     AllowSorting="true" SortField="WeldJointCode" SortDirection="ASC" OnSort="Grid2_Sort"
@@ -208,7 +208,7 @@
                                                             TextAlign="Left" Width="180px">
                                                         </f:RenderField>
                                                          <f:RenderField HeaderText="焊口属性" ColumnID="JointAttribute" DataField="JointAttribute" SortField="JointAttribute" FieldType="String" HeaderTextAlign="Center"
-                                                            TextAlign="Left" Width="180px">
+                                                            TextAlign="Left" Width="90px">
                                                         </f:RenderField>
                                                         <f:RenderField HeaderText="材质1" ColumnID="Material1Code" DataField="Material1Code" SortField="Material1Code" FieldType="String" HeaderTextAlign="Center"
                                                             TextAlign="Left" Width="90px">
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
index c73aebd5..fb1ae192 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
@@ -37,10 +37,10 @@
                     </f:Tree>
                 </Items>
             </f:Panel>
-            <f:Panel ID="Panel2" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            <f:Panel ID="Panel2" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" 
                      ShowHeader="false" Layout="Region" BoxConfigAlign="Stretch">
                 <Items>
-                    <f:Panel ID="panelTopRegion" runat="server" RegionPosition="Center" ShowBorder="true"
+                    <%--<f:Panel ID="panelTopRegion" runat="server" RegionPosition="Center" ShowBorder="true"  
                              Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="三维模型"
                              TitleToolTip="三维模型显示" AutoScroll="true">
                         <Items>
@@ -50,8 +50,8 @@
                             </f:ContentPanel>
 
                         </Items>
-                    </f:Panel>
-                    <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Bottom" RegionSplit="true" EnableCollapse="true" ShowBorder="true"
+                    </f:Panel>--%>
+                    <f:Panel runat="server" ID="panelCenterRegion"  RegionPosition="Center" RegionSplit="true" EnableCollapse="true" ShowBorder="true"
                              Layout="Fit" ShowHeader="false" RegionSplitWidth="20px" BodyPadding="1px" Height="400px" IconFont="PlusCircle" Title="焊接日报"
                              TitleToolTip="焊接日报" AutoScroll="true">
                         <Items>
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
index bef74266..bcf35fff 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
@@ -11,7 +11,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
     {
         protected void Page_Load(object sender, EventArgs e)
         {
-            ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId);
+           // ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId);
 
             if (!IsPostBack)
             {
@@ -147,17 +147,17 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 txtTabler.Text = BLL.Person_PersonsService.GetPersonsNameById(daily.Tabler);
                 txtTableDate.Text = string.Format("{0:yyyy-MM-dd}", daily.TableDate);
                 txtWeldingDate.Text = string.Format("{0:yyyy-MM-dd}", daily.WeldingDate);
-                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 = "";
-                parameter3D.ButtonType = "0,2";
-                parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
+                //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 = "";
+                //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" + parameter3D.ModelName;
-                ctlAuditFlow.data = parameter3D;
-                ctlAuditFlow.BindData();
+                //ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName;
+                //ctlAuditFlow.data = parameter3D;
+                //ctlAuditFlow.BindData();
 
             }
         }
@@ -276,16 +276,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                          select x).FirstOrDefault();
             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,2";
-            parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
-            ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName;
-            ctlAuditFlow.data = parameter3D;
-            ctlAuditFlow.BindData();
+            //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,2";
+            //parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
+            //ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName;
+            //ctlAuditFlow.data = parameter3D;
+            //ctlAuditFlow.BindData();
         }
         /// <summary>
         /// 增加焊接日报
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.designer.cs
index a8312389..d621d3da 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.designer.cs
@@ -86,33 +86,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// </remarks>
         protected global::FineUIPro.Panel Panel2;
 
-        /// <summary>
-        /// panelTopRegion 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Panel panelTopRegion;
-
-        /// <summary>
-        /// ContentPanel1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.ContentPanel ContentPanel1;
-
-        /// <summary>
-        /// ctlAuditFlow 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Web.Controls._3DLook ctlAuditFlow;
-
         /// <summary>
         /// panelCenterRegion 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx
index b967fb67..3ae942f9 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx
@@ -47,7 +47,7 @@
                     Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="焊接任务单"
                     TitleToolTip="焊接任务单" AutoScroll="true">
                     <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="WeldTaskId,WeldJointId" EnableColumnLines="true"
                             AllowCellEditing="true" ClicksToEdit="1" DataIDField="WeldTaskId" AllowSorting="true"
                             SortField="PipelineCode,WeldJointCode" SortDirection="ASC" OnSort="Grid1_Sort"