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

Compare commits

base: shecs:91d43404738120c34bd632be519422b6919999d5
Branches Tags
shecs:master
shecs:hotfix20240606
...
compare: shecs:382644d35b09c8d314543935e969e5a2fb9e1824
Branches Tags
shecs:master
shecs:hotfix20240606

10 Commits
91d4340473 ... 382644d35b

Author SHA1 Message Date
佘春生 382644d35b 11 2024-05-16 10:19:05 +08:00
佘春生 145844fbed 11 2024-05-16 10:17:34 +08:00
佘春生 d17354f244 11 2024-05-16 10:17:29 +08:00
佘春生 ad05e3d763 123 2024-05-09 16:24:44 +08:00
佘春生 42cb326102 18-19-20 2024-05-09 16:19:20 +08:00
佘春生 662829cff8 12345 2024-05-09 16:18:51 +08:00
佘春生 fd2c0283b0 12345 2024-05-09 16:13:50 +08:00
佘春生 115c10135e 1111 2024-05-09 16:13:10 +08:00
佘春生 8b6bda49e8 2024.05.08:更新版本到4.8 2024-05-08 17:34:50 +08:00
佘春生 605b11502c 2024.05.08:更新到4.8 2024-05-08 17:34:09 +08:00
47 changed files with 1215 additions and 438 deletions
Show Stats Expand all files Collapse all files

25
.gitignore vendored
View File

@ -79,6 +79,8 @@ FCL/.vs/HJGL/v15/Server/sqlite3/storage.ide
FCL/.vs/HJGL/v15/Server/sqlite3/storage.ide-shm
FCL/.vs/HJGL/v15/Server/sqlite3/storage.ide-wal
FCL/.vs/config/applicationhost.config
FCL/BLL/obj/
FCL/BLL/obj/Debug
FCL/BLL/bin/Debug/BLL.dll
FCL/BLL/bin/Debug/BLL.dll.config
FCL/BLL/bin/Debug/BLL.pdb
@ -172,6 +174,7 @@ FCL/FineUIPro/Net45/Newtonsoft.Json.dll
FCL/FineUIPro/Net45/Newtonsoft.Json.xml
FCL/FineUIPro.Web/bin/AxInterop.SYNCARDOCXLib.dll
FCL/FineUIPro.Web/bin/BLL.dll
FCL/FineUIPro.Web/obj/
FCL/FineUIPro.Web/bin/BLL.dll.config
FCL/FineUIPro.Web/bin/BLL.pdb
FCL/FineUIPro.Web/bin/BouncyCastle.Crypto.dll
@ -512,9 +515,6 @@ FCL/FineUIPro.Web/Report/ScoreDataSet.xsc
FCL/FineUIPro.Web/Report/ScoreDataSet.xsd
FCL/FineUIPro.Web/Report/ScoreDataSet.xss
FCL/FineUIPro.Web/Report/ScoreReport.rdlc
FCL/FineUIPro.Web/Web.config
FCL/FineUIPro.Web/Web.Debug.config
FCL/FineUIPro.Web/Web.Release.config
FCL/Model/bin/Debug/Model.dll
FCL/Model/bin/Debug/Model.pdb
FCL/Model/bin/Debug/Newtonsoft.Json.dll
@ -1179,3 +1179,22 @@ FCL/WebApi/obj/Release/WebApi.pdb
FCL/WebApi/Web.config
FCL/WebApi/Web.Debug.config
FCL/WebApi/Web.Release.config
/FCL/.vs/FCL
/FCL/FineUIPro.Web/bin
/FCL/WebApi/obj/Debug/WebApi.csproj.AssemblyReference.cache
/FCL/WebApi/obj/Debug/WebApi.csproj.Up2Date
/FCL/FineUIPro.Web/obj/Debug/FineUIPro.Web.csproj.AssemblyReference.cache
/FCL/WebApi/obj/Release
*.rar
/FCLPackFile_2024.05.09
/FCL/BLL/obj/Debug/BLL.csproj.AssemblyReference.cache
/FCL/Model/obj/Debug/Model.csproj.AssemblyReference.cache
/FCL/Model/obj/Debug/Model.csproj.Up2Date
/FCL/Model/obj/Release
/FCL/FineUIPro.Web/File/Excel/20240509025724
/FCL/FineUIPro.Web/ErrLog.txt
/FCL/FineUIPro.Web/File/Excel/20240515025234
/FCL/FineUIPro.Web/File/Excel/20240515025426
/FCL/FineUIPro.Web/File/Excel/20240515031710
/FCL/FineUIPro.Web/File/Excel/20240515031759
/FCL/WebApi/obj/Debug

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

@ -0,0 +1,46 @@
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
-- 5.13加：违规关联SES号的填写通知是否发送
ALTER TABLE dbo.EMC_Punishment ADD RelatedSesMailIsSend BIT NULL
GO
ALTER TABLE dbo.EMC_Punishment ADD CreateDate DATETIME NULL
GO
UPDATE dbo.EMC_Punishment SET RelatedSesMailIsSend=1
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

57
DataBase/版本日志/FCLDB_2024.05.14.sql Normal file
View File

@ -0,0 +1,57 @@

ALTER TABLE dbo.FC_SESRelatedData ADD OtherDef NVARCHAR(300) NULL
GO
ALTER VIEW [dbo].[View_Contractor_Evaluation]
AS
/*********框架承包商评估表**********/
SELECT t.*,(t.Spending_commitment+t.Forecasted) AS Total,
(CASE WHEN t.YearDiff<>0 THEN CONVERT(DECIMAL(18,2),(t.Spending_commitment+t.Forecasted)/t.YearDiff) ELSE NULL END) AS YearAvg
FROM
(SELECT datas.ID, datas.FO_NO, datas.TechnicalBonus,datas.SafetyBonus,
(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.DisciplineId,
(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.Buyer,
datas.BuyerId,
datas.Main_Coordinator AS Main_CoordinatorId,
u2.UserName AS Main_Coordinator,
datas.Contract_Admin,
datas.Validate_Date,
datas.Expire_Date,
(CASE WHEN datas.Validate_Date IS NOT NULL AND datas.Expire_Date IS NOT NULL THEN CONVERT(DECIMAL(9,2),DATEDIFF(DAY,datas.Validate_Date,datas.Expire_Date)*1.00/365) ELSE 0 END ) AS YearDiff,
v.Spending_commitment AS Spending_commitment,
(CASE WHEN datas.Proportion_of_FC_Definition IS NOT NULL THEN CONVERT(VARCHAR(10),CONVERT(DECIMAL(9,2),datas.Proportion_of_FC_Definition*100.0))+'%' END) AS VolumeAllocation,
CONVERT(DECIMAL(18,2), ISNULL(datas.Forecasted,0)) AS Forecasted,
datas.ReviewOfFC,datas.PriceEvaluation1,datas.PriceEvaluation2,datas.PriceLevel,datas.enumeration,datas.NCRIsReview,datas.NCRReviewNum,
datas.IsInquiry,datas.InquiryNum,datas.AuditResult,datas.BoQIsAudit,datas.BoQAuditComments,datas.IsOthers,datas.OthersNum,datas.OtherDef,datas.Proposed
FROM FC_SESRelatedData AS datas
LEFT JOIN dbo.Base_Contractor AS con ON con.ContractorId = datas.Contractor
LEFT JOIN dbo.Sys_User AS u2 ON u2.UserId = datas.Main_Coordinator
LEFT JOIN dbo.Base_Discipline AS dis ON dis.DisciplineId = datas.DisciplineId
LEFT JOIN
(SELECT datas.FO_NO,
(CONVERT(DECIMAL(18,2),ISNULL(c.CheckedValue,0))+CONVERT(DECIMAL(18,2),ISNULL(a.Commitment,0))) AS Spending_commitment
FROM FC_SESRelatedData AS datas
LEFT JOIN dbo.Base_Discipline AS dis ON dis.DisciplineId = datas.DisciplineId
LEFT JOIN dbo.Base_FOType AS ft ON ft.FOTypeId = datas.FOTypeId
LEFT JOIN(SELECT SUM(ISNULL(SSR_Actual_cost,0)) AS CheckedValue,FO FROM dbo.FC_SESReport
WHERE Accepted='X' AND Deleted <> 'X' AND Blocked <> 'X' GROUP BY FO) AS c ON c.FO=datas.FO_NO
LEFT JOIN(SELECT SUM(ISNULL(SSR_budget,0)) AS Commitment,FO FROM dbo.FC_SESReport
WHERE Accepted <> 'X' AND Deleted <> 'X' AND Blocked <> 'X' GROUP BY FO) AS a ON a.FO=datas.FO_NO
--WHERE ft.FOType!='OEM' AND dis.Discipline NOT LIKE '%Basf Expert Service%'
-- AND datas.FC_Status!='Closed' AND (datas.Expire_Date IS NOT NULL AND DATEDIFF(MONTH,Expire_Date,GETDATE())<=1)
)v ON v.FO_NO = datas.FO_NO
)t
GO

2
FCL/BLL/BLL.csproj
View File

@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BLL</RootNamespace>
<AssemblyName>BLL</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>

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

@ -155,5 +155,27 @@ namespace BLL
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;
try
{
var getRequest = CreateHttpRequest(url,"", "GET");
var getRequest = CreateHttpRequest(url,"GET", "");
var getResponse = getRequest.GetResponse() as HttpWebResponse;
strGetResponse = GetHttpResponse(getResponse, "GET");
}

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

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

8
FCL/BLL/app.config
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

4
FCL/BLL/obj/Debug/.NETFramework,Version=v4.6.1.AssemblyAttributes.cs Normal file
View File

@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]

4
FCL/BLL/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs Normal file
View File

@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]

0
FCL/BLL/obj/Debug/BLL.csproj.Up2Date Normal file
View File

4
FCL/FCL.sln
View File

@ -1,7 +1,7 @@

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

68
FCL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs generated
View File

@ -13,13 +13,13 @@ namespace Resources {
/// <summary>
/// 强类型资源类，用于查找本地化字符串等。
/// 一个强类型的资源类，用于查找本地化的字符串等。
/// </summary>
// 此类是由 StronglyTypedResourceBuilder
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或删除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 Visual Studio 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Web.Application.StronglyTypedResourceProxyBuilder", "15.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Web.Application.StronglyTypedResourceProxyBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Lan {
@ -33,7 +33,7 @@ namespace Resources {
}
/// <summary>
/// 返回此类使用的缓存 ResourceManager 实例。
/// 返回此类使用的缓存的 ResourceManager 实例。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
@ -47,8 +47,8 @@ namespace Resources {
}
/// <summary>
/// 覆盖当前线程的 CurrentUICulture 属性
/// 使用此强类型的资源类的资源查找。
/// 重写当前线程的 CurrentUICulture 属性，对
/// 使用此强类型资源类的所有资源查找执行重写。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
@ -61,7 +61,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 账号 的本地化字符串。
/// 查找类似 账号 的本地化字符串。
/// </summary>
internal static string Account {
get {
@ -70,7 +70,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 新增 的本地化字符串。
/// 查找类似 新增 的本地化字符串。
/// </summary>
internal static string Add {
get {
@ -79,7 +79,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 全部 的本地化字符串。
/// 查找类似 全部 的本地化字符串。
/// </summary>
internal static string All {
get {
@ -88,7 +88,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 所有行 的本地化字符串。
/// 查找类似 所有行 的本地化字符串。
/// </summary>
internal static string AllLines {
get {
@ -97,7 +97,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 全选 的本地化字符串。
/// 查找类似 全选 的本地化字符串。
/// </summary>
internal static string AllSelected {
get {
@ -106,7 +106,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 中文 的本地化字符串。
/// 查找类似 中文 的本地化字符串。
/// </summary>
internal static string Chinese {
get {
@ -115,7 +115,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 关闭 的本地化字符串。
/// 查找类似 关闭 的本地化字符串。
/// </summary>
internal static string Close {
get {
@ -124,7 +124,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 已关闭 的本地化字符串。
/// 查找类似 已关闭 的本地化字符串。
/// </summary>
internal static string Closed {
get {
@ -133,7 +133,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 删除 的本地化字符串。
/// 查找类似 删除 的本地化字符串。
/// </summary>
internal static string Delete {
get {
@ -142,7 +142,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 删除数据 的本地化字符串。
/// 查找类似 删除数据 的本地化字符串。
/// </summary>
internal static string DeleteData {
get {
@ -151,7 +151,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 删除成功！ 的本地化字符串。
/// 查找类似 删除成功！ 的本地化字符串。
/// </summary>
internal static string DeletedSuccessfully {
get {
@ -160,7 +160,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 删除选中行？ 的本地化字符串。
/// 查找类似 删除选中行？ 的本地化字符串。
/// </summary>
internal static string DeleteReminder {
get {
@ -169,7 +169,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 删除行 的本地化字符串。
/// 查找类似 删除行 的本地化字符串。
/// </summary>
internal static string DeleteRows {
get {
@ -178,7 +178,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 编辑 的本地化字符串。
/// 查找类似 编辑 的本地化字符串。
/// </summary>
internal static string Edit {
get {
@ -187,7 +187,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 英文 的本地化字符串。
/// 查找类似 英文 的本地化字符串。
/// </summary>
internal static string English {
get {
@ -196,7 +196,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 导出 的本地化字符串。
/// 查找类似 导出 的本地化字符串。
/// </summary>
internal static string Export {
get {
@ -205,7 +205,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 首页 的本地化字符串。
/// 查找类似 首页 的本地化字符串。
/// </summary>
internal static string HomePage {
get {
@ -214,7 +214,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 查询 的本地化字符串。
/// 查找类似 查询 的本地化字符串。
/// </summary>
internal static string Inquiry {
get {
@ -223,7 +223,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 行 的本地化字符串。
/// 查找类似 行 的本地化字符串。
/// </summary>
internal static string Line {
get {
@ -232,7 +232,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 正在加载··· 的本地化字符串。
/// 查找类似 正在加载··· 的本地化字符串。
/// </summary>
internal static string Loading {
get {
@ -241,7 +241,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 加载动画 的本地化字符串。
/// 查找类似 加载动画 的本地化字符串。
/// </summary>
internal static string LoadingAnimation {
get {
@ -250,7 +250,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 否 的本地化字符串。
/// 查找类似 否 的本地化字符串。
/// </summary>
internal static string No {
get {
@ -259,7 +259,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 请选择 的本地化字符串。
/// 查找类似 请选择 的本地化字符串。
/// </summary>
internal static string PleaseSelect {
get {
@ -268,7 +268,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 保存 的本地化字符串。
/// 查找类似 保存 的本地化字符串。
/// </summary>
internal static string Save {
get {
@ -277,7 +277,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 保存成功！ 的本地化字符串。
/// 查找类似 保存成功！ 的本地化字符串。
/// </summary>
internal static string SaveSuccessfully {
get {
@ -286,7 +286,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 选择 的本地化字符串。
/// 查找类似 选择 的本地化字符串。
/// </summary>
internal static string Select {
get {
@ -295,7 +295,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 选择语言 的本地化字符串。
/// 查找类似 选择语言 的本地化字符串。
/// </summary>
internal static string SelectLanguage {
get {
@ -304,7 +304,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 是 的本地化字符串。
/// 查找类似 是 的本地化字符串。
/// </summary>
internal static string Yes {
get {

1
FCL/FineUIPro.Web/ErrLog.txt
View File

@ -1 +0,0 @@


1
FCL/FineUIPro.Web/Evaluation/ContractorEvaluation.aspx
View File

@ -1,7 +1,6 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ContractorEvaluation.aspx.cs" Inherits="FineUIPro.Web.Evaluation.ContractorEvaluation" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

26
FCL/FineUIPro.Web/Evaluation/ContractorEvaluation.aspx.cs
View File

@ -204,17 +204,18 @@ namespace FineUIPro.Web.Evaluation
userList.Add(userRepresentative.First());
}
var ctk = from x in Funs.DB.Sys_User
join z in Funs.DB.Base_Depart on x.DepartId equals z.DepartId
where z.DepartCode == "CT/K" && x.Email != null && x.Email != ""
select x;
if (ctk.Count() > 0)
{
foreach (var c in ctk)
{
userList.Add(c);
}
}
// CT/K部门去掉
//var ctk = from x in Funs.DB.Sys_User
// join z in Funs.DB.Base_Depart on x.DepartId equals z.DepartId
// where z.DepartCode == "CT/K" && x.Email != null && x.Email != ""
// select x;
//if (ctk.Count() > 0)
//{
// foreach (var c in ctk)
// {
// userList.Add(c);
// }
//}
var ctss = from x in Funs.DB.Sys_User
join y in Funs.DB.Sys_Role on x.RoleId equals y.RoleId
@ -744,7 +745,7 @@ namespace FineUIPro.Web.Evaluation
if (eva.IsOthers == true)
{
reportModel.GetRow(46).GetCell(1).SetCellValue(eva.OthersNum != null ? eva.OthersNum.Value.ToString() : "0");
reportModel.GetRow(46).GetCell(1).SetCellValue(eva.OtherDef);
reportModel.GetRow(45).GetCell(2).SetCellValue(txtNo);
reportModel.GetRow(45).GetCell(2).CellStyle.SetFont(content_Font);
}
@ -835,6 +836,5 @@ namespace FineUIPro.Web.Evaluation
}
#endregion
}
}

4
FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx
View File

@ -194,7 +194,6 @@
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:GroupPanel>
@ -251,7 +250,8 @@
<f:Listener Event="change" Handler="onCheckBoxListChange" />
</Listeners>
</f:CheckBoxList>
<f:NumberBox ID="numOthers" runat="server" Label="次数Times" NoDecimal="true" NoNegative="true"></f:NumberBox>
<f:TextBox ID="txtOtherDef" runat="server" Label="描述"></f:TextBox>
<%-- <f:NumberBox ID="numOthers" runat="server" Label="次数Times" NoDecimal="true" NoNegative="true"></f:NumberBox>--%>
</Items>
</f:FormRow>
</Rows>

27
FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx.cs
View File

@ -43,7 +43,8 @@ namespace FineUIPro.Web.Evaluation
//cbBoQIsAudit.Enabled = false;
//txtBoQ.Enabled = false;
cbIsOthers.Enabled = false;
numOthers.Enabled = false;
txtOtherDef.Enabled = false;
//numOthers.Enabled = false;
txtProposed.Enabled = false;
txtTechnicalBonus.Enabled = false;
@ -79,7 +80,8 @@ namespace FineUIPro.Web.Evaluation
txtForecasted.Enabled = true;
txtTechnicalBonus.Enabled = true;
cbIsOthers.Enabled = true;
numOthers.Enabled = true;
//numOthers.Enabled = true;
txtOtherDef.Enabled= true;
txtProposed.Enabled = true;
btnSave.Hidden = false;
}
@ -191,11 +193,11 @@ namespace FineUIPro.Web.Evaluation
cbIsOthers.SelectedValueArray = new string[] { "False" };
}
}
if (foview.First().OthersNum.HasValue)
{
numOthers.Text = foview.First().OthersNum.ToString();
}
//if (foview.First().OthersNum.HasValue)
//{
// numOthers.Text = foview.First().OthersNum.ToString();
//}
txtOtherDef.Text = foview.First().OtherDef;
txtTechnicalBonus.Text = foview.First().TechnicalBonus;
txtSafetyBonus.Text = foview.First().SafetyBonus;
txtProposed.Text = foview.First().Proposed;
@ -206,7 +208,6 @@ namespace FineUIPro.Web.Evaluation
}
DateTime startDate = DateTime.Now.AddMonths(-23);
DateTime startTime = DateTime.Parse(startDate.Year + "-" + startDate.Month + "-01");
DateTime endTime = DateTime.Parse(DateTime.Now.Year + "-" + DateTime.Now.Month + "-13");
@ -347,11 +348,11 @@ namespace FineUIPro.Web.Evaluation
return;
}
if (!string.IsNullOrEmpty(numOthers.Text))
{
newFo.OthersNum = Convert.ToInt32(numOthers.Text);
}
//if (!string.IsNullOrEmpty(numOthers.Text))
//{
// newFo.OthersNum = Convert.ToInt32(numOthers.Text);
//}
newFo.OtherDef=txtOtherDef.Text.Trim();
newFo.TechnicalBonus = txtTechnicalBonus.Text.Trim();
var role = BLL.Sys_RoleService.GetRole(CurrUser.RoleId);

10
FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.Evaluation {
namespace FineUIPro.Web.Evaluation
{
public partial class ContractorEvaluationEdit {
public partial class ContractorEvaluationEdit
{
/// <summary>
/// _form1 控件。
@ -346,13 +348,13 @@ namespace FineUIPro.Web.Evaluation {
protected global::FineUIPro.CheckBoxList cbIsOthers;
/// <summary>
/// numOthers 控件。
/// txtOtherDef 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox numOthers;
protected global::FineUIPro.TextBox txtOtherDef;
/// <summary>
/// txtTechnicalBonus 控件。

324
FCL/FineUIPro.Web/Evaluation/PerformanceReport.aspx.cs
View File

@ -1838,7 +1838,7 @@ namespace FineUIPro.Web.Evaluation
int conListCount = conList.Count();
int overviewCount = OverviewReport.Count;
int safeOverviewCount = safeOverviewReport.Count;
int totalNum = punishCount * 2 + cmListCount + conListCount + overviewCount + safeOverviewCount + noEvaluatedUser.Count;
int totalNum = punishCount + cmListCount + conListCount + overviewCount + safeOverviewCount + noEvaluatedUser.Count;
#region
string rootPath = Server.MapPath("~/") + Const.ExcelUrl;
//模板文件
@ -1980,81 +1980,81 @@ namespace FineUIPro.Web.Evaluation
}
#endregion
#region punish_C4
XSSFSheet ws4 = (XSSFSheet)hssfworkbook.GetSheet("违规及处理办法C4");
if (punishCount > 0)
{
var rowIndex = 1;
foreach (var p in punishList)
{
if (ws4.GetRow(rowIndex) == null) ws4.CreateRow(rowIndex);
if (ws4.GetRow(rowIndex).GetCell(0) == null) ws4.GetRow(rowIndex).CreateCell(0);
if (ws4.GetRow(rowIndex).GetCell(1) == null) ws4.GetRow(rowIndex).CreateCell(1);
if (p.PunishDate != null)
{
ws4.GetRow(rowIndex).GetCell(0).SetCellValue(p.PunishDate.Value.ToString("yyyy/MM/dd"));
ws4.GetRow(rowIndex).GetCell(1).SetCellValue(p.PunishDate.Value.ToString("HH:mm"));
}
else
{
ws4.GetRow(rowIndex).GetCell(0).SetCellValue("");
ws4.GetRow(rowIndex).GetCell(1).SetCellValue("");
}
#region punish_C4 删除了
//XSSFSheet ws4 = (XSSFSheet)hssfworkbook.GetSheet("违规及处理办法C4");
//if (punishCount > 0)
//{
// var rowIndex = 1;
// foreach (var p in punishList)
// {
// if (ws4.GetRow(rowIndex) == null) ws4.CreateRow(rowIndex);
// if (ws4.GetRow(rowIndex).GetCell(0) == null) ws4.GetRow(rowIndex).CreateCell(0);
// if (ws4.GetRow(rowIndex).GetCell(1) == null) ws4.GetRow(rowIndex).CreateCell(1);
// if (p.PunishDate != null)
// {
// ws4.GetRow(rowIndex).GetCell(0).SetCellValue(p.PunishDate.Value.ToString("yyyy/MM/dd"));
// ws4.GetRow(rowIndex).GetCell(1).SetCellValue(p.PunishDate.Value.ToString("HH:mm"));
// }
// else
// {
// ws4.GetRow(rowIndex).GetCell(0).SetCellValue("");
// ws4.GetRow(rowIndex).GetCell(1).SetCellValue("");
// }
if (ws4.GetRow(rowIndex).GetCell(2) == null) ws4.GetRow(rowIndex).CreateCell(2);
ws4.GetRow(rowIndex).GetCell(2).SetCellValue(p.FO_NO);
if (ws4.GetRow(rowIndex).GetCell(3) == null) ws4.GetRow(rowIndex).CreateCell(3);
ws4.GetRow(rowIndex).GetCell(3).SetCellValue(p.ViolationRelatedSes);
if (ws4.GetRow(rowIndex).GetCell(4) == null) ws4.GetRow(rowIndex).CreateCell(4);
ws4.GetRow(rowIndex).GetCell(4).SetCellValue(p.Discipline);
if (ws4.GetRow(rowIndex).GetCell(5) == null) ws4.GetRow(rowIndex).CreateCell(5);
ws4.GetRow(rowIndex).GetCell(5).SetCellValue(p.DisciplineCN);
if (ws4.GetRow(rowIndex).GetCell(6) == null) ws4.GetRow(rowIndex).CreateCell(6);
ws4.GetRow(rowIndex).GetCell(6).SetCellValue(p.DisciplineEn);
if (ws4.GetRow(rowIndex).GetCell(7) == null) ws4.GetRow(rowIndex).CreateCell(7);
ws4.GetRow(rowIndex).GetCell(7).SetCellValue(p.Contractor);
if (ws4.GetRow(rowIndex).GetCell(8) == null) ws4.GetRow(rowIndex).CreateCell(8);
ws4.GetRow(rowIndex).GetCell(8).SetCellValue(p.ContractorCN);
if (ws4.GetRow(rowIndex).GetCell(9) == null) ws4.GetRow(rowIndex).CreateCell(9);
ws4.GetRow(rowIndex).GetCell(9).SetCellValue(p.ContractorEn);
if (ws4.GetRow(rowIndex).GetCell(10) == null) ws4.GetRow(rowIndex).CreateCell(10);
ws4.GetRow(rowIndex).GetCell(10).SetCellValue(p.Location);
if (ws4.GetRow(rowIndex).GetCell(11) == null) ws4.GetRow(rowIndex).CreateCell(11);
ws4.GetRow(rowIndex).GetCell(11).SetCellValue(p.Description);
// if (ws4.GetRow(rowIndex).GetCell(2) == null) ws4.GetRow(rowIndex).CreateCell(2);
// ws4.GetRow(rowIndex).GetCell(2).SetCellValue(p.FO_NO);
// if (ws4.GetRow(rowIndex).GetCell(3) == null) ws4.GetRow(rowIndex).CreateCell(3);
// ws4.GetRow(rowIndex).GetCell(3).SetCellValue(p.ViolationRelatedSes);
// if (ws4.GetRow(rowIndex).GetCell(4) == null) ws4.GetRow(rowIndex).CreateCell(4);
// ws4.GetRow(rowIndex).GetCell(4).SetCellValue(p.Discipline);
// if (ws4.GetRow(rowIndex).GetCell(5) == null) ws4.GetRow(rowIndex).CreateCell(5);
// ws4.GetRow(rowIndex).GetCell(5).SetCellValue(p.DisciplineCN);
// if (ws4.GetRow(rowIndex).GetCell(6) == null) ws4.GetRow(rowIndex).CreateCell(6);
// ws4.GetRow(rowIndex).GetCell(6).SetCellValue(p.DisciplineEn);
// if (ws4.GetRow(rowIndex).GetCell(7) == null) ws4.GetRow(rowIndex).CreateCell(7);
// ws4.GetRow(rowIndex).GetCell(7).SetCellValue(p.Contractor);
// if (ws4.GetRow(rowIndex).GetCell(8) == null) ws4.GetRow(rowIndex).CreateCell(8);
// ws4.GetRow(rowIndex).GetCell(8).SetCellValue(p.ContractorCN);
// if (ws4.GetRow(rowIndex).GetCell(9) == null) ws4.GetRow(rowIndex).CreateCell(9);
// ws4.GetRow(rowIndex).GetCell(9).SetCellValue(p.ContractorEn);
// if (ws4.GetRow(rowIndex).GetCell(10) == null) ws4.GetRow(rowIndex).CreateCell(10);
// ws4.GetRow(rowIndex).GetCell(10).SetCellValue(p.Location);
// if (ws4.GetRow(rowIndex).GetCell(11) == null) ws4.GetRow(rowIndex).CreateCell(11);
// ws4.GetRow(rowIndex).GetCell(11).SetCellValue(p.Description);
if (ws4.GetRow(rowIndex).GetCell(12) == null) ws4.GetRow(rowIndex).CreateCell(12);
ws4.GetRow(rowIndex).GetCell(12).SetCellValue(p.ViolationDegree);
if (ws4.GetRow(rowIndex).GetCell(13) == null) ws4.GetRow(rowIndex).CreateCell(13);
ws4.GetRow(rowIndex).GetCell(13).SetCellValue(p.Contract_Admin);
if (ws4.GetRow(rowIndex).GetCell(14) == null) ws4.GetRow(rowIndex).CreateCell(14);
ws4.GetRow(rowIndex).GetCell(14).SetCellValue(p.Main_Coordinator);
if (ws4.GetRow(rowIndex).GetCell(15) == null) ws4.GetRow(rowIndex).CreateCell(15);
ws4.GetRow(rowIndex).GetCell(15).SetCellValue(p.MCDept);
if (ws4.GetRow(rowIndex).GetCell(16) == null) ws4.GetRow(rowIndex).CreateCell(16);
ws4.GetRow(rowIndex).GetCell(16).SetCellValue(p.User_Representative);
if (ws4.GetRow(rowIndex).GetCell(17) == null) ws4.GetRow(rowIndex).CreateCell(17);
ws4.GetRow(rowIndex).GetCell(17).SetCellValue(p.BYCRU);
// if (ws4.GetRow(rowIndex).GetCell(12) == null) ws4.GetRow(rowIndex).CreateCell(12);
// ws4.GetRow(rowIndex).GetCell(12).SetCellValue(p.ViolationDegree);
// if (ws4.GetRow(rowIndex).GetCell(13) == null) ws4.GetRow(rowIndex).CreateCell(13);
// ws4.GetRow(rowIndex).GetCell(13).SetCellValue(p.Contract_Admin);
// if (ws4.GetRow(rowIndex).GetCell(14) == null) ws4.GetRow(rowIndex).CreateCell(14);
// ws4.GetRow(rowIndex).GetCell(14).SetCellValue(p.Main_Coordinator);
// if (ws4.GetRow(rowIndex).GetCell(15) == null) ws4.GetRow(rowIndex).CreateCell(15);
// ws4.GetRow(rowIndex).GetCell(15).SetCellValue(p.MCDept);
// if (ws4.GetRow(rowIndex).GetCell(16) == null) ws4.GetRow(rowIndex).CreateCell(16);
// ws4.GetRow(rowIndex).GetCell(16).SetCellValue(p.User_Representative);
// if (ws4.GetRow(rowIndex).GetCell(17) == null) ws4.GetRow(rowIndex).CreateCell(17);
// ws4.GetRow(rowIndex).GetCell(17).SetCellValue(p.BYCRU);
if (ws4.GetRow(rowIndex).GetCell(18) == null) ws4.GetRow(rowIndex).CreateCell(18);
ws4.GetRow(rowIndex).GetCell(18).SetCellValue(p.Violation_Inspector_Name);
if (ws4.GetRow(rowIndex).GetCell(19) == null) ws4.GetRow(rowIndex).CreateCell(19);
ws4.GetRow(rowIndex).GetCell(19).SetCellValue(p.InspectionDep);
if (ws4.GetRow(rowIndex).GetCell(20) == null) ws4.GetRow(rowIndex).CreateCell(20);
ws4.GetRow(rowIndex).GetCell(20).SetCellValue(p.SES_No);
if (ws4.GetRow(rowIndex).GetCell(21) == null) ws4.GetRow(rowIndex).CreateCell(21);
ws4.GetRow(rowIndex).GetCell(21).SetCellValue(p.CompletionDate != null ? p.CompletionDate.Value.ToString("yyyy/MM/dd") : "");
// if (ws4.GetRow(rowIndex).GetCell(18) == null) ws4.GetRow(rowIndex).CreateCell(18);
// ws4.GetRow(rowIndex).GetCell(18).SetCellValue(p.Violation_Inspector_Name);
// if (ws4.GetRow(rowIndex).GetCell(19) == null) ws4.GetRow(rowIndex).CreateCell(19);
// ws4.GetRow(rowIndex).GetCell(19).SetCellValue(p.InspectionDep);
// if (ws4.GetRow(rowIndex).GetCell(20) == null) ws4.GetRow(rowIndex).CreateCell(20);
// ws4.GetRow(rowIndex).GetCell(20).SetCellValue(p.SES_No);
// if (ws4.GetRow(rowIndex).GetCell(21) == null) ws4.GetRow(rowIndex).CreateCell(21);
// ws4.GetRow(rowIndex).GetCell(21).SetCellValue(p.CompletionDate != null ? p.CompletionDate.Value.ToString("yyyy/MM/dd") : "");
if ((int)((90 * (rowIndex + punishCount)) / totalNum) > percent)
{
percent = (int)(100 * (rowIndex + punishCount) / totalNum);
}
rowIndex++;
}
}
// if ((int)((90 * (rowIndex + punishCount)) / totalNum) > percent)
// {
// percent = (int)(100 * (rowIndex + punishCount) / totalNum);
// }
// rowIndex++;
// }
//}
#endregion
#region 约谈，NCR，合同终止
XSSFSheet wsCm = (XSSFSheet)hssfworkbook.GetSheet("约谈，NCR，合同终止");
#region 约谈，NCR，合同终止 改为C4了
XSSFSheet wsCm = (XSSFSheet)hssfworkbook.GetSheet("违规及处理办法C4");
if (cmListCount > 0)
{
var rowIndex = 1;
@ -2092,9 +2092,9 @@ namespace FineUIPro.Web.Evaluation
if (wsCm.GetRow(rowIndex).GetCell(14) == null) wsCm.GetRow(rowIndex).CreateCell(14);
wsCm.GetRow(rowIndex).GetCell(14).SetCellValue(p.BycDept);
if ((int)((90 * (rowIndex + punishCount * 2)) / totalNum) > percent)
if ((int)((90 * (rowIndex + punishCount )) / totalNum) > percent)
{
percent = (int)(100 * (rowIndex + punishCount * 2) / totalNum);
percent = (int)(100 * (rowIndex + punishCount) / totalNum);
}
rowIndex++;
}
@ -2118,9 +2118,9 @@ namespace FineUIPro.Web.Evaluation
if (wsCon.GetRow(rowIndex).GetCell(3) == null) wsCon.GetRow(rowIndex).CreateCell(3);
wsCon.GetRow(rowIndex).GetCell(3).SetCellValue(p.Expire_Date != null ? p.Expire_Date.Value.ToString("yyyy/MM/dd") : "");
if ((int)((90 * (rowIndex + punishCount * 2 + cmListCount)) / totalNum) > percent)
if ((int)((90 * (rowIndex + punishCount + cmListCount)) / totalNum) > percent)
{
percent = (int)(100 * (rowIndex + punishCount * 2 + cmListCount) / totalNum);
percent = (int)(100 * (rowIndex + punishCount + cmListCount) / totalNum);
}
rowIndex++;
}
@ -2226,9 +2226,9 @@ namespace FineUIPro.Web.Evaluation
wss.GetRow(rowIndex).GetCell(21).CellStyle = styleQfw;
#endregion
if ((int)((90 * (rowIndex + punishCount * 2 + cmListCount + conListCount)) / totalNum) > percent)
if ((int)((90 * (rowIndex + punishCount + cmListCount + conListCount)) / totalNum) > percent)
{
percent = (int)(100 * (rowIndex + punishCount * 2 + cmListCount + conListCount) / totalNum);
percent = (int)(100 * (rowIndex + punishCount + cmListCount + conListCount) / totalNum);
}
rowIndex++;
}
@ -2332,9 +2332,9 @@ namespace FineUIPro.Web.Evaluation
wssafe.GetRow(rowIndex).GetCell(20).CellStyle = styleQfw;
#endregion
if ((int)((90 * (rowIndex + punishCount * 2 + cmListCount + conListCount + overviewCount)) / totalNum) > percent)
if ((int)((90 * (rowIndex + punishCount + cmListCount + conListCount + overviewCount)) / totalNum) > percent)
{
percent = (int)(100 * (rowIndex + punishCount * 2 + cmListCount + conListCount + overviewCount) / totalNum);
percent = (int)(100 * (rowIndex + punishCount + cmListCount + conListCount + overviewCount) / totalNum);
}
rowIndex++;
}
@ -2402,9 +2402,9 @@ namespace FineUIPro.Web.Evaluation
}
}
#endregion
if ((int)((90 * (rowEvalIndex + punishCount * 2 + cmListCount + conListCount + overviewCount + safeOverviewCount)) / totalNum) > percent)
if ((int)((90 * (rowEvalIndex + punishCount + cmListCount + conListCount + overviewCount + safeOverviewCount)) / totalNum) > percent)
{
percent = (int)(100 * (rowEvalIndex + punishCount * 2 + cmListCount + conListCount + overviewCount + safeOverviewCount) / totalNum);
percent = (int)(100 * (rowEvalIndex + punishCount + cmListCount + conListCount + overviewCount + safeOverviewCount) / totalNum);
}
rowEvalIndex++;
}
@ -2412,7 +2412,7 @@ namespace FineUIPro.Web.Evaluation
#endregion
ws.ForceFormulaRecalculation = true;
ws4.ForceFormulaRecalculation = true;
//ws4.ForceFormulaRecalculation = true;
wsCm.ForceFormulaRecalculation = true;
wss.ForceFormulaRecalculation = true;
wssafe.ForceFormulaRecalculation = true;
@ -2438,7 +2438,7 @@ namespace FineUIPro.Web.Evaluation
int conListCount = conList.Count();
int overviewCount = OverviewReport.Count;
int safeOverviewCount = safeOverviewReport.Count;
int totalNum = punishCount * 2 + cmListCount + conListCount + overviewCount + safeOverviewCount + noEvaluatedUser.Count;
int totalNum = punishCount + cmListCount + conListCount + overviewCount + safeOverviewCount + noEvaluatedUser.Count;
#region
string rootPath = Server.MapPath("~/") + Const.ExcelUrl;
//模板文件
@ -2580,81 +2580,81 @@ namespace FineUIPro.Web.Evaluation
}
#endregion
#region punish_C4
XSSFSheet ws4 = (XSSFSheet)hssfworkbook.GetSheet("Violation and Handling（C4）");
if (punishCount > 0)
{
var rowIndex = 1;
foreach (var p in punishList)
{
if (ws4.GetRow(rowIndex) == null) ws4.CreateRow(rowIndex);
if (ws4.GetRow(rowIndex).GetCell(0) == null) ws4.GetRow(rowIndex).CreateCell(0);
if (ws4.GetRow(rowIndex).GetCell(1) == null) ws4.GetRow(rowIndex).CreateCell(1);
if (p.PunishDate != null)
{
ws4.GetRow(rowIndex).GetCell(0).SetCellValue(p.PunishDate.Value.ToString("yyyy/MM/dd"));
ws4.GetRow(rowIndex).GetCell(1).SetCellValue(p.PunishDate.Value.ToString("HH:mm"));
}
else
{
ws4.GetRow(rowIndex).GetCell(0).SetCellValue("");
ws4.GetRow(rowIndex).GetCell(1).SetCellValue("");
}
#region punish_C4 删除了
//XSSFSheet ws4 = (XSSFSheet)hssfworkbook.GetSheet("Violation and Handling（C4）");
//if (punishCount > 0)
//{
// var rowIndex = 1;
// foreach (var p in punishList)
// {
// if (ws4.GetRow(rowIndex) == null) ws4.CreateRow(rowIndex);
// if (ws4.GetRow(rowIndex).GetCell(0) == null) ws4.GetRow(rowIndex).CreateCell(0);
// if (ws4.GetRow(rowIndex).GetCell(1) == null) ws4.GetRow(rowIndex).CreateCell(1);
// if (p.PunishDate != null)
// {
// ws4.GetRow(rowIndex).GetCell(0).SetCellValue(p.PunishDate.Value.ToString("yyyy/MM/dd"));
// ws4.GetRow(rowIndex).GetCell(1).SetCellValue(p.PunishDate.Value.ToString("HH:mm"));
// }
// else
// {
// ws4.GetRow(rowIndex).GetCell(0).SetCellValue("");
// ws4.GetRow(rowIndex).GetCell(1).SetCellValue("");
// }
if (ws4.GetRow(rowIndex).GetCell(2) == null) ws4.GetRow(rowIndex).CreateCell(2);
ws4.GetRow(rowIndex).GetCell(2).SetCellValue(p.FO_NO);
if (ws4.GetRow(rowIndex).GetCell(3) == null) ws4.GetRow(rowIndex).CreateCell(3);
ws4.GetRow(rowIndex).GetCell(3).SetCellValue(p.ViolationRelatedSes);
if (ws4.GetRow(rowIndex).GetCell(4) == null) ws4.GetRow(rowIndex).CreateCell(4);
ws4.GetRow(rowIndex).GetCell(4).SetCellValue(p.Discipline);
if (ws4.GetRow(rowIndex).GetCell(5) == null) ws4.GetRow(rowIndex).CreateCell(5);
ws4.GetRow(rowIndex).GetCell(5).SetCellValue(p.DisciplineCN);
if (ws4.GetRow(rowIndex).GetCell(6) == null) ws4.GetRow(rowIndex).CreateCell(6);
ws4.GetRow(rowIndex).GetCell(6).SetCellValue(p.DisciplineEn);
if (ws4.GetRow(rowIndex).GetCell(7) == null) ws4.GetRow(rowIndex).CreateCell(7);
ws4.GetRow(rowIndex).GetCell(7).SetCellValue(p.Contractor);
if (ws4.GetRow(rowIndex).GetCell(8) == null) ws4.GetRow(rowIndex).CreateCell(8);
ws4.GetRow(rowIndex).GetCell(8).SetCellValue(p.ContractorCN);
if (ws4.GetRow(rowIndex).GetCell(9) == null) ws4.GetRow(rowIndex).CreateCell(9);
ws4.GetRow(rowIndex).GetCell(9).SetCellValue(p.ContractorEn);
if (ws4.GetRow(rowIndex).GetCell(10) == null) ws4.GetRow(rowIndex).CreateCell(10);
ws4.GetRow(rowIndex).GetCell(10).SetCellValue(p.Location);
if (ws4.GetRow(rowIndex).GetCell(11) == null) ws4.GetRow(rowIndex).CreateCell(11);
ws4.GetRow(rowIndex).GetCell(11).SetCellValue(p.Description);
// if (ws4.GetRow(rowIndex).GetCell(2) == null) ws4.GetRow(rowIndex).CreateCell(2);
// ws4.GetRow(rowIndex).GetCell(2).SetCellValue(p.FO_NO);
// if (ws4.GetRow(rowIndex).GetCell(3) == null) ws4.GetRow(rowIndex).CreateCell(3);
// ws4.GetRow(rowIndex).GetCell(3).SetCellValue(p.ViolationRelatedSes);
// if (ws4.GetRow(rowIndex).GetCell(4) == null) ws4.GetRow(rowIndex).CreateCell(4);
// ws4.GetRow(rowIndex).GetCell(4).SetCellValue(p.Discipline);
// if (ws4.GetRow(rowIndex).GetCell(5) == null) ws4.GetRow(rowIndex).CreateCell(5);
// ws4.GetRow(rowIndex).GetCell(5).SetCellValue(p.DisciplineCN);
// if (ws4.GetRow(rowIndex).GetCell(6) == null) ws4.GetRow(rowIndex).CreateCell(6);
// ws4.GetRow(rowIndex).GetCell(6).SetCellValue(p.DisciplineEn);
// if (ws4.GetRow(rowIndex).GetCell(7) == null) ws4.GetRow(rowIndex).CreateCell(7);
// ws4.GetRow(rowIndex).GetCell(7).SetCellValue(p.Contractor);
// if (ws4.GetRow(rowIndex).GetCell(8) == null) ws4.GetRow(rowIndex).CreateCell(8);
// ws4.GetRow(rowIndex).GetCell(8).SetCellValue(p.ContractorCN);
// if (ws4.GetRow(rowIndex).GetCell(9) == null) ws4.GetRow(rowIndex).CreateCell(9);
// ws4.GetRow(rowIndex).GetCell(9).SetCellValue(p.ContractorEn);
// if (ws4.GetRow(rowIndex).GetCell(10) == null) ws4.GetRow(rowIndex).CreateCell(10);
// ws4.GetRow(rowIndex).GetCell(10).SetCellValue(p.Location);
// if (ws4.GetRow(rowIndex).GetCell(11) == null) ws4.GetRow(rowIndex).CreateCell(11);
// ws4.GetRow(rowIndex).GetCell(11).SetCellValue(p.Description);
if (ws4.GetRow(rowIndex).GetCell(12) == null) ws4.GetRow(rowIndex).CreateCell(12);
ws4.GetRow(rowIndex).GetCell(12).SetCellValue(p.ViolationDegree);
if (ws4.GetRow(rowIndex).GetCell(13) == null) ws4.GetRow(rowIndex).CreateCell(13);
ws4.GetRow(rowIndex).GetCell(13).SetCellValue(p.Contract_Admin);
if (ws4.GetRow(rowIndex).GetCell(14) == null) ws4.GetRow(rowIndex).CreateCell(14);
ws4.GetRow(rowIndex).GetCell(14).SetCellValue(p.Main_Coordinator);
if (ws4.GetRow(rowIndex).GetCell(15) == null) ws4.GetRow(rowIndex).CreateCell(15);
ws4.GetRow(rowIndex).GetCell(15).SetCellValue(p.MCDept);
if (ws4.GetRow(rowIndex).GetCell(16) == null) ws4.GetRow(rowIndex).CreateCell(16);
ws4.GetRow(rowIndex).GetCell(16).SetCellValue(p.User_Representative);
if (ws4.GetRow(rowIndex).GetCell(17) == null) ws4.GetRow(rowIndex).CreateCell(17);
ws4.GetRow(rowIndex).GetCell(17).SetCellValue(p.BYCRU);
// if (ws4.GetRow(rowIndex).GetCell(12) == null) ws4.GetRow(rowIndex).CreateCell(12);
// ws4.GetRow(rowIndex).GetCell(12).SetCellValue(p.ViolationDegree);
// if (ws4.GetRow(rowIndex).GetCell(13) == null) ws4.GetRow(rowIndex).CreateCell(13);
// ws4.GetRow(rowIndex).GetCell(13).SetCellValue(p.Contract_Admin);
// if (ws4.GetRow(rowIndex).GetCell(14) == null) ws4.GetRow(rowIndex).CreateCell(14);
// ws4.GetRow(rowIndex).GetCell(14).SetCellValue(p.Main_Coordinator);
// if (ws4.GetRow(rowIndex).GetCell(15) == null) ws4.GetRow(rowIndex).CreateCell(15);
// ws4.GetRow(rowIndex).GetCell(15).SetCellValue(p.MCDept);
// if (ws4.GetRow(rowIndex).GetCell(16) == null) ws4.GetRow(rowIndex).CreateCell(16);
// ws4.GetRow(rowIndex).GetCell(16).SetCellValue(p.User_Representative);
// if (ws4.GetRow(rowIndex).GetCell(17) == null) ws4.GetRow(rowIndex).CreateCell(17);
// ws4.GetRow(rowIndex).GetCell(17).SetCellValue(p.BYCRU);
if (ws4.GetRow(rowIndex).GetCell(18) == null) ws4.GetRow(rowIndex).CreateCell(18);
ws4.GetRow(rowIndex).GetCell(18).SetCellValue(p.Violation_Inspector_Name);
if (ws4.GetRow(rowIndex).GetCell(19) == null) ws4.GetRow(rowIndex).CreateCell(19);
ws4.GetRow(rowIndex).GetCell(19).SetCellValue(p.InspectionDep);
if (ws4.GetRow(rowIndex).GetCell(20) == null) ws4.GetRow(rowIndex).CreateCell(20);
ws4.GetRow(rowIndex).GetCell(20).SetCellValue(p.SES_No);
if (ws4.GetRow(rowIndex).GetCell(21) == null) ws4.GetRow(rowIndex).CreateCell(21);
ws4.GetRow(rowIndex).GetCell(21).SetCellValue(p.CompletionDate != null ? p.CompletionDate.Value.ToString("yyyy/MM/dd") : "");
// if (ws4.GetRow(rowIndex).GetCell(18) == null) ws4.GetRow(rowIndex).CreateCell(18);
// ws4.GetRow(rowIndex).GetCell(18).SetCellValue(p.Violation_Inspector_Name);
// if (ws4.GetRow(rowIndex).GetCell(19) == null) ws4.GetRow(rowIndex).CreateCell(19);
// ws4.GetRow(rowIndex).GetCell(19).SetCellValue(p.InspectionDep);
// if (ws4.GetRow(rowIndex).GetCell(20) == null) ws4.GetRow(rowIndex).CreateCell(20);
// ws4.GetRow(rowIndex).GetCell(20).SetCellValue(p.SES_No);
// if (ws4.GetRow(rowIndex).GetCell(21) == null) ws4.GetRow(rowIndex).CreateCell(21);
// ws4.GetRow(rowIndex).GetCell(21).SetCellValue(p.CompletionDate != null ? p.CompletionDate.Value.ToString("yyyy/MM/dd") : "");
if ((int)((90 * (rowIndex + punishCount)) / totalNum) > percent)
{
percent = (int)(100 * (rowIndex + punishCount) / totalNum);
}
rowIndex++;
}
}
// if ((int)((90 * (rowIndex + punishCount)) / totalNum) > percent)
// {
// percent = (int)(100 * (rowIndex + punishCount) / totalNum);
// }
// rowIndex++;
// }
//}
#endregion
#region 约谈，NCR，合同终止
XSSFSheet wsCm = (XSSFSheet)hssfworkbook.GetSheet("约谈，NCR，合同终止");
#region 约谈，NCR，合同终止 改为C4了
XSSFSheet wsCm = (XSSFSheet)hssfworkbook.GetSheet("Violation and Handling（C4）");
if (cmListCount > 0)
{
var rowIndex = 1;
@ -2692,9 +2692,9 @@ namespace FineUIPro.Web.Evaluation
if (wsCm.GetRow(rowIndex).GetCell(14) == null) wsCm.GetRow(rowIndex).CreateCell(14);
wsCm.GetRow(rowIndex).GetCell(14).SetCellValue(p.BycDept);
if ((int)((90 * (rowIndex + punishCount * 2)) / totalNum) > percent)
if ((int)((90 * (rowIndex + punishCount)) / totalNum) > percent)
{
percent = (int)(100 * (rowIndex + punishCount * 2) / totalNum);
percent = (int)(100 * (rowIndex + punishCount) / totalNum);
}
rowIndex++;
}
@ -2718,9 +2718,9 @@ namespace FineUIPro.Web.Evaluation
if (wsCon.GetRow(rowIndex).GetCell(3) == null) wsCon.GetRow(rowIndex).CreateCell(3);
wsCon.GetRow(rowIndex).GetCell(3).SetCellValue(p.Expire_Date != null ? p.Expire_Date.Value.ToString("yyyy/MM/dd") : "");
if ((int)((90 * (rowIndex + punishCount * 2 + cmListCount)) / totalNum) > percent)
if ((int)((90 * (rowIndex + punishCount + cmListCount)) / totalNum) > percent)
{
percent = (int)(100 * (rowIndex + punishCount * 2 + cmListCount) / totalNum);
percent = (int)(100 * (rowIndex + punishCount + cmListCount) / totalNum);
}
rowIndex++;
}
@ -2826,9 +2826,9 @@ namespace FineUIPro.Web.Evaluation
wss.GetRow(rowIndex).GetCell(21).CellStyle = styleQfw;
#endregion
if ((int)((90 * (rowIndex + punishCount * 2 + cmListCount + conListCount)) / totalNum) > percent)
if ((int)((90 * (rowIndex + punishCount + cmListCount + conListCount)) / totalNum) > percent)
{
percent = (int)(100 * (rowIndex + punishCount * 2 + cmListCount + conListCount) / totalNum);
percent = (int)(100 * (rowIndex + punishCount + cmListCount + conListCount) / totalNum);
}
rowIndex++;
}
@ -2932,9 +2932,9 @@ namespace FineUIPro.Web.Evaluation
wssafe.GetRow(rowIndex).GetCell(20).CellStyle = styleQfw;
#endregion
if ((int)((90 * (rowIndex + punishCount * 2 + cmListCount + conListCount + overviewCount)) / totalNum) > percent)
if ((int)((90 * (rowIndex + punishCount + cmListCount + conListCount + overviewCount)) / totalNum) > percent)
{
percent = (int)(100 * (rowIndex + punishCount * 2 + cmListCount + conListCount + overviewCount) / totalNum);
percent = (int)(100 * (rowIndex + punishCount + cmListCount + conListCount + overviewCount) / totalNum);
}
rowIndex++;
}
@ -3002,9 +3002,9 @@ namespace FineUIPro.Web.Evaluation
}
}
#endregion
if ((int)((90 * (rowEvalIndex + punishCount * 2 + cmListCount + conListCount + overviewCount + safeOverviewCount)) / totalNum) > percent)
if ((int)((90 * (rowEvalIndex + punishCount + cmListCount + conListCount + overviewCount + safeOverviewCount)) / totalNum) > percent)
{
percent = (int)(100 * (rowEvalIndex + punishCount * 2 + cmListCount + conListCount + overviewCount + safeOverviewCount) / totalNum);
percent = (int)(100 * (rowEvalIndex + punishCount + cmListCount + conListCount + overviewCount + safeOverviewCount) / totalNum);
}
rowEvalIndex++;
}
@ -3012,7 +3012,7 @@ namespace FineUIPro.Web.Evaluation
#endregion
ws.ForceFormulaRecalculation = true;
ws4.ForceFormulaRecalculation = true;
//ws4.ForceFormulaRecalculation = true;
wsCm.ForceFormulaRecalculation = true;
wss.ForceFormulaRecalculation = true;
wssafe.ForceFormulaRecalculation = true;

BIN
FCL/FineUIPro.Web/File/Excel/20240515025748/Performance Report_CN20240515025748.xlsx Normal file
View File

Binary file not shown.

BIN
FCL/FineUIPro.Web/File/Excel/Performance Report_CN.xlsx
View File

Binary file not shown.

BIN
FCL/FineUIPro.Web/File/Excel/Performance Report_CN1.xlsx Normal file
View File

Binary file not shown.

BIN
FCL/FineUIPro.Web/File/Excel/Performance Report_EN.xlsx
View File

Binary file not shown.

BIN
FCL/FineUIPro.Web/File/Excel/Performance Report_EN1.xlsx Normal file
View File

Binary file not shown.

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

Binary file not shown.

BIN
FCL/FineUIPro.Web/File/Excel/承包商评估表.xlsx
View File

Binary file not shown.

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

@ -12,7 +12,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FineUIPro.Web</RootNamespace>
<AssemblyName>FineUIPro.Web</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<UseIISExpress>true</UseIISExpress>
<SccProjectName>
</SccProjectName>
@ -2572,6 +2572,7 @@
<Content Include="File\Excel\SES ReportToCPT.xlsx" />
<Content Include="File\Excel\EvaluationReport.xls" />
<Content Include="File\Excel\CPTReport.xlsx" />
<Content Include="File\Excel\承包商评估表.xlsx" />
<None Include="packages.config" />
<Content Include="LogOff.aspx" />
<Content Include="ntko.js" />
@ -2606,17 +2607,6 @@
<Content Include="Report\FCLDS.xss">
<DependentUpon>FCLDS.xsd</DependentUpon>
</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\iconfont.eot" />
<Content Include="res\index\css\font\iconfont.ttf" />
@ -3177,9 +3167,6 @@
<Compile Include="Report\ReportPrint.aspx.designer.cs">
<DependentUpon>ReportPrint.aspx</DependentUpon>
</Compile>
<Compile Include="Report\ScoreDataSet.cs">
<DependentUpon>ScoreDataSet.xsd</DependentUpon>
</Compile>
<Compile Include="Report\ScoreDataSet.Designer.cs" />
<Compile Include="Scripts\index.aspx.cs">
<DependentUpon>index.aspx</DependentUpon>

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

@ -14,6 +14,7 @@
using BLL.Common;
using FineUIPro.Web.common;
using Model;
using NPOI.SS.Formula.Functions;
public class Global : System.Web.HttpApplication
{
@ -24,6 +25,7 @@
protected void Application_Start(object sender, EventArgs e)
{
Application["OnlineUserCount"] = 0;
try
{
@ -111,7 +113,6 @@
upTimer.Interval = 1000 * 60 * 60;
upTimer.Enabled = true;
upTimer.Start();
}
// 承包商资质提前3个过期提示
@ -147,6 +148,28 @@
aTimer.Start();
}
// 承包商EHSS违规关联SES号的填写通知
if (DateTime.Now.Hour == 10)
{
System.Timers.Timer aTimer = new System.Timers.Timer();
aTimer.Elapsed += new System.Timers.ElapsedEventHandler(RelatedSes_EmailSend);
//60分钟执行一次
aTimer.Interval = 1000 * 3 * 60 * 60;
aTimer.Enabled = true;
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)
@ -804,6 +827,7 @@
}
}
#region 框架合同评估表填写通知
private void aTimer_FC_AutoSend(object sender, System.Timers.ElapsedEventArgs e)
{
// 过期提示,30天范围
@ -866,17 +890,17 @@
userList.Add(userRepresentative.First());
}
var ctk = from x in Funs.DB.Sys_User
join z in Funs.DB.Base_Depart on x.DepartId equals z.DepartId
where z.DepartCode == "CT/K" && x.Email != null && x.Email != ""
select x;
if (ctk.Count() > 0)
{
foreach (var c in ctk)
{
userList.Add(c);
}
}
//var ctk = from x in Funs.DB.Sys_User
// join z in Funs.DB.Base_Depart on x.DepartId equals z.DepartId
// where z.DepartCode == "CT/K" && x.Email != null && x.Email != ""
// select x;
//if (ctk.Count() > 0)
//{
// foreach (var c in ctk)
// {
// userList.Add(c);
// }
//}
var ctss = from x in Funs.DB.Sys_User
join y in Funs.DB.Sys_Role on x.RoleId equals y.RoleId
@ -921,6 +945,7 @@
}
}
}
#endregion
/// <summary>
/// 发送邮件
@ -1385,6 +1410,87 @@
BLL.SQLHelper.ExecutSql(strSql);
}
#region 承包商EHSS违规关联SES号的填写通知
private void RelatedSes_EmailSend(object sender, System.Timers.ElapsedEventArgs e)
{
var vses = (from x in Funs.DB.EMC_Punishment
where (x.RelatedSesMailIsSend == null || x.RelatedSesMailIsSend == false)
&& x.BYC_RU != null && x.BYC_RU.ToUpper() != "NA"
&& x.CreateDate.HasValue && x.CreateDate.Value.AddDays(1).Date <= DateTime.Now.Date
select x).ToList();
if (vses.Count() > 0)
{
Model.EmailPop pops = Funs.DB.EmailPop.FirstOrDefault(x => x.EmailID == BLL.Const.EmailPopId);
if (pops == null)
{
return;
}
foreach (var ses in vses)
{
string[] mailTo = null;
string[] mailCC = null;
string resultMessage = "";
var emailTemplate = Funs.DB.SendEmailTemplate.Where(x => x.EmailName.Contains("承包商EHSS违规关联SES号的填写通知"));
if (emailTemplate.Count() > 0)
{
var dep = BLL.DepartService.GetDepartById(ses.BYC_RU);
if (dep != null && !string.IsNullOrEmpty(dep.DepartLeader))
{
var userTo = from x in Funs.DB.Sys_User
where x.UserId == dep.DepartLeader
&& x.Email != null && x.Email != ""
select x;
if (userTo != null)
{
mailTo = userTo.Select(x => x.Email).ToArray();
}
string contractor = string.Empty;
var fo = BLL.SESRelatedDataService.GetSESRelatedDataByFoNo(ses.FO_NO);
if (fo != null)
{
var userCC = from x in Funs.DB.Sys_User
where (x.UserId == fo.Contract_Admin || x.UserId == fo.Main_Coordinator)
&& x.Email != null && x.Email != ""
select x;
mailCC = userCC.Select(x => x.Email).Distinct().ToArray();
var con = Funs.DB.View_Contractor_DropDownValue.FirstOrDefault(x => x.ContractorId == fo.Contractor);
if (con != null)
{
contractor = con.Contractor;
}
}
if (mailTo.Length > 0)
{
NameValueCollection myPram = new NameValueCollection();
myPram.Add("ContractNo", fo.FO_NO);
myPram.Add("Contractor", contractor);
bool result = MailHelper.SendPunishSesMail(pops, myPram, "承包商EHSS违规关联SES号的填写通知", mailTo, mailCC, out resultMessage);
if (result)
{
ses.RelatedSesMailIsSend = true;
Funs.DB.SubmitChanges();
}
}
}
}
}
}
}
#endregion
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)
{
Session.Timeout = 120;
@ -1475,9 +1581,17 @@
}
// 回收时调用接口
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)
//{
// //成功
//}
}
}
}

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

@ -99,6 +99,9 @@
<f:RenderField Width="120px" ColumnID="BYCRU" DataField="BYCRU"
FieldType="String" HeaderText="BYC Resp. Dept." HeaderTextAlign="Center">
</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"
FieldType="String" HeaderText="Violation </br>Inspector" HeaderTextAlign="Center">
</f:RenderField>
@ -112,9 +115,12 @@
<f:RenderField Width="130px" ColumnID="CompletionDate" DataField="CompletionDate"
FieldType="Date" Renderer="Date" HeaderText="Backcharge</br>Completion Date" HeaderTextAlign="Center">
</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">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="EmailIsSend" DataField="EmailIsSend"
FieldType="String" HeaderText="If send mail" HeaderTextAlign="Center">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@ -138,7 +144,7 @@
</f:Panel>
<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"
Width="960px" Height="630px">
Width="960px" Height="660px">
</f:Window>
<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)
{
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.PunishDate.Value.Year + x.PunishDate.Value.Month) == (DateTime.Now.Year + DateTime.Now.Month)
select x).ToList();
if (pList.Count()>0)
@ -255,10 +255,16 @@ namespace FineUIPro.Web.SES
string mailSubject = TemplateHelper.BulidByFile2(EmailName, myCol1);
result = MailHelper.SendPunishMail(pops, pops.EmailYx, mailTo, mailSubject, mailBody, mailAttch, mailCode, mailPriority, mailCC, pList, out resultMessage);
// 发送成功后写入表中
if (result == true)
{
//p.EmailIsSend = true;
//Funs.DB.SubmitChanges();
foreach (var p in pList)
{
var punish = BLL.PunishmentService.GetPunishmentById(p.PunishmentId);
punish.EmailIsSend = true;
Funs.DB.SubmitChanges();
}
ShowNotify("Email sent successfully!", MessageBoxIcon.Success);
}
else
@ -494,26 +500,40 @@ namespace FineUIPro.Web.SES
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).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式
// Violation Inspector
// BYC Resp Manager
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).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式
// Inspection Department
// Violation Inspector
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).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式
// Backcharge SES No.
// Inspection Department
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).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式
// Backcharge Completion Date
// Backcharge SES No.
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]);
reportModel.GetRow(i).GetCell(19).SetCellValue(cdate.ToString("yyyy/MM/dd"));
reportModel.GetRow(i).GetCell(19).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式
DateTime cdate = Convert.ToDateTime(Grid1.Rows[i - 1].Values[21]);
reportModel.GetRow(i).GetCell(20).SetCellValue(cdate.ToString("yyyy/MM/dd"));
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
}

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

@ -13,7 +13,7 @@
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<f:FormRow >
<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="txtPunishTime" runat="server" Label="Time" LabelAlign="Right" LabelWidth="160px" DateFormatString="HH:mm" DisplayType="Time"></f:DatePicker>
@ -95,25 +95,24 @@
</f:FormRow>
<f:FormRow >
<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>
<f:Form ShowBorder="false" ShowHeader="false" runat="server" LabelAlign="Right" >
<f:Form ShowBorder="false" ShowHeader="false" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow ColumnWidths="50% 50%">
<f:FormRow ColumnWidths="45% 55%">
<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="False" Text="否" />
</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>
</Items>
</f:FormRow>
</Rows>
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="Def" runat="server" Label="描述" LabelWidth="170px" ></f:TextBox>
<f:TextBox ID="txtDef" runat="server" Label="描述" LabelWidth="160px"></f:TextBox>
</Items>
</f:FormRow>
</Rows>

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

@ -36,17 +36,8 @@ namespace FineUIPro.Web.SES
{
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
string view = Request.Params["view"];
if (view == "1")
{
this.btnSave.Hidden = true;
}
else
{
GetButtonPower();//按钮权限
}
var role = BLL.Sys_RoleService.GetRole(CurrUser.RoleId);
if (role != null && role.RoleName == "Contract Administrator")
{
txtSESNo.Required = true;
@ -64,7 +55,7 @@ namespace FineUIPro.Web.SES
// BLL.SESRelatedDataService.InitFONoDropDownList(this.drpFO_No, 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);//违章检查人
txtViolationRelatedSes.Enabled = false;
@ -102,6 +93,16 @@ namespace FineUIPro.Web.SES
txtMainCoordinator.Text = punishment.Main_Coordinator;
txtMCDept.Text = punishment.MCDept;
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))
{
@ -119,17 +120,23 @@ namespace FineUIPro.Web.SES
{
btnSave.Hidden = false;
txtViolationRelatedSes.Enabled = true;
drpSelectYesNo.Enabled = true;
txtDef.Enabled = true;
}
else
{
btnSave.Hidden = true;
txtViolationRelatedSes.Enabled = false;
drpSelectYesNo.Enabled = false;
txtDef.Enabled = false;
}
//if (!string.IsNullOrEmpty(punishment.ViolationRelatedSes))
//{
// SetReadonly(false);
//}
var puList = (from x in Funs.DB.EMC_Punishment where x.Flag == "1" && x.BYC_RU != null && x.BYC_RU != "NA" select x.BYC_RU).Distinct().ToArray();
if (this.CurrUser.DepartId != null && puList.Contains(this.CurrUser.DepartId))
{
drpViolationInspector.Hidden = true;
txtInspectionDep.Hidden = true;
}
this.txtCompletionDate.Text = punishment.CompletionDate != null ? string.Format("{0:yyyy-MM-dd}", punishment.CompletionDate) : "";
this.txtSESNo.Text = punishment.SES_No;
@ -140,6 +147,15 @@ namespace FineUIPro.Web.SES
{
}
if (view == "1")
{
this.btnSave.Hidden = true;
}
else
{
GetButtonPower();//按钮权限
}
}
}
#endregion
@ -186,6 +202,15 @@ namespace FineUIPro.Web.SES
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)
{
PunishmentId = string.Empty;
@ -260,6 +285,14 @@ namespace FineUIPro.Web.SES
{
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.CompletionDate = Funs.GetNewDateTime(this.txtCompletionDate.Text.Trim());
punishment.Flag = "1";
@ -275,53 +308,53 @@ namespace FineUIPro.Web.SES
{
PunishmentId = SQLHelper.GetNewID(typeof(Model.EMC_Punishment));
punishment.PunishmentId = PunishmentId;
punishment.CreateDate = DateTime.Now;
BLL.PunishmentService.AddPunishment(punishment);
#region 增加时发送安全扣款邮件
Model.EmailPop pops = Funs.DB.EmailPop.FirstOrDefault(x => x.EmailID == BLL.Const.EmailPopId);
if (pops == null)
{
return;
}
string[] mailTo = null;
string[] mailCC = null;
string resultMessage = "";
#region 承包商EHSS违规关联SES号的填写通知 改在Golbal里触发
//Model.EmailPop pops = Funs.DB.EmailPop.FirstOrDefault(x => x.EmailID == BLL.Const.EmailPopId);
//if (pops == null)
//{
// return;
//}
//string[] mailTo = null;
//string[] mailCC = null;
//string resultMessage = "";
var emailTemplate = Funs.DB.SendEmailTemplate.Where(x => x.EmailName.Contains("承包商EHSS违规关联SES号的填写通知"));
if (emailTemplate.Count() > 0)
{
var dep = BLL.DepartService.GetDepartById(drpBYC_RU.SelectedValue);
if (dep != null && !string.IsNullOrEmpty(dep.DepartLeader))
{
var userTo = from x in Funs.DB.Sys_User
where x.UserId == dep.DepartLeader
&& x.Email != null && x.Email != ""
select x;
if (userTo != null)
{
mailTo= userTo.Select(x => x.Email).ToArray();
}
//var emailTemplate = Funs.DB.SendEmailTemplate.Where(x => x.EmailName.Contains("承包商EHSS违规关联SES号的填写通知"));
//if (emailTemplate.Count() > 0)
//{
// var dep = BLL.DepartService.GetDepartById(drpBYC_RU.SelectedValue);
// if (dep != null && !string.IsNullOrEmpty(dep.DepartLeader))
// {
// var userTo = from x in Funs.DB.Sys_User
// where x.UserId == dep.DepartLeader
// && x.Email != null && x.Email != ""
// select x;
// if (userTo != null)
// {
// mailTo= userTo.Select(x => x.Email).ToArray();
// }
var fo = BLL.SESRelatedDataService.GetSESRelatedDataByFoNo(drpFO_No.SelectedValue);
if (fo != null)
{
var userCC = from x in Funs.DB.Sys_User
where (x.UserId == fo.Contract_Admin || x.UserId == fo.Main_Coordinator
|| x.UserId == drpViolationInspector.SelectedValue)
&& x.Email != null && x.Email != ""
select x;
mailCC = userCC.Select(x => x.Email).Distinct().ToArray();
}
// var fo = BLL.SESRelatedDataService.GetSESRelatedDataByFoNo(drpFO_No.SelectedValue);
// if (fo != null)
// {
// var userCC = from x in Funs.DB.Sys_User
// where (x.UserId == fo.Contract_Admin || x.UserId == fo.Main_Coordinator)
// && x.Email != null && x.Email != ""
// select x;
// mailCC = userCC.Select(x => x.Email).Distinct().ToArray();
// }
if (mailTo.Length > 0)
{
NameValueCollection myPram = new NameValueCollection();
myPram.Add("ContractNo", fo.FO_NO);
myPram.Add("Contractor", drpContractor.SelectedText);
MailHelper.SendPunishSesMail(pops, myPram, "承包商EHSS违规关联SES号的填写通知", mailTo, mailCC, out resultMessage);
}
}
}
// if (mailTo.Length > 0)
// {
// NameValueCollection myPram = new NameValueCollection();
// myPram.Add("ContractNo", fo.FO_NO);
// myPram.Add("Contractor", drpContractor.SelectedText);
// MailHelper.SendPunishSesMail(pops, myPram, "承包商EHSS违规关联SES号的填写通知", mailTo, mailCC, out resultMessage);
// }
// }
//}
#endregion
BLL.Sys_LogService.AddLog(this.CurrUser.UserId, "Add Contractor Safety Punishment!");
@ -370,6 +403,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)
{
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>
/// form1 控件。
@ -238,13 +240,13 @@ namespace FineUIPro.Web.SES {
protected global::FineUIPro.GroupPanel GPDep;
/// <summary>
/// SelectYesNo 控件。
/// drpSelectYesNo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList SelectYesNo;
protected global::FineUIPro.DropDownList drpSelectYesNo;
/// <summary>
/// txtViolationRelatedSes 控件。
@ -256,13 +258,13 @@ namespace FineUIPro.Web.SES {
protected global::FineUIPro.TextBox txtViolationRelatedSes;
/// <summary>
/// Def 控件。
/// txtDef 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox Def;
protected global::FineUIPro.TextBox txtDef;
/// <summary>
/// Toolbar1 控件。

30
FCL/FineUIPro.Web/Web.Debug.config Normal file
View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 有关使用 web.config 转换的详细信息，请访问 http://go.microsoft.com/fwlink/?LinkId=125889 -->
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<!--
在下例中，“SetAttributes”转换将更改
“connectionString”的值，仅在“Match”定位器
查找到值为“MyDB”的特性“name”时使用“ReleaseSQLServer”。
<connectionStrings>
<add name="MyDB"
connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True"
xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
</connectionStrings>
-->
<system.web>
<!--
在下例中，“Replace”转换将替换
web.config 文件的整个 <customErrors> 节。
请注意，由于
在 <system.web> 节点下仅有一个 customErrors 节，因此不需要使用“xdt:Locator”特性。
<customErrors defaultRedirect="GenericError.htm"
mode="RemoteOnly" xdt:Transform="Replace">
<error statusCode="500" redirect="InternalError.htm"/>
</customErrors>
-->
</system.web>
</configuration>

31
FCL/FineUIPro.Web/Web.Release.config Normal file
View File

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 有关使用 web.config 转换的详细信息，请访问 http://go.microsoft.com/fwlink/?LinkId=125889 -->
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<!--
在下例中，“SetAttributes”转换将更改
“connectionString”的值，仅在“Match”定位器
查找到值为“MyDB”的特性“name”时使用“ReleaseSQLServer”。
<connectionStrings>
<add name="MyDB"
connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True"
xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
</connectionStrings>
-->
<system.web>
<compilation xdt:Transform="RemoveAttributes(debug)" />
<!--
在下例中，“Replace”转换将替换
web.config 文件的整个 <customErrors> 节。
请注意，由于
在 <system.web> 节点下仅有一个 customErrors 节，因此不需要使用“xdt:Locator”特性。
<customErrors defaultRedirect="GenericError.htm"
mode="RemoteOnly" xdt:Transform="Replace">
<error statusCode="500" redirect="InternalError.htm"/>
</customErrors>
-->
</system.web>
</configuration>

142
FCL/FineUIPro.Web/Web.config Normal file
View File

@ -0,0 +1,142 @@
<?xml version="1.0"?>
<!--
有关如何配置 ASP.NET 应用程序的详细消息，请访问
http://go.microsoft.com/fwlink/?LinkId=169433
-->
<configuration>
<configSections>
<section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
</configSections>
<connectionStrings>
<add name="FCLDBConnectionString" connectionString="Data Source=.\SQL2016;Initial Catalog=FCLDB;uid=sa;pwd=1111;" providerName="System.Data.SqlClient"/>
</connectionStrings>
<FineUIPro DebugMode="false" CustomTheme="Metro_Dark_Blue" EnableAnimation="true" JSLibrary="All"/>
<appSettings>
<!--连接字符串-->
<!--<add key="ConnectionString" value="Server=.;Database=FCLDB;Integrated Security=False; User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>-->
<!--系统名称-->
<add key="SystemName" value="FC"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
<add key="aspnet:MaxHttpCollectionKeys" value="50000"/>
<add key="Https" value="false"/>
<add key="mailSmtpServer" value="smtp.163.com"/>
<add key="MailServerFrom" value="hfnbd_test@163.com"/>
<add key="MailServerpassword" value="hfnbd123456"/>
<add key="MailServeruserName" value="hfnbd"/>
<!--<add key="Serial" value="7e00000004870a85c98afc0a2d000000000004"/>-->
</appSettings>
<!--
有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
可在 <httpRuntime> 标记上设置以下特性。
<system.Web>
<httpRuntime targetFramework="4.6.1" />
</system.Web>
-->
<system.web>
<!-- 会话状态设置 默认情况下，ASP.NET 使用 Cookie 来标识哪些请求属于特定的会话。如果 Cookie 不可用，则可以通过将会话标识符添加到 URL 来跟踪会话。若要禁用 Cookie，请设置 sessionState cookieless="true" -->
<sessionState mode="InProc" cookieless="UseCookies" timeout="1200"/>
<!--<processModel enable="true" requestQueueLimit="100000"/>-->
<pages controlRenderingCompatibilityVersion="4.0" clientIDMode="AutoID" viewStateEncryptionMode="Always">
<controls>
<add tagPrefix="f" namespace="FineUIPro" assembly="FineUIPro"/>
<add tagPrefix="asp" namespace="System.Web.UI.DataVisualization.Charting" assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
</controls>
</pages>
<httpModules>
<add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro"/>
</httpModules>
<httpHandlers>
<add path="res.axd" verb="GET" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
</httpHandlers>
<compilation debug="true" targetFramework="4.8">
<buildProviders>
<add extension=".rdlc" type="Microsoft.Reporting.RdlBuildProvider, Microsoft.ReportViewer.WebForms, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
</buildProviders>
</compilation>
<!--requestPathInvalidCharacters=""-->
<httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
<authentication mode="Forms">
<forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>
</authentication>
<membership>
<providers>
<clear/>
<add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="ApplicationServices" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="/"/>
</providers>
</membership>
<profile>
<providers>
<clear/>
<add name="AspNetSqlProfileProvider" type="System.Web.Profile.SqlProfileProvider" connectionStringName="ApplicationServices" applicationName="/"/>
</providers>
</profile>
<roleManager enabled="false">
<providers>
<clear/>
<add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="ApplicationServices" applicationName="/"/>
<add name="AspNetWindowsTokenRoleProvider" type="System.Web.Security.WindowsTokenRoleProvider" applicationName="/"/>
</providers>
</roleManager>
<customErrors defaultRedirect="LogOff.aspx" mode="RemoteOnly">
<error redirect="https://localhost/FCL/OperationError.aspx" statusCode="404"/>
</customErrors>
<!--Unencrypted __VIEWSTATE parameter，viewstate 保存没有加密，解决方法-->
<machineKey validation="3DES"/>
<!--Body Parameters Accepted in Query:https才能访问-->
<!--<httpCookies httpOnlyCookies="true" requireSSL="true"/>-->
</system.web>
<location path="res.axd"/>
<system.webServer>
<staticContent>
<mimeMap fileExtension=".dat" mimeType="application/ChinaExcel Report File"/>
<mimeMap fileExtension=".tab" mimeType="application/ChinaExcel Report File"/>
</staticContent>
<httpProtocol>
<customHeaders>
<!--<add name="Content-Security-Policy" value="default-src 'self'"/>-->
<remove name="X-Powered-By"/>
<!-- SAMEORIGIN表示该页面可以在相同域名页面的 frame 中展示 -->
<add name="X-XSS-Protection" value="1;mode=block"/>
<add name="X-Frame-Options" value="SAMEORIGIN"/>
<add name="X-Content-Type-Options" value="nosniff"/>
<add name="Strict-Transport-Security" value="max-age=31536000"/>
</customHeaders>
</httpProtocol>
<validation validateIntegratedModeConfiguration="false"/>
<modules runAllManagedModulesForAllRequests="true">
<add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro"/>
<remove name="ScriptModule"/>
<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
</modules>
<handlers>
<remove name="ChartImageHandler"/>
<add name="FineUIProResourceHandler" verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro"/>
<add name="ChartImageHandler" preCondition="integratedMode" verb="GET,HEAD,POST" path="ChartImg.axd" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
</handlers>
<defaultDocument>
<files>
<add value="Login.aspx"/>
</files>
</defaultDocument>
<httpErrors>
<remove statusCode="403" subStatusCode="-1"/>
<error statusCode="403" prefixLanguageFilePath="https://localhost/FCL/" path="OperationError.aspx" responseMode="File"/>
</httpErrors>
<security>
<requestFiltering>
<requestLimits maxAllowedContentLength="500000000"/>
</requestFiltering>
</security>
</system.webServer>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

4
FCL/FineUIPro.Web/obj/Debug/.NETFramework,Version=v4.6.1.AssemblyAttributes.cs Normal file
View File

@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]

4
FCL/FineUIPro.Web/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs Normal file
View File

@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]

0
FCL/FineUIPro.Web/obj/Debug/FineUIPr.EC1848A9.Up2Date Normal file
View File

210
FCL/Model/Model.cs
View File

@ -9727,6 +9727,14 @@ namespace Model
private string _ViolationRelatedSes;
private System.Nullable<bool> _SelectYesNo;
private string _Def;
private System.Nullable<bool> _RelatedSesMailIsSend;
private System.Nullable<System.DateTime> _CreateDate;
private EntityRef<Base_Depart> _Base_Depart;
private EntityRef<Sys_User> _Sys_User;
@ -9767,6 +9775,14 @@ namespace Model
partial void OnEmailIsSendChanged();
partial void OnViolationRelatedSesChanging(string value);
partial void OnViolationRelatedSesChanged();
partial void OnSelectYesNoChanging(System.Nullable<bool> value);
partial void OnSelectYesNoChanged();
partial void OnDefChanging(string value);
partial void OnDefChanged();
partial void OnRelatedSesMailIsSendChanging(System.Nullable<bool> value);
partial void OnRelatedSesMailIsSendChanged();
partial void OnCreateDateChanging(System.Nullable<System.DateTime> value);
partial void OnCreateDateChanged();
#endregion
public EMC_Punishment()
@ -10104,6 +10120,86 @@ 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.ColumnAttribute(Storage="_RelatedSesMailIsSend", DbType="Bit")]
public System.Nullable<bool> RelatedSesMailIsSend
{
get
{
return this._RelatedSesMailIsSend;
}
set
{
if ((this._RelatedSesMailIsSend != value))
{
this.OnRelatedSesMailIsSendChanging(value);
this.SendPropertyChanging();
this._RelatedSesMailIsSend = value;
this.SendPropertyChanged("RelatedSesMailIsSend");
this.OnRelatedSesMailIsSendChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateDate", DbType="DateTime")]
public System.Nullable<System.DateTime> CreateDate
{
get
{
return this._CreateDate;
}
set
{
if ((this._CreateDate != value))
{
this.OnCreateDateChanging(value);
this.SendPropertyChanging();
this._CreateDate = value;
this.SendPropertyChanged("CreateDate");
this.OnCreateDateChanged();
}
}
}
[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
{
@ -13509,6 +13605,8 @@ namespace Model
private System.Nullable<int> _InquiryNum;
private string _OtherDef;
private EntitySet<FC_ContractManagement> _FC_ContractManagement;
private EntityRef<Base_Contractor> _Base_Contractor;
@ -13677,6 +13775,8 @@ namespace Model
partial void OnIsInquiryChanged();
partial void OnInquiryNumChanging(System.Nullable<int> value);
partial void OnInquiryNumChanged();
partial void OnOtherDefChanging(string value);
partial void OnOtherDefChanged();
#endregion
public FC_SESRelatedData()
@ -15117,6 +15217,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OtherDef", DbType="NVarChar(300)")]
public string OtherDef
{
get
{
return this._OtherDef;
}
set
{
if ((this._OtherDef != value))
{
this.OnOtherDefChanging(value);
this.SendPropertyChanging();
this._OtherDef = value;
this.SendPropertyChanged("OtherDef");
this.OnOtherDefChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_FC_ContractManagement_FC_SESRelatedData", Storage="_FC_ContractManagement", ThisKey="ID", OtherKey="FC_ID", DeleteRule="NO ACTION")]
public EntitySet<FC_ContractManagement> FC_ContractManagement
{
@ -25217,6 +25337,8 @@ namespace Model
private System.Nullable<int> _OthersNum;
private string _OtherDef;
private string _Proposed;
private System.Nullable<decimal> _Total;
@ -25739,6 +25861,22 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OtherDef", DbType="NVarChar(300)")]
public string OtherDef
{
get
{
return this._OtherDef;
}
set
{
if ((this._OtherDef != value))
{
this._OtherDef = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Proposed", DbType="NVarChar(2000)")]
public string Proposed
{
@ -27390,6 +27528,8 @@ namespace Model
private string _BYCRU;
private string _BYCRULeader;
private string _Violation_Inspector_Name;
private string _InspectionDep;
@ -27402,6 +27542,12 @@ namespace Model
private string _Flag;
private System.Nullable<bool> _SelectYesNo;
private string _Def;
private string _EmailIsSend;
public View_EMC_Punishment()
{
}
@ -27806,6 +27952,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)")]
public string Violation_Inspector_Name
{
@ -27901,6 +28063,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")]

2
FCL/Model/Model.csproj
View File

@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Model</RootNamespace>
<AssemblyName>Model</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>

4
FCL/Model/obj/Debug/.NETFramework,Version=v4.6.1.AssemblyAttributes.cs Normal file
View File

@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]

4
FCL/Model/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs Normal file
View File

@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]

10
FCL/WebApi/WebApi.csproj
View File

@ -14,7 +14,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WebApi</RootNamespace>
<AssemblyName>WebApi</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
@ -25,6 +25,7 @@
<UseGlobalApplicationHostFile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -51,13 +52,13 @@
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Abstractions" />
<Reference Include="System.Web.Routing" />
@ -108,6 +109,7 @@
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.4\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="WebGrease">
<Private>True</Private>
<HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>

4
FCL/WebApi/obj/Debug/.NETFramework,Version=v4.6.1.AssemblyAttributes.cs Normal file
View File

@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]

4
FCL/WebApi/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs Normal file
View File

@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]