From 0b1b5f4731cb2614f96d527693e83ae803c03b2b Mon Sep 17 00:00:00 2001
From: gaofei <181547018@qq.com>
Date: Wed, 15 Mar 2023 12:28:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A8=E9=87=8F=E6=8A=A5?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CQMS/Material/EquipmentSearch.aspx        |  3 +++
 .../CQMS/Material/InspectionEdit.aspx         |  4 +--
 .../CQMS/Material/InspectionEdit.aspx.cs      | 25 +++++++++++--------
 .../CQMS/Material/MaterialSearch.aspx         |  3 +++
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentSearch.aspx b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentSearch.aspx
index e82cb812..ace3bc66 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentSearch.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentSearch.aspx
@@ -82,6 +82,9 @@
                         <f:RenderField Width="100px" ColumnID="EquipmentCode" DataField="EquipmentCode"
                             FieldType="String" HeaderText="设备位号" TextAlign="Center" HeaderTextAlign="Center">
                         </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="Factory" DataField="Factory"
+                            FieldType="String" HeaderText="生产厂家" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="PressClass" DataField="PressClass"
                             FieldType="String" HeaderText="压力等级" TextAlign="Center" HeaderTextAlign="Center">
                         </f:RenderField>
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx
index 01ac0c59..770ca1ea 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx
@@ -124,7 +124,7 @@
                         </f:Grid>
                     </Items>
                 </f:FormRow>
-                <f:FormRow ID="next">
+                <f:FormRow ID="next" Hidden="true">
                     <Items>
                         <f:ContentPanel ID="ContentPanel4" Title="报验管理审批流程设置 " runat="server" ShowHeader="true" EnableCollapse="true"
                             BodyPadding="0px">
@@ -166,7 +166,7 @@
                         </f:ContentPanel>
                     </Items>
                 </f:FormRow>
-                <f:FormRow ID="plApprove2">
+                <f:FormRow ID="plApprove2" Hidden="true">
                     <Items>
                         <f:ContentPanel Title="报验管理审批列表" ShowBorder="true"
                             BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs
index f4784d9b..738e1717 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs
@@ -351,7 +351,8 @@ namespace FineUIPro.Web.CQMS.Material
                         test.CompileDate = DateTime.Now;
                         BLL.CQMS_MaterialTestService.AddMaterialTest(test);
                     }
-                    inspection.State = BLL.Const.Inspection_SpotCheck;
+                    //inspection.State = BLL.Const.Inspection_SpotCheck;
+                    inspection.State = BLL.Const.Inspection_Complete;
                 }
                 else if (inspection.IsSpotCheck == false && inspection.IsNoticeAndSupervision == true && (inspection.State == BLL.Const.Inspection_Compile || inspection.State == BLL.Const.Inspection_ReCompile)) //生成告知和监检记录
                 {
@@ -366,11 +367,13 @@ namespace FineUIPro.Web.CQMS.Material
                         noticeAndSupervision.CompileDate = DateTime.Now;
                         BLL.CQMS_NoticeAndSupervisionService.AddNoticeAndSupervision(noticeAndSupervision);
                     }
-                    inspection.State = this.drpHandleType.SelectedValue;
+                    //inspection.State = this.drpHandleType.SelectedValue;
+                    inspection.State = BLL.Const.Inspection_Complete;
                 }
                 else
                 {
-                    inspection.State = this.drpHandleType.SelectedValue;
+                    //inspection.State = this.drpHandleType.SelectedValue;
+                    inspection.State = BLL.Const.Inspection_Complete;
                 }
             }
             else
@@ -403,14 +406,14 @@ namespace FineUIPro.Web.CQMS.Material
                     approve1.ApproveIdea = this.txtOpinions.Text.Trim();
                     approve1.IsAgree = Convert.ToBoolean(this.RadioButtonList1.SelectedValue);
                     BLL.CQMS_InspectionApproveService.UpdateInspectionApprove(approve1);
-                    Model.Material_InspectionApprove approve = new Model.Material_InspectionApprove();
-                    approve.InspectionId = inspection.InspectionId;
-                    if (this.drpHandleMan.SelectedValue != BLL.Const._Null)
-                    {
-                        approve.ApproveMan = this.drpHandleMan.SelectedValue;
-                    }
-                    approve.ApproveType = this.drpHandleType.SelectedValue;
-                    BLL.CQMS_InspectionApproveService.AddInspectionApprove(approve);
+                    //Model.Material_InspectionApprove approve = new Model.Material_InspectionApprove();
+                    //approve.InspectionId = inspection.InspectionId;
+                    //if (this.drpHandleMan.SelectedValue != BLL.Const._Null)
+                    //{
+                    //    approve.ApproveMan = this.drpHandleMan.SelectedValue;
+                    //}
+                    //approve.ApproveType = this.drpHandleType.SelectedValue;
+                    //BLL.CQMS_InspectionApproveService.AddInspectionApprove(approve);
                 }
             }
             LogService.AddSys_Log(CurrUser, inspection.InspectionCode, inspection.InspectionId, Const.InspectionMenuId, "修改报验管理");
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/MaterialSearch.aspx b/SGGL/FineUIPro.Web/CQMS/Material/MaterialSearch.aspx
index 1dd2bc54..1c905cea 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/MaterialSearch.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Material/MaterialSearch.aspx
@@ -85,6 +85,9 @@
                         <f:RenderField Width="100px" ColumnID="Material" DataField="Material"
                             FieldType="String" HeaderText="材质" TextAlign="Center" HeaderTextAlign="Center">
                         </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="Factory" DataField="Factory"
+                            FieldType="String" HeaderText="生产厂家" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="PressClass" DataField="PressClass"
                             FieldType="String" HeaderText="压力等级" TextAlign="Center" HeaderTextAlign="Center">
                         </f:RenderField>