diff --git a/FCL/BLL/BLL.csproj b/FCL/BLL/BLL.csproj
index 9dccff5..a721c5e 100644
--- a/FCL/BLL/BLL.csproj
+++ b/FCL/BLL/BLL.csproj
@@ -216,6 +216,7 @@
+
diff --git a/FCL/BLL/BaseInfo/ContractorService.cs b/FCL/BLL/BaseInfo/ContractorService.cs
index 2ee9a61..ddaa570 100644
--- a/FCL/BLL/BaseInfo/ContractorService.cs
+++ b/FCL/BLL/BaseInfo/ContractorService.cs
@@ -126,5 +126,32 @@ namespace BLL
Funs.FineUIPleaseSelect(dropName);
}
}
+
+ ///
+ /// 获取中文承包商列表下拉项
+ ///
+ ///
+ ///
+ public static void InitCNDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
+ {
+ dropName.DataValueField = "ContractorId";
+ dropName.DataTextField = "ContractorCN";
+ dropName.DataSource = GetContractorCNList();
+ dropName.DataBind();
+ if (isShowPlease)
+ {
+ Funs.FineUIPleaseSelect(dropName);
+ }
+ }
+
+ ///
+ /// 获取承包商列表
+ ///
+ ///
+ public static List GetContractorCNList()
+ {
+ return (from x in Funs.DB.Base_Contractor orderby x.ContractorCN select x).ToList();
+ }
+
}
}
\ No newline at end of file
diff --git a/FCL/BLL/BaseInfo/DepartService.cs b/FCL/BLL/BaseInfo/DepartService.cs
index 4f26dc0..17d0fe9 100644
--- a/FCL/BLL/BaseInfo/DepartService.cs
+++ b/FCL/BLL/BaseInfo/DepartService.cs
@@ -177,5 +177,15 @@ namespace BLL
{
return (from x in Funs.DB.Base_Depart where x.DepartCode.Contains("/") || x.DepartCode == "NA" || x.DepartCode.ToLower() == "none" orderby x.DepartCode select x).ToList();
}
+
+ ///
+ /// 根据部门领导获取部门信息
+ ///
+ ///
+ ///
+ public static Model.Base_Depart GetDepartByLeader(string departLeader)
+ {
+ return Funs.DB.Base_Depart.FirstOrDefault(e => e.DepartLeader == departLeader);
+ }
}
}
diff --git a/FCL/BLL/Common/Const.cs b/FCL/BLL/Common/Const.cs
index e2b2ea2..b4f1f10 100644
--- a/FCL/BLL/Common/Const.cs
+++ b/FCL/BLL/Common/Const.cs
@@ -189,6 +189,8 @@ namespace BLL
public const string BtnTARSignedView = "TARSignedView";
public const string BtnTARManageView = "TARManageView";
+
+ public const string BtnViewAll = "ViewAll";
#endregion
#endregion
diff --git a/FCL/BLL/SES/PunishmentAuditService.cs b/FCL/BLL/SES/PunishmentAuditService.cs
new file mode 100644
index 0000000..e9f692a
--- /dev/null
+++ b/FCL/BLL/SES/PunishmentAuditService.cs
@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+ ///
+ /// 审批意见
+ ///
+ public class PunishmentAuditService
+ {
+ ///
+ /// 添加
+ ///
+ ///
+ public static void AddPunishmentAudit(Model.EMC_PunishmentAudit audit)
+ {
+ Model.EMC_PunishmentAudit newAudit = new Model.EMC_PunishmentAudit
+ {
+ AuditId = audit.AuditId,
+ PunishmentId = audit.PunishmentId,
+ AuditMan = audit.AuditMan,
+ AuditDate = audit.AuditDate,
+ IsPass = audit.IsPass,
+ AuditResult = audit.AuditResult
+ };
+ Funs.DB.EMC_PunishmentAudit.InsertOnSubmit(newAudit);
+ Funs.DB.SubmitChanges();
+ }
+
+ ///
+ /// 修改
+ ///
+ ///
+ public static void UpdatePunishmentAudit(Model.EMC_PunishmentAudit audit)
+ {
+ Model.EMC_PunishmentAudit newAudit = Funs.DB.EMC_PunishmentAudit.FirstOrDefault(e => e.AuditId == audit.AuditId);
+ if (newAudit != null)
+ {
+ newAudit.AuditMan = audit.AuditMan;
+ newAudit.AuditDate = audit.AuditDate;
+ newAudit.IsPass = audit.IsPass;
+ newAudit.AuditResult = audit.AuditResult;
+ Funs.DB.SubmitChanges();
+ }
+ }
+
+ ///
+ /// 删除
+ ///
+ ///
+ public static void DeletePunishmentAuditByPunishmentId(string punishmentId)
+ {
+ var q = (from x in Funs.DB.EMC_PunishmentAudit where x.PunishmentId == punishmentId select x).ToList();
+ if (q != null)
+ {
+ Funs.DB.EMC_PunishmentAudit.DeleteAllOnSubmit(q);
+ Funs.DB.SubmitChanges();
+ }
+ }
+
+ public static Model.EMC_PunishmentAudit GetAuditBypunishmentIdAndAuditMan(string punishmentId, string auditMan)
+ {
+ return Funs.DB.EMC_PunishmentAudit.FirstOrDefault(e => e.PunishmentId == punishmentId && e.AuditMan == auditMan);
+ }
+
+ public static Model.EMC_PunishmentAudit GetAuditByAuditMan(string punishmentId, string auditMan)
+ {
+ return Funs.DB.EMC_PunishmentAudit.FirstOrDefault(e => e.PunishmentId == punishmentId && e.AuditMan == auditMan && e.AuditDate == null);
+ }
+ }
+}
diff --git a/FCL/BLL/SES/PunishmentService.cs b/FCL/BLL/SES/PunishmentService.cs
index 20a8c2b..f2a80f0 100644
--- a/FCL/BLL/SES/PunishmentService.cs
+++ b/FCL/BLL/SES/PunishmentService.cs
@@ -1,4 +1,5 @@
-using System;
+using NPOI.POIFS.Storage;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -65,6 +66,10 @@ namespace BLL
newPunishment.Requisitioner=punishment.Requisitioner;
newPunishment.AttachUrl = punishment.AttachUrl;
newPunishment.States = punishment.States;
+ newPunishment.MIContractor = punishment.MIContractor;
+ newPunishment.SeType = punishment.SeType;
+ newPunishment.PVTRequester = punishment.PVTRequester;
+ newPunishment.IndividualSESReason = punishment.IndividualSESReason;
Funs.DB.EMC_Punishment.InsertOnSubmit(newPunishment);
Funs.DB.SubmitChanges();
@@ -107,6 +112,10 @@ namespace BLL
newPunishment.ContractAdmin = punishment.ContractAdmin;
newPunishment.IndividualPerson = punishment.IndividualPerson;
newPunishment.UserDep = punishment.UserDep;
+ newPunishment.MIContractor = punishment.MIContractor;
+ newPunishment.SeType = punishment.SeType;
+ newPunishment.PVTRequester = punishment.PVTRequester;
+ newPunishment.IndividualSESReason = punishment.IndividualSESReason;
Funs.DB.SubmitChanges();
}
diff --git a/FCL/FineUIPro.Web/AttachFile/webuploader2.aspx b/FCL/FineUIPro.Web/AttachFile/webuploader2.aspx
index 8f6e22f..553a15f 100644
--- a/FCL/FineUIPro.Web/AttachFile/webuploader2.aspx
+++ b/FCL/FineUIPro.Web/AttachFile/webuploader2.aspx
@@ -88,8 +88,8 @@
owner: '<%= ParamStr%>'
},
- // 单个文件大小限制（单位：byte），这里限制为 10M
- fileSingleSizeLimit: 100 * 1024 * 1024
+ // 单个文件大小限制（单位：byte），这里限制为 20M
+ fileSingleSizeLimit: 20 * 1024 * 1024
});
diff --git a/FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigation.aspx b/FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigation.aspx
index adf331c..a3cf8ba 100644
--- a/FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigation.aspx
+++ b/FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigation.aspx
@@ -5,7 +5,7 @@
- 承包商质量事件调查
+ 承包商及供应商质量事件报告