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

2023-03-16

Browse Source
This commit is contained in:
李鹏飞
2023-03-16 18:22:45 +08:00
parent ca74968104 eef27faf84
commit a532de3cdd
46 changed files with 1909 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Material/EquipmentSearch.aspx
+6
View File
@@ -39,6 +39,9 @@
<f:TextBox ID="txtEquipmentName" runat="server" Label="设备名称" LabelWidth="80px"
LabelAlign="Right">
</f:TextBox>
<f:TextBox ID="txtSpecificationAndModel" runat="server" Label="规格型号" LabelWidth="80px"
LabelAlign="Right">
</f:TextBox>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSearch" Icon="SystemSearch"
EnablePostBack="true" runat="server" OnClick="btnSearch_Click">
@@ -79,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>
SGGL/FineUIPro.Web/CQMS/Material/EquipmentSearch.aspx.cs
+5
View File
@@ -86,6 +86,11 @@ namespace FineUIPro.Web.CQMS.Material
strSql += " AND EquipmentName like @EquipmentName";
listStr.Add(new SqlParameter("@EquipmentName", "%" + this.txtEquipmentName.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtSpecificationAndModel.Text.Trim()))
{
strSql += " AND SpecificationAndModel like @SpecificationAndModel";
listStr.Add(new SqlParameter("@SpecificationAndModel", "%" + this.txtSpecificationAndModel.Text.Trim() + "%"));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
return tb;
SGGL/FineUIPro.Web/CQMS/Material/EquipmentSearch.aspx.designer.cs
Generated
+9
View File
@@ -93,6 +93,15 @@ namespace FineUIPro.Web.CQMS.Material {
/// </remarks>
protected global::FineUIPro.TextBox txtEquipmentName;
/// <summary>
/// txtSpecificationAndModel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSpecificationAndModel;
/// <summary>
/// btnSearch 控件。
/// </summary>
SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx
+2 -2
View File
@@ -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"
SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs
+19 -16
View File
@@ -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, "修改报验管理");
@@ -428,11 +431,11 @@ namespace FineUIPro.Web.CQMS.Material
{
err += "请选择单位！";
}
var att = BLL.AttachFileService.GetAttachFileByToKeyId(this.InspectionId);
if (att == null)
{
err += "请上传质量证明文件！";
}
//var att = BLL.AttachFileService.GetAttachFileByToKeyId(this.InspectionId);
//if (att == null)
//{
// err += "请上传质量证明文件！";
//}
if (!string.IsNullOrWhiteSpace(err))
{
Alert.ShowInTop(err, MessageBoxIcon.Warning);
SGGL/FineUIPro.Web/CQMS/Material/MaterialSearch.aspx
+6
View File
@@ -39,6 +39,9 @@
<f:TextBox ID="txtMaterialName" runat="server" Label="材料名称" LabelWidth="80px"
LabelAlign="Right">
</f:TextBox>
<f:TextBox ID="txtSpecificationAndModel" runat="server" Label="规格型号" LabelWidth="80px"
LabelAlign="Right">
</f:TextBox>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSearch" Icon="SystemSearch"
EnablePostBack="true" runat="server" OnClick="btnSearch_Click">
@@ -82,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>
SGGL/FineUIPro.Web/CQMS/Material/MaterialSearch.aspx.cs
+5
View File
@@ -86,6 +86,11 @@ namespace FineUIPro.Web.CQMS.Material
strSql += " AND MaterialName like @MaterialName";
listStr.Add(new SqlParameter("@MaterialName", "%" + this.txtMaterialName.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtSpecificationAndModel.Text.Trim()))
{
strSql += " AND SpecificationAndModel like @SpecificationAndModel";
listStr.Add(new SqlParameter("@SpecificationAndModel", "%" + this.txtSpecificationAndModel.Text.Trim() + "%"));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
return tb;
SGGL/FineUIPro.Web/CQMS/Material/MaterialSearch.aspx.designer.cs
Generated
+9
View File
@@ -93,6 +93,15 @@ namespace FineUIPro.Web.CQMS.Material {
/// </remarks>
protected global::FineUIPro.TextBox txtMaterialName;
/// <summary>
/// txtSpecificationAndModel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSpecificationAndModel;
/// <summary>
/// btnSearch 控件。
/// </summary>
SGGL/FineUIPro.Web/CQMS/PersonManage/TestRecordEdit.aspx.cs
+2 -1
View File
@@ -7,6 +7,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
using Model;
namespace FineUIPro.Web.CQMS.PersonManage
{
@@ -165,7 +166,7 @@ namespace FineUIPro.Web.CQMS.PersonManage
if (welder != null)
{
welder.States = Const.ProjectPersonStates_2;
BLL.SitePerson_PersonService.UpdateSitePerson(welder);
Funs.DB.SubmitChanges();
}
}
}
SGGL/FineUIPro.Web/CQMS/Plan/SubPlan.aspx
+1 -1
View File
@@ -140,7 +140,7 @@
<f:TemplateField ColumnID="State" Width="60px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.CQMSConstructSolutionService.ConvertState(Eval("State")) %>'></asp:Label>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.CQMS_SubPlanService.ConvertState(Eval("State")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="AuditMan" Width="80px" HeaderText="办理人" HeaderTextAlign="Center" TextAlign="Center"
SGGL/FineUIPro.Web/CQMS/Plan/SubPlanEdit.aspx
+1 -1
View File
@@ -208,7 +208,7 @@
<f:TemplateField ColumnID="ApproveType" Width="150px" HeaderText="办理类型" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.CQMSConstructSolutionService.ConvertState(Eval("ApproveType")) %>'></asp:Label>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.CQMS_SubPlanService.ConvertState(Eval("ApproveType")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="ApproveMan" Width="150px" HeaderText="办理人员" HeaderTextAlign="Center" TextAlign="Center"
SGGL/FineUIPro.Web/CQMS/Plan/SubPlanView.aspx
+1 -1
View File
@@ -157,7 +157,7 @@
<f:TemplateField ColumnID="ApproveType" Width="150px" HeaderText="办理类型" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.CQMSConstructSolutionService.ConvertState(Eval("ApproveType")) %>'></asp:Label>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.CQMS_SubPlanService.ConvertState(Eval("ApproveType")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="ApproveMan" Width="150px" HeaderText="办理人员" HeaderTextAlign="Center" TextAlign="Center"
SGGL/FineUIPro.Web/CQMS/RewardAndPunish/RewardAndPunish.aspx.cs
+1 -1
View File
@@ -66,7 +66,7 @@ namespace FineUIPro.Web.CQMS.RewardAndPunish
strSql += " AND ins.UnitId=@UnitId";
listStr.Add(new SqlParameter("@UnitId", drpUnit.SelectedValue));
}
if (this.rblType.SelectedValue != "0")
if (this.rblType.SelectedValue != "0")
{
strSql += " AND ins.Type=@Type";
listStr.Add(new SqlParameter("@Type", rblType.SelectedValue));
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonOut.aspx.cs
+12 -1
View File
@@ -1,4 +1,5 @@
using BLL;
using Model;
using System;
using System.Collections.Generic;
using System.Data;
@@ -85,7 +86,17 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
person.OutTime = Funs.GetNewDateTime(this.txtChangeTime.Text);
person.States = Const.State_2;
BLL.SitePerson_PersonService.UpdateSitePerson(person);
Model.Sys_Log newlog = new Sys_Log
{
UserId = this.CurrUser.PersonId,
MenuId = Const.PersonListMenuId,
OperationName = "现场人员出场",
OperationLog = "现场人员出场" + person.PersonName,
DataId = person.PersonId,
ProjectId = person.ProjectId,
};
BLL.SitePerson_PersonService.UpdateSitePerson(person, newlog);
}
}
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonUnitRefresh.aspx.cs
+2 -2
View File
@@ -117,13 +117,13 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
person.TeamGroupId = null;
}
BLL.SitePerson_PersonService.UpdateSitePerson(person);
Funs.DB.SubmitChanges();
var getPerson = Person_PersonsService.GetPerson_PersonsById(person.PersonId);
if (getPerson != null)
{
getPerson.UnitId = person.UnitId;
Person_PersonsService.UpdatePerson(getPerson);
Funs.DB.SubmitChanges();
}
}
}
SGGL/FineUIPro.Web/Person/DepartPersonShunt.aspx.cs
+11 -1
View File
@@ -1,5 +1,6 @@
using BLL;
using FastReport.DevComponents.Editors;
using Model;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -380,7 +381,16 @@ namespace FineUIPro.Web.Person
if (!string.IsNullOrEmpty(newProjectPerson.SitePersonId))
{
SitePerson_PersonService.UpdateSitePerson(newProjectPerson);
Model.Sys_Log newlog = new Sys_Log
{
UserId = this.CurrUser.PersonId,
MenuId = Const.PersonListMenuId,
OperationName = "部门人员",
OperationLog = "部门人员修改" + newProjectPerson.PersonName,
DataId = newProjectPerson.PersonId,
ProjectId = newProjectPerson.ProjectId,
};
SitePerson_PersonService.UpdateSitePerson(newProjectPerson,newlog);
LogService.AddSys_Log(this.CurrUser, newProjectPerson.IdentityCard, newProjectPerson.SitePersonId, BLL.Const.ProjectPersonMenuId, BLL.Const.BtnModify);
}
else
SGGL/FineUIPro.Web/Person/PersonItemEdit.aspx.cs
+1 -1
View File
@@ -165,7 +165,7 @@ namespace FineUIPro.Web.Person
{
this.PersonItemId = SQLHelper.GetNewID();
newData.PersonItemId = this.PersonItemId;
BLL.SitePerson_PersonItemService.AddPersonItem(newData);
BLL.SitePerson_PersonItemService.AddPersonItem(newData,null);
BLL.LogService.AddSys_Log(this.CurrUser, newData.PersonName, newData.PersonItemId, BLL.Const.ProjectPersonMenuId, BLL.Const.BtnAdd);
}
SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs
+11 -1
View File
@@ -708,7 +708,17 @@ namespace FineUIPro.Web.Person
if (!string.IsNullOrEmpty(newProjectPerson.SitePersonId))
{
newProjectPerson.PersonId = this.PersonId;
SitePerson_PersonService.UpdateSitePerson(newProjectPerson);
Model.Sys_Log newlog = new Sys_Log
{
UserId = this.CurrUser.PersonId,
MenuId = Const.PersonListMenuId,
OperationName = "劳务人员",
OperationLog = "劳务人员修改" + newProjectPerson.PersonName,
DataId = newProjectPerson.PersonId,
ProjectId = newProjectPerson.ProjectId,
};
SitePerson_PersonService.UpdateSitePerson(newProjectPerson, newlog);
LogService.AddSys_Log(this.CurrUser, newPerson.IdentityCard, newProjectPerson.SitePersonId, BLL.Const.ProjectPersonMenuId, BLL.Const.BtnModify);
}
else
SGGL/FineUIPro.Web/ProjectData/ProjectUser.aspx.cs
+12 -1
View File
@@ -1,6 +1,7 @@
namespace FineUIPro.Web.ProjectData
{
using BLL;
using Model;
using System;
using System.Collections.Generic;
using System.Data;
@@ -122,7 +123,17 @@
{
BLL.RoleItemService.DeleteRoleItem(roleItem.RoleItemId);
}
SitePerson_PersonService.UpdateSitePerson(projectUser);
Model.Sys_Log newlog = new Sys_Log
{
UserId = this.CurrUser.PersonId,
MenuId = Const.PersonListMenuId,
OperationName = "项目用户",
OperationLog = "项目用户删除" + projectUser.PersonName,
DataId = projectUser.PersonId,
ProjectId = projectUser.ProjectId,
};
SitePerson_PersonService.UpdateSitePerson(projectUser, newlog);
}
}
SGGL/FineUIPro.Web/ProjectData/ProjectUserSave.aspx.cs
+12 -1
View File
@@ -1,4 +1,5 @@
using BLL;
using Model;
using System;
using System.Linq;
@@ -114,7 +115,17 @@ namespace FineUIPro.Web.ProjectData
{
newProjectUser.WorkAreaId = string.Join(",", txtUnitWork.Values);
}
BLL.SitePerson_PersonService.UpdateSitePerson(newProjectUser);
Model.Sys_Log newlog = new Sys_Log
{
UserId = this.CurrUser.PersonId,
MenuId = Const.PersonListMenuId,
OperationName = "项目用户",
OperationLog = "项目用户修改" + newProjectUser.PersonName,
DataId = newProjectUser.PersonId,
ProjectId = newProjectUser.ProjectId,
};
BLL.SitePerson_PersonService.UpdateSitePerson(newProjectUser, newlog);
///离岗 -todo
Model.Sys_RoleItem roleItem = BLL.RoleItemService.GeRoleItemByUserIdAndProjectId(newProjectUser.PersonId, newProjectUser.ProjectId);