shecs
/
Basf_FCL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

18-19-20

This commit is contained in:
佘春生 2024-05-09 16:19:20 +08:00
parent 662829cff8
commit 42cb326102
17 changed files with 367 additions and 2024 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
DataBase/版本日志/FCLDB_2024.05.08.sql Normal file
View File

@ -0,0 +1,39 @@
UPDATE dbo.Base_Depart SET DepartCode='None',DepartName='None' WHERE DepartCode='All'
GO
ALTER TABLE dbo.EMC_Punishment ADD SelectYesNo BIT NULL
GO
ALTER TABLE dbo.EMC_Punishment ADD Def NVARCHAR(300) NULL
GO
ALTER VIEW [dbo].[View_EMC_Punishment]
AS
/*********扣款视图**********/
SELECT punish.PunishmentId,punish.PunishDate,punish.FO_NO,punish.SES_No,punish.Location,punish.Description,punish.Company, punish.Individual,
(ISNULL(punish.Company,0)+ISNULL(punish.Individual,0)) AS Backcharge, punish.CompletionDate,punish.PunishDate AS PunishTime,
(CASE WHEN punish.ViolationDegree='1' THEN '一般违章' WHEN punish.ViolationDegree='2' THEN '严重违章' WHEN punish.ViolationDegree='3' THEN '零容忍违章' END) AS ViolationDegree,
(CASE WHEN con.Contractor IS NULL THEN con.ContractorCN WHEN con.ContractorCN IS NULL THEN con.Contractor ELSE con.Contractor+con.ContractorCN END)AS Contractor,
datas.Contractor AS ContractorId,dis.Discipline AS DisciplineEn,dis.DisciplineCN,con.Contractor AS ContractorEn,con.ContractorCN,
(CASE WHEN dis.Discipline IS NULL THEN dis.DisciplineCN WHEN dis.DisciplineCN IS NULL THEN dis.Discipline ELSE dis.Discipline+dis.DisciplineCN END) AS Discipline,
datas.Contract_Admin AS Contract_AdminId, u.UserName AS Contract_Admin, u2.UserName AS Main_Coordinator,mcdep.DepartName AS MCDept, u3.UserName AS User_Representative,
bycDep.DepartName AS BYCRU,bycuser.UserName AS BYCRULeader, u4.UserName AS Violation_Inspector_Name, viDep.DepartName AS InspectionDep,
punish.BYC_RU,punish.Violation_Inspector,punish.ViolationRelatedSes,punish.Flag,punish.SelectYesNo,punish.Def,
(CASE WHEN punish.EmailIsSend=1 THEN '是' ELSE '否' END) AS EmailIsSend
FROM dbo.EMC_Punishment punish
LEFT JOIN dbo.FC_SESRelatedData datas ON datas.FO_NO = punish.FO_NO
LEFT JOIN dbo.Base_Contractor AS con ON con.ContractorId = datas.Contractor
LEFT JOIN dbo.Base_Discipline AS dis ON dis.DisciplineId = datas.DisciplineId
LEFT JOIN dbo.Sys_User AS u ON u.UserId = datas.Contract_Admin
LEFT JOIN dbo.Sys_User AS u2 ON u2.UserId = datas.Main_Coordinator
LEFT JOIN dbo.Sys_User AS u3 ON u3.UserId=datas.User_Representative
LEFT JOIN dbo.Base_Depart mcdep ON mcdep.DepartId = u2.DepartId
LEFT JOIN dbo.Base_Depart bycDep ON bycdep.DepartId=punish.BYC_RU
LEFT JOIN dbo.Sys_User bycuser ON bycuser.UserId = bycDep.DepartLeader
LEFT JOIN dbo.Sys_User AS u4 ON u4.UserId=punish.Violation_Inspector
LEFT JOIN dbo.Base_Depart viDep ON viDep.DepartId=u4.DepartId
GO

22
FCL/BLL/BaseInfo/DepartService.cs
View File

@ -155,5 +155,27 @@ namespace BLL
Funs.FineUIPleaseSelect(dropName); Funs.FineUIPleaseSelect(dropName);
} }
} }
/// <summary>
/// 根据条件加载部门
/// </summary>
/// <param name="dropName"></param>
/// <param name="isShowPlease"></param>
public static void InitDepartToWhere(FineUIPro.DropDownList dropName, bool isShowPlease)
{
dropName.DataValueField = "DepartId";
dropName.DataTextField = "DepartName";
dropName.DataSource = GetDarpDepartList();
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
public static List<Model.Base_Depart> GetDarpDepartList()
{
return (from x in Funs.DB.Base_Depart where x.DepartCode.Contains("/") || x.DepartCode.ToLower() == "none" orderby x.DepartCode select x).ToList();
}
} }
} }

2
FCL/BLL/Common/HttpHelper.cs
View File

@ -20,7 +20,7 @@ namespace BLL.Common
string strGetResponse = string.Empty; string strGetResponse = string.Empty;
try try
{ {
var getRequest = CreateHttpRequest(url,"", "GET"); var getRequest = CreateHttpRequest(url,"GET", "");
var getResponse = getRequest.GetResponse() as HttpWebResponse; var getResponse = getRequest.GetResponse() as HttpWebResponse;
strGetResponse = GetHttpResponse(getResponse, "GET"); strGetResponse = GetHttpResponse(getResponse, "GET");
} }

4
FCL/BLL/SES/PunishmentService.cs
View File

@ -46,6 +46,8 @@ namespace BLL
newPunishment.CompletionDate = punishment.CompletionDate; newPunishment.CompletionDate = punishment.CompletionDate;
newPunishment.Flag = punishment.Flag; newPunishment.Flag = punishment.Flag;
newPunishment.ViolationRelatedSes = punishment.ViolationRelatedSes; newPunishment.ViolationRelatedSes = punishment.ViolationRelatedSes;
newPunishment.SelectYesNo = punishment.SelectYesNo;
newPunishment.Def=punishment.Def;
Funs.DB.EMC_Punishment.InsertOnSubmit(newPunishment); Funs.DB.EMC_Punishment.InsertOnSubmit(newPunishment);
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
} }
@ -71,6 +73,8 @@ namespace BLL
newPunishment.Violation_Inspector = punishment.Violation_Inspector; newPunishment.Violation_Inspector = punishment.Violation_Inspector;
newPunishment.CompletionDate = punishment.CompletionDate; newPunishment.CompletionDate = punishment.CompletionDate;
newPunishment.ViolationRelatedSes = punishment.ViolationRelatedSes; newPunishment.ViolationRelatedSes = punishment.ViolationRelatedSes;
newPunishment.SelectYesNo = punishment.SelectYesNo;
newPunishment.Def = punishment.Def;
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
} }
} }

4
FCL/FCL.sln
View File

@ -1,7 +1,7 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15 # Visual Studio Version 17
VisualStudioVersion = 15.0.28307.572 VisualStudioVersion = 17.9.34728.123
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FineUIPro.Web", "FineUIPro.Web\FineUIPro.Web.csproj", "{C88D3156-2D56-4DB0-922E-1995FB61C9BD}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FineUIPro.Web", "FineUIPro.Web\FineUIPro.Web.csproj", "{C88D3156-2D56-4DB0-922E-1995FB61C9BD}"
EndProject EndProject

BIN
FCL/FineUIPro.Web/File/Excel/Punishment.xlsx
View File

Binary file not shown.

20
FCL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -2572,6 +2572,7 @@
<Content Include="File\Excel\SES ReportToCPT.xlsx" /> <Content Include="File\Excel\SES ReportToCPT.xlsx" />
<Content Include="File\Excel\EvaluationReport.xls" /> <Content Include="File\Excel\EvaluationReport.xls" />
<Content Include="File\Excel\CPTReport.xlsx" /> <Content Include="File\Excel\CPTReport.xlsx" />
<Content Include="File\Excel\承包商评估表.xlsx" />
<None Include="packages.config" /> <None Include="packages.config" />
<Content Include="LogOff.aspx" /> <Content Include="LogOff.aspx" />
<Content Include="ntko.js" /> <Content Include="ntko.js" />
@ -2606,17 +2607,6 @@
<Content Include="Report\FCLDS.xss"> <Content Include="Report\FCLDS.xss">
<DependentUpon>FCLDS.xsd</DependentUpon> <DependentUpon>FCLDS.xsd</DependentUpon>
</Content> </Content>
<Content Include="Report\ScoreDataSet.xsc">
<DependentUpon>ScoreDataSet.xsd</DependentUpon>
</Content>
<None Include="Report\ScoreDataSet.xsd">
<Generator>MSDataSetGenerator</Generator>
<LastGenOutput>ScoreDataSet1.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</None>
<Content Include="Report\ScoreDataSet.xss">
<DependentUpon>ScoreDataSet.xsd</DependentUpon>
</Content>
<Content Include="res\index\css\font\digifacewide.ttf" /> <Content Include="res\index\css\font\digifacewide.ttf" />
<Content Include="res\index\css\font\iconfont.eot" /> <Content Include="res\index\css\font\iconfont.eot" />
<Content Include="res\index\css\font\iconfont.ttf" /> <Content Include="res\index\css\font\iconfont.ttf" />
@ -3177,15 +3167,7 @@
<Compile Include="Report\ReportPrint.aspx.designer.cs"> <Compile Include="Report\ReportPrint.aspx.designer.cs">
<DependentUpon>ReportPrint.aspx</DependentUpon> <DependentUpon>ReportPrint.aspx</DependentUpon>
</Compile> </Compile>
<Compile Include="Report\ScoreDataSet.cs">
<DependentUpon>ScoreDataSet.xsd</DependentUpon>
</Compile>
<Compile Include="Report\ScoreDataSet.Designer.cs" /> <Compile Include="Report\ScoreDataSet.Designer.cs" />
<Compile Include="Report\ScoreDataSet1.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>ScoreDataSet.xsd</DependentUpon>
</Compile>
<Compile Include="Scripts\index.aspx.cs"> <Compile Include="Scripts\index.aspx.cs">
<DependentUpon>index.aspx</DependentUpon> <DependentUpon>index.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType> <SubType>ASPXCodeBehind</SubType>

4
FCL/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ShowAllFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress> <Use64BitIISExpress>
</Use64BitIISExpress> </Use64BitIISExpress>

28
FCL/FineUIPro.Web/Global.asax.cs
View File

@ -147,6 +147,17 @@
aTimer.Start(); aTimer.Start();
} }
// 启动接口
if (DateTime.Now.Hour == 17)
{
System.Timers.Timer fcTimer = new System.Timers.Timer();
fcTimer.Elapsed += new System.Timers.ElapsedEventHandler(Sync_HR);
//12小时执行一次
fcTimer.Interval = 1000 * 60 * 60 * 12;
fcTimer.Enabled = true;
fcTimer.Start();
}
} }
private void queTimer_AutoSendOne(object sender, System.Timers.ElapsedEventArgs e) private void queTimer_AutoSendOne(object sender, System.Timers.ElapsedEventArgs e)
@ -1385,6 +1396,13 @@
BLL.SQLHelper.ExecutSql(strSql); BLL.SQLHelper.ExecutSql(strSql);
} }
private void Sync_HR(object sender, System.Timers.ElapsedEventArgs e)
{
//调用接口
string baseUrl = "https://fcl-test.basf-ypc.net.cn/api/api/DataSyncUserInfo/GetHrInfoList";
BLL.Common.HttpHelper.HttpGetRequest(baseUrl);
}
protected void Session_Start(object sender, EventArgs e) protected void Session_Start(object sender, EventArgs e)
{ {
Session.Timeout = 120; Session.Timeout = 120;
@ -1475,9 +1493,17 @@
} }
// 回收时调用接口
protected void Application_End(object sender, EventArgs e) protected void Application_End(object sender, EventArgs e)
{ {
//调用接口
string baseUrl = "https://fcl-test.basf-ypc.net.cn/api/api/DataSyncUserInfo/GetHrInfoList";
BLL.Common.HttpHelper.HttpGetRequest(baseUrl);
//var obj = JsonConvert.DeserializeObject<dynamic>(result);
//if (obj.code == 200)
//{
// //成功
//}
} }
} }
} }

1921
FCL/FineUIPro.Web/Report/ScoreDataSet1.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

10
FCL/FineUIPro.Web/SES/CSafePunish.aspx
View File

@ -99,6 +99,9 @@
<f:RenderField Width="120px" ColumnID="BYCRU" DataField="BYCRU" <f:RenderField Width="120px" ColumnID="BYCRU" DataField="BYCRU"
FieldType="String" HeaderText="BYC Resp. Dept." HeaderTextAlign="Center"> FieldType="String" HeaderText="BYC Resp. Dept." HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="120px" ColumnID="BYCRULeader" DataField="BYCRULeader"
FieldType="String" HeaderText="BYC Resp Manager" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="Violation_Inspector_Name" DataField="Violation_Inspector_Name" <f:RenderField Width="120px" ColumnID="Violation_Inspector_Name" DataField="Violation_Inspector_Name"
FieldType="String" HeaderText="Violation </br>Inspector" HeaderTextAlign="Center"> FieldType="String" HeaderText="Violation </br>Inspector" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
@ -112,9 +115,12 @@
<f:RenderField Width="130px" ColumnID="CompletionDate" DataField="CompletionDate" <f:RenderField Width="130px" ColumnID="CompletionDate" DataField="CompletionDate"
FieldType="Date" Renderer="Date" HeaderText="Backcharge</br>Completion Date" HeaderTextAlign="Center"> FieldType="Date" Renderer="Date" HeaderText="Backcharge</br>Completion Date" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="120px" ColumnID="ViolationRelatedSes" DataField="ViolationRelatedSes" <f:RenderField Width="120px" ColumnID="ViolationRelatedSes" DataField="ViolationRelatedSes"
FieldType="String" HeaderText="Violation Related SES" HeaderTextAlign="Center"> FieldType="String" HeaderText="Violation Related SES" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="100px" ColumnID="EmailIsSend" DataField="EmailIsSend"
FieldType="String" HeaderText="If send mail" HeaderTextAlign="Center">
</f:RenderField>
</Columns> </Columns>
<Listeners> <Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" /> <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@ -138,7 +144,7 @@
</f:Panel> </f:Panel>
<f:Window ID="Window1" Title="Contractor Safety Punishment Edit" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window1" Title="Contractor Safety Punishment Edit" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true" Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
Width="960px" Height="630px"> Width="960px" Height="660px">
</f:Window> </f:Window>
<f:Menu ID="Menu1" runat="server"> <f:Menu ID="Menu1" runat="server">

42
FCL/FineUIPro.Web/SES/CSafePunish.aspx.cs
View File

@ -180,7 +180,7 @@ namespace FineUIPro.Web.SES
protected void btnEmail_Click(object sender, EventArgs e) protected void btnEmail_Click(object sender, EventArgs e)
{ {
List<Model.View_EMC_Punishment> pList = (from x in Funs.DB.View_EMC_Punishment List<Model.View_EMC_Punishment> pList = (from x in Funs.DB.View_EMC_Punishment
where x.Flag == "1" where x.Flag == "1" && x.EmailIsSend == "否" && x.BYCRU != null && x.BYCRU.ToLower() != "none"
&& (x.PunishDate.Value.Year + x.PunishDate.Value.Month) == (DateTime.Now.Year + DateTime.Now.Month) && (x.PunishDate.Value.Year + x.PunishDate.Value.Month) == (DateTime.Now.Year + DateTime.Now.Month)
select x).ToList(); select x).ToList();
if (pList.Count()>0) if (pList.Count()>0)
@ -255,10 +255,16 @@ namespace FineUIPro.Web.SES
string mailSubject = TemplateHelper.BulidByFile2(EmailName, myCol1); string mailSubject = TemplateHelper.BulidByFile2(EmailName, myCol1);
result = MailHelper.SendPunishMail(pops, pops.EmailYx, mailTo, mailSubject, mailBody, mailAttch, mailCode, mailPriority, mailCC, pList, out resultMessage); result = MailHelper.SendPunishMail(pops, pops.EmailYx, mailTo, mailSubject, mailBody, mailAttch, mailCode, mailPriority, mailCC, pList, out resultMessage);
// 发送成功后写入表中
if (result == true) if (result == true)
{ {
//p.EmailIsSend = true; foreach (var p in pList)
//Funs.DB.SubmitChanges(); {
var punish = BLL.PunishmentService.GetPunishmentById(p.PunishmentId);
punish.EmailIsSend = true;
Funs.DB.SubmitChanges();
}
ShowNotify("Email sent successfully!", MessageBoxIcon.Success); ShowNotify("Email sent successfully!", MessageBoxIcon.Success);
} }
else else
@ -494,26 +500,40 @@ namespace FineUIPro.Web.SES
if (reportModel.GetRow(i).GetCell(15) == null) reportModel.GetRow(i).CreateCell(15); if (reportModel.GetRow(i).GetCell(15) == null) reportModel.GetRow(i).CreateCell(15);
reportModel.GetRow(i).GetCell(15).SetCellValue(Grid1.Rows[i - 1].Values[16].ToString()); reportModel.GetRow(i).GetCell(15).SetCellValue(Grid1.Rows[i - 1].Values[16].ToString());
reportModel.GetRow(i).GetCell(15).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式 reportModel.GetRow(i).GetCell(15).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式
// Violation Inspector
// BYC Resp Manager
if (reportModel.GetRow(i).GetCell(16) == null) reportModel.GetRow(i).CreateCell(16); if (reportModel.GetRow(i).GetCell(16) == null) reportModel.GetRow(i).CreateCell(16);
reportModel.GetRow(i).GetCell(16).SetCellValue(Grid1.Rows[i - 1].Values[17].ToString()); reportModel.GetRow(i).GetCell(16).SetCellValue(Grid1.Rows[i - 1].Values[17].ToString());
reportModel.GetRow(i).GetCell(16).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式 reportModel.GetRow(i).GetCell(16).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式
// Inspection Department
// Violation Inspector
if (reportModel.GetRow(i).GetCell(17) == null) reportModel.GetRow(i).CreateCell(17); if (reportModel.GetRow(i).GetCell(17) == null) reportModel.GetRow(i).CreateCell(17);
reportModel.GetRow(i).GetCell(17).SetCellValue(Grid1.Rows[i - 1].Values[18].ToString()); reportModel.GetRow(i).GetCell(17).SetCellValue(Grid1.Rows[i - 1].Values[18].ToString());
reportModel.GetRow(i).GetCell(17).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式 reportModel.GetRow(i).GetCell(17).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式
// Backcharge SES No. // Inspection Department
if (reportModel.GetRow(i).GetCell(18) == null) reportModel.GetRow(i).CreateCell(18); if (reportModel.GetRow(i).GetCell(18) == null) reportModel.GetRow(i).CreateCell(18);
reportModel.GetRow(i).GetCell(18).SetCellValue(Grid1.Rows[i - 1].Values[19].ToString()); reportModel.GetRow(i).GetCell(18).SetCellValue(Grid1.Rows[i - 1].Values[19].ToString());
reportModel.GetRow(i).GetCell(18).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式 reportModel.GetRow(i).GetCell(18).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式
// Backcharge Completion Date // Backcharge SES No.
if (reportModel.GetRow(i).GetCell(19) == null) reportModel.GetRow(i).CreateCell(19); if (reportModel.GetRow(i).GetCell(19) == null) reportModel.GetRow(i).CreateCell(19);
if (Grid1.Rows[i - 1].Values[20] != null && Grid1.Rows[i - 1].Values[20].ToString() != "") reportModel.GetRow(i).GetCell(19).SetCellValue(Grid1.Rows[i - 1].Values[20].ToString());
reportModel.GetRow(i).GetCell(19).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式
// Backcharge Completion Date
if (reportModel.GetRow(i).GetCell(20) == null) reportModel.GetRow(i).CreateCell(20);
if (Grid1.Rows[i - 1].Values[21] != null && Grid1.Rows[i - 1].Values[21].ToString() != "")
{ {
DateTime cdate = Convert.ToDateTime(Grid1.Rows[i - 1].Values[20]); DateTime cdate = Convert.ToDateTime(Grid1.Rows[i - 1].Values[21]);
reportModel.GetRow(i).GetCell(19).SetCellValue(cdate.ToString("yyyy/MM/dd")); reportModel.GetRow(i).GetCell(20).SetCellValue(cdate.ToString("yyyy/MM/dd"));
reportModel.GetRow(i).GetCell(19).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式 reportModel.GetRow(i).GetCell(20).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式
} }
// Violation Related SES
if (reportModel.GetRow(i).GetCell(21) == null) reportModel.GetRow(i).CreateCell(21);
reportModel.GetRow(i).GetCell(21).SetCellValue(Grid1.Rows[i - 1].Values[22].ToString());
reportModel.GetRow(i).GetCell(21).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式
// If send mail
if (reportModel.GetRow(i).GetCell(22) == null) reportModel.GetRow(i).CreateCell(22);
reportModel.GetRow(i).GetCell(22).SetCellValue(Grid1.Rows[i - 1].Values[23].ToString());
reportModel.GetRow(i).GetCell(22).CellStyle.SetFont(cs_content_Font);
#endregion #endregion
} }

17
FCL/FineUIPro.Web/SES/CSafePunishEdit.aspx
View File

@ -13,7 +13,7 @@
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true" <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right"> BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows> <Rows>
<f:FormRow> <f:FormRow >
<Items> <Items>
<f:DatePicker ID="txtPunishDate" runat="server" Label="Date" LabelAlign="Right" LabelWidth="160px" DateFormatString="yyyy-MM-dd" Required="true" ShowRedStar="true"></f:DatePicker> <f:DatePicker ID="txtPunishDate" runat="server" Label="Date" LabelAlign="Right" LabelWidth="160px" DateFormatString="yyyy-MM-dd" Required="true" ShowRedStar="true"></f:DatePicker>
<f:DatePicker ID="txtPunishTime" runat="server" Label="Time" LabelAlign="Right" LabelWidth="160px" DateFormatString="HH:mm" DisplayType="Time"></f:DatePicker> <f:DatePicker ID="txtPunishTime" runat="server" Label="Time" LabelAlign="Right" LabelWidth="160px" DateFormatString="HH:mm" DisplayType="Time"></f:DatePicker>
@ -95,25 +95,24 @@
</f:FormRow> </f:FormRow>
<f:FormRow > <f:FormRow >
<Items> <Items>
<f:GroupPanel ID="GPDep" Title="End User（BYC Resp. Dept.部门）填写" Layout="Table" runat="server"> <f:GroupPanel ID="GPDep" Title="End User（BYC Resp. Dept.部门）填写" Layout="Anchor" runat="server" >
<Items> <Items>
<f:Form ShowBorder="false" ShowHeader="false" runat="server" LabelAlign="Right" > <f:Form ShowBorder="false" ShowHeader="false" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows> <Rows>
<f:FormRow ColumnWidths="50% 50%"> <f:FormRow ColumnWidths="45% 55%">
<Items> <Items>
<f:DropDownList ID="SelectYesNo" runat="server" LabelAlign="Right" Label="是否有关联SES" LabelWidth="170px" ShowRedStar="true"> <f:DropDownList ID="drpSelectYesNo" runat="server" LabelAlign="Right" Label="是否有关联SES" LabelWidth="160px" Width="400px" AutoPostBack="true" OnSelectedIndexChanged="drpSelectYesNo_SelectedIndexChanged" ShowRedStar="true">
<f:ListItem Value="" Text="-请选择-" />
<f:ListItem Value="True" Text="是" /> <f:ListItem Value="True" Text="是" />
<f:ListItem Value="False" Text="否" /> <f:ListItem Value="False" Text="否" />
</f:DropDownList> </f:DropDownList>
<f:TextBox ID="txtViolationRelatedSes" runat="server" Label="Violation Related SES" LabelAlign="Right" LabelWidth="230px" ShowRedStar="true"> <f:TextBox ID="txtViolationRelatedSes" runat="server" Label="Violation Related SES" LabelAlign="Right" LabelWidth="230px" Width="500px" >
</f:TextBox> </f:TextBox>
</Items> </Items>
</f:FormRow> </f:FormRow>
</Rows>
<Rows>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="Def" runat="server" Label="描述" LabelWidth="170px" ></f:TextBox> <f:TextBox ID="txtDef" runat="server" Label="描述" LabelWidth="160px"></f:TextBox>
</Items> </Items>
</f:FormRow> </f:FormRow>
</Rows> </Rows>

74
FCL/FineUIPro.Web/SES/CSafePunishEdit.aspx.cs
View File

@ -36,17 +36,8 @@ namespace FineUIPro.Web.SES
{ {
this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
string view = Request.Params["view"]; string view = Request.Params["view"];
if (view == "1")
{
this.btnSave.Hidden = true;
}
else
{
GetButtonPower();//按钮权限
}
var role = BLL.Sys_RoleService.GetRole(CurrUser.RoleId); var role = BLL.Sys_RoleService.GetRole(CurrUser.RoleId);
if (role != null && role.RoleName == "Contract Administrator") if (role != null && role.RoleName == "Contract Administrator")
{ {
txtSESNo.Required = true; txtSESNo.Required = true;
@ -64,7 +55,7 @@ namespace FineUIPro.Web.SES
// BLL.SESRelatedDataService.InitFONoDropDownList(this.drpFO_No, true);//合同号 // BLL.SESRelatedDataService.InitFONoDropDownList(this.drpFO_No, true);//合同号
BLL.ContractorService.InitDropDownList(drpContractor, true); //承包商; BLL.ContractorService.InitDropDownList(drpContractor, true); //承包商;
BLL.DepartService.InitDropDownList(this.drpBYC_RU, true);//BYC负责部门 BLL.DepartService.InitDepartToWhere(this.drpBYC_RU, true);//BYC负责部门
BLL.Sys_UserService.InitUserDropDownList(this.drpViolationInspector, true);//违章检查人 BLL.Sys_UserService.InitUserDropDownList(this.drpViolationInspector, true);//违章检查人
txtViolationRelatedSes.Enabled = false; txtViolationRelatedSes.Enabled = false;
@ -102,6 +93,16 @@ namespace FineUIPro.Web.SES
txtMainCoordinator.Text = punishment.Main_Coordinator; txtMainCoordinator.Text = punishment.Main_Coordinator;
txtMCDept.Text = punishment.MCDept; txtMCDept.Text = punishment.MCDept;
txtUserRepresentative.Text = punishment.User_Representative; txtUserRepresentative.Text = punishment.User_Representative;
if (punishment.SelectYesNo != null)
{
drpSelectYesNo.SelectedValue = punishment.SelectYesNo == true ? "True" : "False";
}
else
{
drpSelectYesNo.SelectedValue = "";
}
txtDef.Text= punishment.Def;
if (!string.IsNullOrEmpty(punishment.BYC_RU)) if (!string.IsNullOrEmpty(punishment.BYC_RU))
{ {
@ -119,18 +120,17 @@ namespace FineUIPro.Web.SES
{ {
btnSave.Hidden = false; btnSave.Hidden = false;
txtViolationRelatedSes.Enabled = true; txtViolationRelatedSes.Enabled = true;
drpSelectYesNo.Enabled = true;
txtDef.Enabled = true;
} }
else else
{ {
btnSave.Hidden = true; btnSave.Hidden = true;
txtViolationRelatedSes.Enabled = false; txtViolationRelatedSes.Enabled = false;
drpSelectYesNo.Enabled = false;
txtDef.Enabled = false;
} }
//if (!string.IsNullOrEmpty(punishment.ViolationRelatedSes))
//{
// SetReadonly(false);
//}
this.txtCompletionDate.Text = punishment.CompletionDate != null ? string.Format("{0:yyyy-MM-dd}", punishment.CompletionDate) : ""; this.txtCompletionDate.Text = punishment.CompletionDate != null ? string.Format("{0:yyyy-MM-dd}", punishment.CompletionDate) : "";
this.txtSESNo.Text = punishment.SES_No; this.txtSESNo.Text = punishment.SES_No;
txtViolationRelatedSes.Text = punishment.ViolationRelatedSes; txtViolationRelatedSes.Text = punishment.ViolationRelatedSes;
@ -140,6 +140,15 @@ namespace FineUIPro.Web.SES
{ {
} }
if (view == "1")
{
this.btnSave.Hidden = true;
}
else
{
GetButtonPower();//按钮权限
}
} }
} }
#endregion #endregion
@ -186,6 +195,15 @@ namespace FineUIPro.Web.SES
return; return;
} }
if (!string.IsNullOrEmpty(PunishmentId))
{
var punishment = BLL.PunishmentService.GetPunishmentById(PunishmentId);
if ((this.CurrUser.DepartId == punishment.BYC_RU || this.CurrUser.Account == Const.Gly) && this.drpSelectYesNo.SelectedValue == "")
{
Alert.ShowInTop("请选择是否有关联SES!", MessageBoxIcon.Warning);
return;
}
}
if (PunishmentId == null) if (PunishmentId == null)
{ {
PunishmentId = string.Empty; PunishmentId = string.Empty;
@ -260,6 +278,14 @@ namespace FineUIPro.Web.SES
{ {
punishment.Violation_Inspector = drpViolationInspector.SelectedValue; punishment.Violation_Inspector = drpViolationInspector.SelectedValue;
} }
if (drpSelectYesNo.SelectedValue != "")
{
punishment.SelectYesNo = Convert.ToBoolean(drpSelectYesNo.SelectedValue);
}
if (txtDef.Text != "")
{
punishment.Def = txtDef.Text.Trim();
}
punishment.ViolationRelatedSes = txtViolationRelatedSes.Text.Trim(); punishment.ViolationRelatedSes = txtViolationRelatedSes.Text.Trim();
punishment.CompletionDate = Funs.GetNewDateTime(this.txtCompletionDate.Text.Trim()); punishment.CompletionDate = Funs.GetNewDateTime(this.txtCompletionDate.Text.Trim());
punishment.Flag = "1"; punishment.Flag = "1";
@ -370,6 +396,24 @@ namespace FineUIPro.Web.SES
} }
} }
protected void drpSelectYesNo_SelectedIndexChanged(object sender, EventArgs e)
{
if (drpSelectYesNo.SelectedValue == "True")
{
txtViolationRelatedSes.Readonly = false;
txtViolationRelatedSes.ShowRedStar = true;
txtViolationRelatedSes.Required = true;
}
else
{
txtViolationRelatedSes.Readonly = true;
txtViolationRelatedSes.ShowRedStar = false;
txtViolationRelatedSes.Required = false;
txtDef.ShowRedStar = true;
txtDef.Required = true;
}
}
protected void txtPunish_OnTextChanged(object sender, EventArgs e) protected void txtPunish_OnTextChanged(object sender, EventArgs e)
{ {
decimal? numCompany = 0; decimal? numCompany = 0;

14
FCL/FineUIPro.Web/SES/CSafePunishEdit.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.SES { namespace FineUIPro.Web.SES
{
public partial class CSafePunishEdit { public partial class CSafePunishEdit
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@ -238,13 +240,13 @@ namespace FineUIPro.Web.SES {
protected global::FineUIPro.GroupPanel GPDep; protected global::FineUIPro.GroupPanel GPDep;
/// <summary> /// <summary>
/// SelectYesNo 控件。 /// drpSelectYesNo 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList SelectYesNo; protected global::FineUIPro.DropDownList drpSelectYesNo;
/// <summary> /// <summary>
/// txtViolationRelatedSes 控件。 /// txtViolationRelatedSes 控件。
@ -256,13 +258,13 @@ namespace FineUIPro.Web.SES {
protected global::FineUIPro.TextBox txtViolationRelatedSes; protected global::FineUIPro.TextBox txtViolationRelatedSes;
/// <summary> /// <summary>
/// Def 控件。 /// txtDef 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox Def; protected global::FineUIPro.TextBox txtDef;
/// <summary> /// <summary>
/// Toolbar1 控件。 /// Toolbar1 控件。

120
FCL/Model/Model.cs
View File

@ -9727,6 +9727,10 @@ namespace Model
private string _ViolationRelatedSes; private string _ViolationRelatedSes;
private System.Nullable<bool> _SelectYesNo;
private string _Def;
private EntityRef<Base_Depart> _Base_Depart; private EntityRef<Base_Depart> _Base_Depart;
private EntityRef<Sys_User> _Sys_User; private EntityRef<Sys_User> _Sys_User;
@ -9767,6 +9771,10 @@ namespace Model
partial void OnEmailIsSendChanged(); partial void OnEmailIsSendChanged();
partial void OnViolationRelatedSesChanging(string value); partial void OnViolationRelatedSesChanging(string value);
partial void OnViolationRelatedSesChanged(); partial void OnViolationRelatedSesChanged();
partial void OnSelectYesNoChanging(System.Nullable<bool> value);
partial void OnSelectYesNoChanged();
partial void OnDefChanging(string value);
partial void OnDefChanged();
#endregion #endregion
public EMC_Punishment() public EMC_Punishment()
@ -10104,6 +10112,46 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SelectYesNo", DbType="Bit")]
public System.Nullable<bool> SelectYesNo
{
get
{
return this._SelectYesNo;
}
set
{
if ((this._SelectYesNo != value))
{
this.OnSelectYesNoChanging(value);
this.SendPropertyChanging();
this._SelectYesNo = value;
this.SendPropertyChanged("SelectYesNo");
this.OnSelectYesNoChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Def", DbType="NVarChar(300)")]
public string Def
{
get
{
return this._Def;
}
set
{
if ((this._Def != value))
{
this.OnDefChanging(value);
this.SendPropertyChanging();
this._Def = value;
this.SendPropertyChanged("Def");
this.OnDefChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_EMC_Punishment_Base_Depart", Storage="_Base_Depart", ThisKey="BYC_RU", OtherKey="DepartId", IsForeignKey=true)] [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_EMC_Punishment_Base_Depart", Storage="_Base_Depart", ThisKey="BYC_RU", OtherKey="DepartId", IsForeignKey=true)]
public Base_Depart Base_Depart public Base_Depart Base_Depart
{ {
@ -27390,6 +27438,8 @@ namespace Model
private string _BYCRU; private string _BYCRU;
private string _BYCRULeader;
private string _Violation_Inspector_Name; private string _Violation_Inspector_Name;
private string _InspectionDep; private string _InspectionDep;
@ -27402,6 +27452,12 @@ namespace Model
private string _Flag; private string _Flag;
private System.Nullable<bool> _SelectYesNo;
private string _Def;
private string _EmailIsSend;
public View_EMC_Punishment() public View_EMC_Punishment()
{ {
} }
@ -27806,6 +27862,22 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BYCRULeader", DbType="NVarChar(50)")]
public string BYCRULeader
{
get
{
return this._BYCRULeader;
}
set
{
if ((this._BYCRULeader != value))
{
this._BYCRULeader = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Violation_Inspector_Name", DbType="NVarChar(50)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Violation_Inspector_Name", DbType="NVarChar(50)")]
public string Violation_Inspector_Name public string Violation_Inspector_Name
{ {
@ -27901,6 +27973,54 @@ namespace Model
} }
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SelectYesNo", DbType="Bit")]
public System.Nullable<bool> SelectYesNo
{
get
{
return this._SelectYesNo;
}
set
{
if ((this._SelectYesNo != value))
{
this._SelectYesNo = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Def", DbType="NVarChar(300)")]
public string Def
{
get
{
return this._Def;
}
set
{
if ((this._Def != value))
{
this._Def = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EmailIsSend", DbType="VarChar(2) NOT NULL", CanBeNull=false)]
public string EmailIsSend
{
get
{
return this._EmailIsSend;
}
set
{
if ((this._EmailIsSend != value))
{
this._EmailIsSend = value;
}
}
}
} }
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_ExtremeScoresReport")] [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_ExtremeScoresReport")]

2
FCL/WebApi/WebApi.csproj.user
View File

@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication /> <IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode /> <IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile /> <UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
</PropertyGroup> </PropertyGroup>
<ProjectExtensions> <ProjectExtensions>
<VisualStudio> <VisualStudio>