lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改质量报验

Browse Source
This commit is contained in:
高飞
2023-03-15 12:28:32 +08:00
parent 03a1e1e405
commit 0b1b5f4731
4 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Material/EquipmentSearch.aspx
+3
View File
@@ -82,6 +82,9 @@
<f:RenderField Width="100px" ColumnID="EquipmentCode" DataField="EquipmentCode" <f:RenderField Width="100px" ColumnID="EquipmentCode" DataField="EquipmentCode"
FieldType="String" HeaderText="设备位号" TextAlign="Center" HeaderTextAlign="Center"> FieldType="String" HeaderText="设备位号" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField> </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" <f:RenderField Width="100px" ColumnID="PressClass" DataField="PressClass"
FieldType="String" HeaderText="压力等级" TextAlign="Center" HeaderTextAlign="Center"> FieldType="String" HeaderText="压力等级" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx
+2 -2
View File
@@ -124,7 +124,7 @@
</f:Grid> </f:Grid>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow ID="next"> <f:FormRow ID="next" Hidden="true">
<Items> <Items>
<f:ContentPanel ID="ContentPanel4" Title="报验管理审批流程设置 " runat="server" ShowHeader="true" EnableCollapse="true" <f:ContentPanel ID="ContentPanel4" Title="报验管理审批流程设置 " runat="server" ShowHeader="true" EnableCollapse="true"
BodyPadding="0px"> BodyPadding="0px">
@@ -166,7 +166,7 @@
</f:ContentPanel> </f:ContentPanel>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow ID="plApprove2"> <f:FormRow ID="plApprove2" Hidden="true">
<Items> <Items>
<f:ContentPanel Title="报验管理审批列表" ShowBorder="true" <f:ContentPanel Title="报验管理审批列表" ShowBorder="true"
BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true" BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs
+14 -11
View File
@@ -351,7 +351,8 @@ namespace FineUIPro.Web.CQMS.Material
test.CompileDate = DateTime.Now; test.CompileDate = DateTime.Now;
BLL.CQMS_MaterialTestService.AddMaterialTest(test); 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)) //生成告知和监检记录 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; noticeAndSupervision.CompileDate = DateTime.Now;
BLL.CQMS_NoticeAndSupervisionService.AddNoticeAndSupervision(noticeAndSupervision); BLL.CQMS_NoticeAndSupervisionService.AddNoticeAndSupervision(noticeAndSupervision);
} }
inspection.State = this.drpHandleType.SelectedValue; //inspection.State = this.drpHandleType.SelectedValue;
inspection.State = BLL.Const.Inspection_Complete;
} }
else else
{ {
inspection.State = this.drpHandleType.SelectedValue; //inspection.State = this.drpHandleType.SelectedValue;
inspection.State = BLL.Const.Inspection_Complete;
} }
} }
else else
@@ -403,14 +406,14 @@ namespace FineUIPro.Web.CQMS.Material
approve1.ApproveIdea = this.txtOpinions.Text.Trim(); approve1.ApproveIdea = this.txtOpinions.Text.Trim();
approve1.IsAgree = Convert.ToBoolean(this.RadioButtonList1.SelectedValue); approve1.IsAgree = Convert.ToBoolean(this.RadioButtonList1.SelectedValue);
BLL.CQMS_InspectionApproveService.UpdateInspectionApprove(approve1); BLL.CQMS_InspectionApproveService.UpdateInspectionApprove(approve1);
Model.Material_InspectionApprove approve = new Model.Material_InspectionApprove(); //Model.Material_InspectionApprove approve = new Model.Material_InspectionApprove();
approve.InspectionId = inspection.InspectionId; //approve.InspectionId = inspection.InspectionId;
if (this.drpHandleMan.SelectedValue != BLL.Const._Null) //if (this.drpHandleMan.SelectedValue != BLL.Const._Null)
{ //{
approve.ApproveMan = this.drpHandleMan.SelectedValue; // approve.ApproveMan = this.drpHandleMan.SelectedValue;
} //}
approve.ApproveType = this.drpHandleType.SelectedValue; //approve.ApproveType = this.drpHandleType.SelectedValue;
BLL.CQMS_InspectionApproveService.AddInspectionApprove(approve); //BLL.CQMS_InspectionApproveService.AddInspectionApprove(approve);
} }
} }
LogService.AddSys_Log(CurrUser, inspection.InspectionCode, inspection.InspectionId, Const.InspectionMenuId, "修改报验管理"); LogService.AddSys_Log(CurrUser, inspection.InspectionCode, inspection.InspectionId, Const.InspectionMenuId, "修改报验管理");
SGGL/FineUIPro.Web/CQMS/Material/MaterialSearch.aspx
+3
View File
@@ -85,6 +85,9 @@
<f:RenderField Width="100px" ColumnID="Material" DataField="Material" <f:RenderField Width="100px" ColumnID="Material" DataField="Material"
FieldType="String" HeaderText="材质" TextAlign="Center" HeaderTextAlign="Center"> FieldType="String" HeaderText="材质" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField> </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" <f:RenderField Width="100px" ColumnID="PressClass" DataField="PressClass"
FieldType="String" HeaderText="压力等级" TextAlign="Center" HeaderTextAlign="Center"> FieldType="String" HeaderText="压力等级" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>