From f227bbeba29150631fa9cd36ceb4b20015bf47b4 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Mon, 26 Feb 2024 16:45:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SGGLDB_WH_2024-02-26-gaofei.sql | 54 ++ SGGL/BLL/BLL.csproj | 1 + SGGL/BLL/Common/Const.cs | 33 + SGGL/BLL/SysManage/UserService.cs | 12 + .../DriverRun/DriverRunApproveService.cs | 273 +++++++++ .../BLL/TestRun/DriverRun/DriverRunService.cs | 177 +++++- .../File/Excel/TestRun/开车方案编制计划.xlsx | Bin 10691 -> 10750 bytes .../File/Excel/TestRun/开车方案编制计划2.xlsx | Bin 10712 -> 10788 bytes SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 8 + .../TestRun/DriverPrepare/SchemePlan.aspx | 22 + .../TestRun/DriverPrepare/SchemePlan.aspx.cs | 47 +- .../DriverPrepare/SchemePlan.aspx.designer.cs | 36 ++ .../TestRun/DriverRun/DriverRun.aspx | 43 +- .../TestRun/DriverRun/DriverRun.aspx.cs | 118 +++- .../DriverRun/DriverRun.aspx.designer.cs | 27 + .../TestRun/DriverRun/DriverRunContact.aspx | 13 +- .../DriverRun/DriverRunContactEdit.aspx | 4 +- .../TestRun/DriverRun/DriverRunEdit.aspx | 87 ++- .../TestRun/DriverRun/DriverRunEdit.aspx.cs | 317 +++++++++- .../DriverRun/DriverRunEdit.aspx.designer.cs | 130 +++- .../TestRun/DriverRun/DriverRunPlan.aspx | 4 +- .../TestRun/DriverRun/DriverRunView.aspx | 124 ++++ .../TestRun/DriverRun/DriverRunView.aspx.cs | 136 +++++ .../DriverRun/DriverRunView.aspx.designer.cs | 222 +++++++ SGGL/FineUIPro.Web/Web.config | 2 +- SGGL/Model/Model.cs | 574 ++++++++++++++++++ 26 files changed, 2379 insertions(+), 85 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-02-26-gaofei.sql create mode 100644 SGGL/BLL/TestRun/DriverRun/DriverRunApproveService.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunView.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunView.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunView.aspx.designer.cs diff --git a/DataBase/版本日志/SGGLDB_WH_2024-02-26-gaofei.sql b/DataBase/版本日志/SGGLDB_WH_2024-02-26-gaofei.sql new file mode 100644 index 00000000..1855763f --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-02-26-gaofei.sql @@ -0,0 +1,54 @@ +alter table [dbo].[DriverRun_DriverRun] add InstallationId nvarchar(500) null +GO +alter table [dbo].[DriverRun_DriverRun] add InstallationNames nvarchar(500) null +GO +alter table [dbo].[DriverRun_DriverRun] add Objective nvarchar(500) null +GO +alter table [dbo].[DriverRun_DriverRun] add NeedCompletedDate datetime null +GO +alter table [dbo].[DriverRun_DriverRun] add CompileMan nvarchar(50) null +GO +alter table [dbo].[DriverRun_DriverRun] add CompileDate datetime null +GO +alter table [dbo].[DriverRun_DriverRun] add State char(1) null +GO +alter table [dbo].[DriverRun_DriverRun] add RealCompletedDate datetime null +GO +alter table [dbo].[DriverPrepare_SchemePlanItem] add FileCode nvarchar(100) null +GO +alter table [dbo].[DriverPrepare_SchemePlanItem] add CompileMan nvarchar(50) null +GO +alter table [dbo].[DriverPrepare_SchemePlanItem] add PlanCompletedDate datetime null +GO + +CREATE TABLE [dbo].[DriverRun_DriverRunApprove]( + [DriverRunApproveId] [nvarchar](50) NOT NULL, + [DriverRunId] [nvarchar](50) NULL, + [ApproveMan] [nvarchar](50) NULL, + [ApproveDate] [datetime] NULL, + [IsAgree] [bit] NULL, + [ApproveIdea] [nvarchar](200) NULL, + [ApproveType] [char](1) NULL, + [AttachUrl] [nvarchar](200) NULL, + CONSTRAINT [PK_DriverRun_DriverRunApprove] PRIMARY KEY CLUSTERED +( + [DriverRunApproveId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +SET ANSI_PADDING OFF +GO + +ALTER TABLE [dbo].[DriverRun_DriverRunApprove] WITH CHECK ADD CONSTRAINT [FK_DriverRun_DriverRunApprove_DriverRun_DriverRun] FOREIGN KEY([DriverRunId]) +REFERENCES [dbo].[DriverRun_DriverRun] ([DriverRunId]) +GO + +ALTER TABLE [dbo].[DriverRun_DriverRunApprove] CHECK CONSTRAINT [FK_DriverRun_DriverRunApprove_DriverRun_DriverRun] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'˹' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverRun_DriverRunApprove' +GO + + diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index af7de356..a1546ac2 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -744,6 +744,7 @@ + diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index a96ed1c0..07121580 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -4748,6 +4748,39 @@ namespace BLL #endregion + #region 试车流程定义 + #region 开车保运管理流程定义 + /// + /// 编制 + /// + public const string DriverRun_Compile = "1"; + + /// + /// 开车负责人审批 + /// + public static string DriverRun_Audit1 = "2"; + + /// + /// 保运主任审批 + /// + public static string DriverRun_Audit2 = "3"; + + /// + /// 保运主任确认完成 + /// + public static string DriverRun_Audit3 = "4"; + + /// + /// 开车负责人确认完成 + /// + public static string DriverRun_Audit4 = "5"; + + /// + /// 流程闭环 + /// + public static string DriverRun_Complete = "6"; + #endregion + #endregion #region 施工综合 #region 菜单Id diff --git a/SGGL/BLL/SysManage/UserService.cs b/SGGL/BLL/SysManage/UserService.cs index 7f59e4a1..9d6a40c2 100644 --- a/SGGL/BLL/SysManage/UserService.cs +++ b/SGGL/BLL/SysManage/UserService.cs @@ -928,6 +928,18 @@ namespace BLL } } + public static void Init2(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease) + { + dropName.DataValueField = "Value"; + dropName.DataTextField = "Text"; + dropName.DataSource = GetMainUserList(projectId); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + /// /// ʩλλ̡רҵȡ鿴Ϣû /// diff --git a/SGGL/BLL/TestRun/DriverRun/DriverRunApproveService.cs b/SGGL/BLL/TestRun/DriverRun/DriverRunApproveService.cs new file mode 100644 index 00000000..c999fe34 --- /dev/null +++ b/SGGL/BLL/TestRun/DriverRun/DriverRunApproveService.cs @@ -0,0 +1,273 @@ +using Newtonsoft.Json.Serialization; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + public class DriverRunApproveService + { + public static Model.SGGLDB db = Funs.DB; + /// + /// 获取开车保运管理模板列表 + /// + /// + /// + /// + public static DataTable getListData(string DriverRunId) + { + var res = from x in db.DriverRun_DriverRunApprove + where x.DriverRunId == DriverRunId && x.ApproveDate != null && x.ApproveType != "S" + orderby x.ApproveDate + select new + { + x.DriverRunApproveId, + x.DriverRunId, + ApproveMan = (from y in db.Sys_User where y.UserId == x.ApproveMan select y.UserName).First(), + x.ApproveDate, + x.IsAgree, + x.ApproveIdea, + x.ApproveType, + }; + return Funs.LINQToDataTable(res); + } + /// + /// 根据开车保运管理编号删除对应的所有开车保运管理审批信息 + /// + /// 开车保运管理编号 + public static void DeleteDriverRunApprovesByDriverRunId(string DriverRunId) + { + Model.SGGLDB db = Funs.DB; + var q = (from x in db.DriverRun_DriverRunApprove where x.DriverRunId == DriverRunId select x).ToList(); + db.DriverRun_DriverRunApprove.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } + /// + /// 获取登录人的通知信息 + /// + /// + /// + /// + public static IQueryable getList(string userId) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + var res = from x in db.DriverRun_DriverRunApprove + join ca in db.DriverRun_DriverRun on x.DriverRunId equals ca.DriverRunId + where x.ApproveDate == null && x.ApproveType == "S" && x.ApproveMan == userId + orderby x.ApproveDate + select new + { + //x.DriverRunApproveId, + x.DriverRunId, + //x.ApproveDate, + //x.IsAgree, + //x.ApproveIdea, + //x.ApproveType, + ca.Code + }; + return res.AsQueryable().Distinct(); + } + } + /// + /// 更新通知信息提醒 + /// + /// + /// + /// + public static Model.DriverRun_DriverRunApprove GetSee(string DriverRunId, string userId) + { + return db.DriverRun_DriverRunApprove.FirstOrDefault(x => x.DriverRunId == DriverRunId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); + } + public static void See(string DriverRunId, string userId) + { + using (var db = new Model.SGGLDB(Funs.ConnString)) + { + var res = db.DriverRun_DriverRunApprove.FirstOrDefault(x => x.DriverRunId == DriverRunId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); + if (res != null) + { + res.ApproveDate = DateTime.Now; + db.SubmitChanges(); + } + } + } + /// + /// 根据开车保运管理编号获取一个开车保运管理审批信息 + /// + /// 开车保运管理编号 + /// 一个开车保运管理审批实体 + public static Model.DriverRun_DriverRunApprove GetDriverRunApproveByDriverRunId(string DriverRunId) + { + return db.DriverRun_DriverRunApprove.FirstOrDefault(x => x.DriverRunId == DriverRunId && x.ApproveType != "S" && x.ApproveDate == null); + } + /// + /// 修改开车保运管理审批信息 + /// + /// 开车保运管理审批实体 + public static void UpdateDriverRunApprove(Model.DriverRun_DriverRunApprove approve) + { + Model.SGGLDB db = Funs.DB; + Model.DriverRun_DriverRunApprove newApprove = db.DriverRun_DriverRunApprove.First(e => e.DriverRunApproveId == approve.DriverRunApproveId && e.ApproveDate == null); + newApprove.DriverRunId = approve.DriverRunId; + newApprove.ApproveMan = approve.ApproveMan; + newApprove.ApproveDate = approve.ApproveDate; + newApprove.ApproveIdea = approve.ApproveIdea; + newApprove.IsAgree = approve.IsAgree; + newApprove.ApproveType = approve.ApproveType; + + db.SubmitChanges(); + } + /// + /// 增加开车保运管理审批信息 + /// + /// 开车保运管理审批实体 + public static void AddDriverRunApprove(Model.DriverRun_DriverRunApprove approve) + { + Model.SGGLDB db = Funs.DB; + string newKeyID = SQLHelper.GetNewID(typeof(Model.DriverRun_DriverRunApprove)); + Model.DriverRun_DriverRunApprove newApprove = new Model.DriverRun_DriverRunApprove(); + newApprove.DriverRunApproveId = newKeyID; + newApprove.DriverRunId = approve.DriverRunId; + newApprove.ApproveMan = approve.ApproveMan; + newApprove.ApproveDate = approve.ApproveDate; + newApprove.ApproveIdea = approve.ApproveIdea; + newApprove.IsAgree = approve.IsAgree; + newApprove.ApproveType = approve.ApproveType; + db.DriverRun_DriverRunApprove.InsertOnSubmit(newApprove); + db.SubmitChanges(); + + } + public static string AddDriverRunApproveForApi(Model.DriverRun_DriverRunApprove approve) + { + using (var db = new Model.SGGLDB(Funs.ConnString)) + { + string newKeyID = SQLHelper.GetNewID(typeof(Model.DriverRun_DriverRunApprove)); + Model.DriverRun_DriverRunApprove newApprove = new Model.DriverRun_DriverRunApprove(); + newApprove.DriverRunApproveId = newKeyID; + newApprove.DriverRunId = approve.DriverRunId; + newApprove.ApproveMan = approve.ApproveMan; + newApprove.ApproveDate = approve.ApproveDate; + newApprove.ApproveIdea = approve.ApproveIdea; + newApprove.IsAgree = approve.IsAgree; + newApprove.ApproveType = approve.ApproveType; + + db.DriverRun_DriverRunApprove.InsertOnSubmit(newApprove); + db.SubmitChanges(); + return newKeyID; + } + } + /// + /// 开车负责人审批信息 + /// + /// + /// + public static Model.DriverRun_DriverRunApprove GetAudit1(string DriverRunId) + { + return db.DriverRun_DriverRunApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.DriverRunId == DriverRunId && x.ApproveType == BLL.Const.DriverRun_Audit1); + } + + /// + /// 保运主任审批信息 + /// + /// + /// + public static Model.DriverRun_DriverRunApprove GetAudit2(string DriverRunId) + { + return db.DriverRun_DriverRunApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.DriverRunId == DriverRunId && x.ApproveType == BLL.Const.DriverRun_Audit2); + } + + /// + /// 分包负责人审批信息 + /// + /// + /// + public static Model.DriverRun_DriverRunApprove GetAudit3(string DriverRunId) + { + return db.DriverRun_DriverRunApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.DriverRunId == DriverRunId && x.ApproveType == BLL.Const.DriverRun_Audit3); + } + + public static Model.DriverRun_DriverRunApprove GetComplie(string DriverRunId) + { + return db.DriverRun_DriverRunApprove.FirstOrDefault(x => x.DriverRunId == DriverRunId && x.ApproveType == BLL.Const.DriverRun_Compile); + } + public static List GetListDataByCodeForApi(string code) + { + using (var db = new Model.SGGLDB(Funs.ConnString)) + { + var q = from x in db.DriverRun_DriverRunApprove + where x.DriverRunId == code && x.ApproveDate != null && x.ApproveType != "S" + orderby x.ApproveDate + select new + { + x.DriverRunApproveId, + x.DriverRunId, + ApproveMan = (from y in db.Sys_User where y.UserId == x.ApproveMan select y.UserName).First(), + x.ApproveDate, + x.IsAgree, + x.ApproveIdea, + x.ApproveType, + }; + List res = new List(); + var list = q.ToList(); + foreach (var item in list) + { + Model.DriverRun_DriverRunApprove approve = new Model.DriverRun_DriverRunApprove(); + approve.DriverRunApproveId = item.DriverRunApproveId; + approve.DriverRunId = item.DriverRunId; + approve.ApproveMan = item.ApproveMan; + approve.ApproveDate = item.ApproveDate; + approve.IsAgree = item.IsAgree; + approve.ApproveIdea = item.ApproveIdea; + approve.ApproveType = item.ApproveType; + res.Add(approve); + } + return res; + } + } + public static Model.DriverRun_DriverRunApprove getCurrApproveForApi(string DriverRunId) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + Model.DriverRun_DriverRunApprove newApprove = db.DriverRun_DriverRunApprove.FirstOrDefault(e => e.DriverRunId == DriverRunId && e.ApproveType != "S" && e.ApproveDate == null); + if (newApprove != null) + { + Model.Sys_User user = BLL.UserService.GetUserByUserId(newApprove.ApproveMan); + if (user != null) + { + newApprove.ApproveIdea = user.UserName; + } + } + return newApprove; + } + } + public static void UpdateDriverRunApproveForApi(Model.DriverRun_DriverRunApprove approve) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + Model.DriverRun_DriverRunApprove newApprove = db.DriverRun_DriverRunApprove.FirstOrDefault(e => e.DriverRunApproveId == approve.DriverRunApproveId && e.ApproveDate == null); + if (newApprove != null) + { + if (!string.IsNullOrEmpty(approve.DriverRunId)) + { + newApprove.DriverRunId = approve.DriverRunId; + } + if (!string.IsNullOrEmpty(approve.ApproveMan)) + newApprove.ApproveMan = approve.ApproveMan; + if (approve.ApproveDate.HasValue) + newApprove.ApproveDate = approve.ApproveDate; + if (!string.IsNullOrEmpty(approve.ApproveIdea)) + newApprove.ApproveIdea = approve.ApproveIdea; + if (approve.IsAgree.HasValue) + newApprove.IsAgree = approve.IsAgree; + if (!string.IsNullOrEmpty(approve.ApproveType)) + newApprove.ApproveType = approve.ApproveType; + + db.SubmitChanges(); + } + } + } + } +} diff --git a/SGGL/BLL/TestRun/DriverRun/DriverRunService.cs b/SGGL/BLL/TestRun/DriverRun/DriverRunService.cs index 668efa2c..d90ec97e 100644 --- a/SGGL/BLL/TestRun/DriverRun/DriverRunService.cs +++ b/SGGL/BLL/TestRun/DriverRun/DriverRunService.cs @@ -1,15 +1,17 @@ -using System; +using Model; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Web.UI.WebControls; namespace BLL { /// /// 开车保运管理 /// - public static class DriverRunService + public static class DriverRunService { /// /// 根据主键获取开车保运管理 @@ -34,8 +36,15 @@ namespace BLL newDriverRun.UnitId = driverRun.UnitId; newDriverRun.Implement = driverRun.Implement; newDriverRun.Descriptions = driverRun.Descriptions; + newDriverRun.InstallationId = driverRun.InstallationId; + newDriverRun.InstallationNames = driverRun.InstallationNames; + newDriverRun.Objective = driverRun.Objective; + newDriverRun.NeedCompletedDate = driverRun.NeedCompletedDate; + newDriverRun.CompileMan = driverRun.CompileMan; + newDriverRun.CompileDate = driverRun.CompileDate; newDriverRun.AttachUrl = driverRun.AttachUrl; newDriverRun.Remark = driverRun.Remark; + newDriverRun.State = driverRun.State; Funs.DB.DriverRun_DriverRun.InsertOnSubmit(newDriverRun); Funs.DB.SubmitChanges(); } @@ -54,8 +63,14 @@ namespace BLL newDriverRun.UnitId = driverRun.UnitId; newDriverRun.Implement = driverRun.Implement; newDriverRun.Descriptions = driverRun.Descriptions; + newDriverRun.InstallationId = driverRun.InstallationId; + newDriverRun.InstallationNames = driverRun.InstallationNames; + newDriverRun.Objective = driverRun.Objective; + newDriverRun.NeedCompletedDate = driverRun.NeedCompletedDate; + newDriverRun.RealCompletedDate = driverRun.RealCompletedDate; newDriverRun.AttachUrl = driverRun.AttachUrl; newDriverRun.Remark = driverRun.Remark; + newDriverRun.State = driverRun.State; Funs.DB.SubmitChanges(); } } @@ -77,5 +92,163 @@ namespace BLL Funs.DB.SubmitChanges(); } } + + public static Model.DriverRun_DriverRun GetDriverRunForApi(string driverRunId) + { + using (var db = new Model.SGGLDB(Funs.ConnString)) + { + Model.DriverRun_DriverRun x = db.DriverRun_DriverRun.FirstOrDefault(e => e.DriverRunId == driverRunId); + return x; + } + } + + public static void Init(FineUIPro.DropDownList dropName, string state, bool isShowPlease) + { + dropName.DataValueField = "Value"; + dropName.DataTextField = "Text"; + dropName.DataSource = GetDHandleTypeByState(state); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + + /// + /// 根据状态选择下一步办理类型 + /// + /// + /// + public static ListItem[] GetDHandleTypeByState(string state) + { + if (state == Const.DriverRun_Compile) //无是否同意 + { + ListItem[] lis = new ListItem[1]; + lis[0] = new ListItem("开车负责人审批", Const.DriverRun_Audit1); + return lis; + } + else if (state == Const.DriverRun_Audit1)//有是否同意 + { + ListItem[] lis = new ListItem[1]; + lis[0] = new ListItem("保运主任审批", Const.DriverRun_Audit2);//是 加载 + return lis; + } + else if (state == Const.DriverRun_Audit2)//无是否同意 + { + ListItem[] lis = new ListItem[1]; + lis[0] = new ListItem("保运主任确认完成", Const.DriverRun_Audit3); + return lis; + } + else if (state == Const.DriverRun_Audit3)//无是否同意 + { + ListItem[] lis = new ListItem[1]; + lis[0] = new ListItem("开车负责人确认完成", Const.DriverRun_Audit4); + return lis; + } + else if (state == Const.DriverRun_Audit4)//有是否同意 + { + ListItem[] lis = new ListItem[1]; + lis[0] = new ListItem("流程闭环", Const.DriverRun_Complete);//是 加载 + return lis; + } + else + return null; + } + + public static List GetListDataForApi(string state, string projectId, int index, int page) + { + using (var db = new Model.SGGLDB(Funs.ConnString)) + { + IQueryable q = db.DriverRun_DriverRun; + List ids = new List(); + if (!string.IsNullOrEmpty(projectId)) + { + q = q.Where(e => e.ProjectId == projectId); + } + if (!string.IsNullOrEmpty(state)) + { + q = q.Where(e => e.State == state); + } + var qq1 = from x in q + orderby x.Code descending + select new + { + x.DriverRunId, + x.ProjectId, + x.UnitId, + x.Code, + x.Descriptions, + x.InstallationId, + x.InstallationNames, + x.State, + x.Objective, + x.NeedCompletedDate, + x.AttachUrl, + }; + var list = qq1.Skip(index * page).Take(page).ToList(); + + List listRes = new List(); + for (int i = 0; i < list.Count; i++) + { + Model.DriverRun_DriverRun x = new Model.DriverRun_DriverRun(); + x.DriverRunId = list[i].DriverRunId; + x.ProjectId = list[i].ProjectId; + x.Code = list[i].Code; + x.UnitId = list[i].UnitId + "$" + UnitService.GetUnitNameByUnitId(list[i].UnitId); + x.Descriptions = list[i].Descriptions; + x.State = list[i].State; + x.InstallationId = list[i].InstallationId; + x.InstallationNames = list[i].InstallationNames; + x.Objective = list[i].Objective; + x.NeedCompletedDate = list[i].NeedCompletedDate; + x.AttachUrl = list[i].AttachUrl; + listRes.Add(x); + } + return listRes; + } + } + + public static void UpdateDriverRunForApi(Model.DriverRun_DriverRun DriverRun) + { + + using (var db = new Model.SGGLDB(Funs.ConnString)) + { + Model.DriverRun_DriverRun newDriverRun = db.DriverRun_DriverRun.First(e => e.DriverRunId == DriverRun.DriverRunId); + if (!string.IsNullOrEmpty(DriverRun.Code)) + newDriverRun.Code = DriverRun.Code; + if (!string.IsNullOrEmpty(DriverRun.UnitId)) + newDriverRun.UnitId = DriverRun.UnitId; + if (!string.IsNullOrEmpty(DriverRun.Descriptions)) + newDriverRun.Descriptions = DriverRun.Descriptions; + if (!string.IsNullOrEmpty(DriverRun.State)) + newDriverRun.State = DriverRun.State; + if (DriverRun.NeedCompletedDate.HasValue) + newDriverRun.NeedCompletedDate = DriverRun.NeedCompletedDate; + if (DriverRun.RealCompletedDate.HasValue) + newDriverRun.RealCompletedDate = DriverRun.RealCompletedDate; + if (!string.IsNullOrEmpty(DriverRun.InstallationId)) + newDriverRun.InstallationId = DriverRun.InstallationId; + if (!string.IsNullOrEmpty(DriverRun.InstallationNames)) + newDriverRun.InstallationNames = DriverRun.InstallationNames; + if (!string.IsNullOrEmpty(DriverRun.Objective)) + newDriverRun.Objective = DriverRun.Objective; + db.SubmitChanges(); + } + } + + public static int GetListCount(string projectId) + { + using (var db = new Model.SGGLDB(Funs.ConnString)) + { + IQueryable q = db.DriverRun_DriverRun; + if (!string.IsNullOrEmpty(projectId)) + { + q = q.Where(e => e.ProjectId == projectId); + } + + return q.Count(); + } + + } } } diff --git a/SGGL/FineUIPro.Web/File/Excel/TestRun/开车方案编制计划.xlsx b/SGGL/FineUIPro.Web/File/Excel/TestRun/开车方案编制计划.xlsx index a5f6269c2acb8ef702e3cf558c819fe0d0cddd15..6549d73c390a8319c1b1ebbb5814968594751b24 100644 GIT binary patch delta 1514 zcmV-Asjkr6ShzA>|_oKZ#pNwysR8X^Be`~+X!x!M&#-ib|qnENpEPhGHT{$S}*i-O| zSGFnWG@7RQILWgKCFRao+5HX=X-^NttS91m2=C)bbd}|k_lTpOh-XjC#!)`Xrs+Et z$2}3xo|s-oS$;hky~o5ze2{n^nbUvy8iyqLM6Z}-i@BBug3W{3GK#rYOlPRfe`WR6 z=^@Wp&C;Q79UKvqAkKBoev!=MJ(jKP5uc9;R~ScGo(opzg7t|YMz;pv(9F4Su6aTU zFMV@xAJE`idgj|DB72KiULrm*=G>3TfC%x0h7Wb&a$T<27QQmQ<-(8_YBZBX zSCr^5Nd9i6@=|PrjkGu=$G-*_5MU{j2s^x%(jI?$y$@h_iYTT)Kkyeceocwg99NCs zFa=doTg|w|{zCZ+`pVjs;@C(Du1@q4gE*Dw8OK=keHCIJw&vn500030lcW<72{atJ zzbF9!0Q-~s85@6`k-_+Spn1j+H z*q)1^x9XupO!aM&G`@wYwIHZaJkI>g_y0e`+82RO&PAj=i6%4~1`vU^bUf^taC&mM zvkydR3mwasC`{-J1#P~)#gx*dzC~q%t95ulsj^)WSgL;^LxHu@l~G{ndW?Ehg^{ov zZo%PI_@;KAHdc3XP?#t0jIY}7RoP}Lh5Zw>!a40(xzsdmRj4l}~PLU0Y!Sg5K+jhk*hS!USr=QwoK2H~~qxIb{ z&dm*+mxLrFt!8)me4c07UnMp{Rntk4+!WKRG8vZR^nE=0AC1<};~xN%p%WAY+`>I| zvn(6;0WWjt@mOOq9`hs8G`!owB-}Cg8pKT68&9}Ne?3gZndSqkm1cL4Xf~qLLpud| z{j*XX83F_gXXeARZyz)Pf24K(32g@|dvYLHQG5%@-BxVUkVLzEd((ES9f*(jo|E4_ z_mX_MS55Q{*43>p5KRb*K#Nw^dRw5^Y8Bt2$a$_MZ(0onI)FpV^70}VhKbg~vuzDn zUxSMRNjoM?fp*>-hOrYnP~0WKp@X<-t>QkEc8d)cpL`2ACFB|_fACy#&v6fo%|t{; zq!bg4I6N-Pm9;|YIJ{XjlQ`P=p!cNDybG8(tIJx((o{U}BC0#be z2>B^~Uq8JJtH!nNZzTYgxfD!T;J&qGj^{-I|bOHbXZ3h4V4FCWD00000000000032!At*Wm^c|C79wd{2 zC@%qkld&jN0t_FMVICxtD=8Hl3uorTLID5(Q33z}5dZ)H0000000000005YiTPZ#Q Q5h9bDDIx~yBme*a0DNkK=sys=SFbpZV^|JSyFqg( zP&9p<8EIt^kw})L?WAAdp(HDg1Ejr3nkMI; zrr_pxmjg>Ah{p`a>qEAij*73Al~jpsf8)RD{b!P!+9T~GxEHzs7GKuNFbvLG@z~cS zOJC=F7R}P>B$;OCoE2N=b^EJ7NC)@cF&iB5-}mQ}^XMX*p8w17Y;eSXaLlqOnO)8% zXBTg$oD81$51#4lP0zS*wj*pUyjU)*-ZMx5T{|O!pwc;_1$Lg>9r?mcih#ZjfAG!; zxG?+OGFiks&|eIQj|W5`IJm4%4eKLAj4H-bz~5;pDMsEi|GJa_N3ooZrKBgNyhda% z5v$jTvzG`c`83O9MD*47D(p#Z$!bXbXT*lSWeB^G%CUwjq)DO+&TOylZtb<{tkBWD_K@yjSL00} z%q58+yGm<+*bH&+$ZriZ!jQd_e~|o=Gi@bqe|PC~ZnX7QNDr~V{s*;+W^E)!k>E8$ zm1yGFV&@XQ*xR!2d3?y0e*u%B6BK`JTWDDX0RR9}0RR9L0001ZY%guH4y@_n8hF=Co1U^8wXL zvpYyM8`0^Zoq~M+vyB}Y0t5i3yvehwA2b1fW^>MkwgZ(tIS}knd<)6lR&4%|M7w=^ z({`&J3?J`3C%=2{CE4;I>*xoptF+1yNm3Mn;#yQ{m!nO&iXTwqJX3{TIOP_Y*S5&;xCn=1;t~>4*%U diff --git a/SGGL/FineUIPro.Web/File/Excel/TestRun/开车方案编制计划2.xlsx b/SGGL/FineUIPro.Web/File/Excel/TestRun/开车方案编制计划2.xlsx index f1593bea66b51e09534081167c96d613578b0754..a7aa9839af75b0fe7a714006c31c499de36a2c63 100644 GIT binary patch delta 1488 zcmV;>1uy#8Q>0X|Qx^#-3cD>GyA&4^v8vWujz_6p+&w zF!W~m{@vmr^^>UqEI|vxav>lqF+I zik-2t{nM`u8LlWus&ozoCf{d6#(hn&~*0B-!{amuatvXRnx~!R$?@ z7>D&*1KIe3>@{L^j#ynIl5@oR8j+qO?yeEza|Dj)CDUv`bQ$P| zt1Dd#dh5r~kV5W+n;-_kmtwa*N{bVD{Ht-<0aiZ>aF{A7?eV9#`v7*Q zh++!#1OJWAXOu|Iajp4nmQy9Q)r?zgNtFLauB=%rj=dM*nnsow#HmEj3^~T4@5?Uc zVM8zf0F$8;6n{KIgS0aN002D#000yK004MwFLP*Na%E&wbaH8KXLBxiZEU2G!AiqG z5Qgu9@373>ZmXaoo9&?>c=MnS5Rz>ZXl7$}EA}j64we?7?YRhgYdw^Rt-eh+jc;LU zEr=)-J^u4E-~SK8$`?VMoQp{L5-lhdia-Q9()F=s!GGz=;nqG7rEPTWxU6tU+@*o-BM?V6 zP+PDEq=EifLsV9pGv#xpc{b{1ulH&1IUU4|YR*D0@1cF?I3iVv`pC6l2Z(Nlc{!97 ziJ!*+EeS6b(s~w1s_nwpA zJ@=A)xmQi}4c67IE)b0q6oD44to61)uhk0QqR4r!C2v{{1v-F3%kuIf7lw(}!n17+ zSYLyS0!ce2Oo4XZ8%Br|J5b!k!J&h=X|3Wulz(

Tk#3nWdFYofq&$vr1M5SxjJ zjz}pcr1`SV0FZ(}0}8ZvgvONodOcX>{(LYfGpDNk!GxWTap!C)MsafQT|F7Qu8X^D zh!OHr^1gn08CJ!$?r$XkmAMp5Sm3_3WlrWrI9$V>UxyoSYLNGbp#Ra6Vu(9JKt>?| z8#?2jl(+2Rv09H-uHpVhB^-ZmzZARB*ke~B{u=b7K<72 z1Q>Ile}eJ{lc5t7v-u&K1qmq%yDXdn008EboF_dTJVJxCGXVeqJpup#6aWAK00000 z00000000*nll3P+0eq7-C^`WflN%`|la?qi0jHB2DJ7HZC@%stACnv@IUB|kE5<YlC+)V z>pP@m#S4)3B2mNlW__CF?Q`3ZJ!r$FNNF5Ilz_-(!9|tQpFbWx%_%XKiGnp!KuTZ0 z(A(_ehvh-)CsPAhf*yoPX>F}qgrUi6XqgG50)aQB)Gf34sjJW^4Xp5_wh5Ccnuaao ze}Z-%7W#jD$g<=)tYyAyLDv)9C`QwAQGlmF<7^mlB zya(TmZ<-WPvRz}p%flDoRc$fw*wJ&@e;^j0q~&fLl(g(Qr3q%m3tOjj9?awEIGQFC zO7fktvi;p%#67(uVqTtz@18iG1hZs1`4@5A6Y<>>lO%}dH}mmm_I^mb^&#=yGvoQY z%&;rgH*C!;%a&Rm2#Nr!Hi|h(#S8T2y7N}<&@Y@y?$CD*?puU7H~oDUEyF#we?RXL zpN|OFU`JV98rGMF`x8TmX$`sIBrbD{r^iuT=jPzPpdq*TBDZVA|mmB`nWT52&sHjLMHy_RMYSKlYFs3Mql^NS zcqyele)N7fV0Vfrra*7_D+a%zL~4#J!*7a|Dygkz+@ikF{))M>X0131DZ&+qSz-~V z7QNtDi+(J+nuqO|{RNYu6BG(GL!iMB0RRA$0h2Ep8h?C{u}T9$5QclfcUY!3dr=4? zyPF~)*jeZUEO(pS!rkn7yCvmOW~VQpv=oO1V6v+fme_xzq?GHWfM!Eg%)@lS*~IvtU*W=EU-D zvV6U+r%(0OfKew{kp>T^G|8sdN8hMk8iVw-#tH^_za8lzg(ODy3+7f@eY%r6BM(G8$$#I zxamcTLbK8zCjozJgD@1u-v|2+l6Q@l3XC#3#1%>WP_Ljw|&vzSB#|9Kr4X)it)l$lf3?x6in$GCI0;G;OX_qLvl zUDrk3Vu<1M6a2AxejQc~Yt`S111d7XDL24eYl;ld3xBwVS-0^w-qs)<4qm^|6MTp} zLO=vQ03AEyo|N~+<5RgtMSsIEz7NTwB!nh}rsT69dG@{!G&baM@V~@l8O9_`(lWlK zWJ%L>Mmzz=+~=R5_yw~uBCZ7qe8~QuasmJVLX+qxJsdPcpurFU005K$000yK00000 z0000000000?HQ9nC_oJ_8vp=!Y%g6 zA0(4EDK7%%9+OWWDJxJ*0Rk-m6aWSQ2mk;8App4PMT$ZJ002<}000pH0000000000 a00000a+AC%J_73@ll& + @@ -15819,6 +15820,13 @@ DriverRunPlanEdit.aspx + + DriverRunView.aspx + ASPXCodeBehind + + + DriverRunView.aspx + DriverScheme.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx index 209da8ac..b2d11933 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx @@ -21,6 +21,9 @@ + + @@ -41,6 +44,25 @@ + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.cs index 0300fd86..6c60d2a6 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.cs @@ -277,10 +277,18 @@ namespace FineUIPro.Web.TestRun.DriverPrepare cell.SetCellValue(item.SolutionName); cell = row.CreateCell(2); cell.CellStyle = cellStyle; - cell.SetCellValue(string.Empty); + cell.SetCellValue(item.FileCode); cell = row.CreateCell(3); cell.CellStyle = cellStyle; - cell.SetCellValue(string.Empty); + cell.SetCellValue(item.CompileMan); + cell = row.CreateCell(4); + cell.CellStyle = cellStyle; + string date = string.Empty; + if (item.PlanCompletedDate != null) + { + date = string.Format("{0:yyyy-MM-dd}", item.PlanCompletedDate); + } + cell.SetCellValue(date); i++; } // 第三步：写入文件流 @@ -364,10 +372,18 @@ namespace FineUIPro.Web.TestRun.DriverPrepare cell.SetCellValue(item.SolutionName); cell = row.CreateCell(3); cell.CellStyle = cellStyle; - cell.SetCellValue(string.Empty); + cell.SetCellValue(item.FileCode); cell = row.CreateCell(4); cell.CellStyle = cellStyle; - cell.SetCellValue(string.Empty); + cell.SetCellValue(item.CompileMan); + cell = row.CreateCell(5); + cell.CellStyle = cellStyle; + string date = string.Empty; + if (item.PlanCompletedDate != null) + { + date = string.Format("{0:yyyy-MM-dd}", item.PlanCompletedDate); + } + cell.SetCellValue(date); if (type != item.SolutionType) { type = item.SolutionType; @@ -408,5 +424,28 @@ namespace FineUIPro.Web.TestRun.DriverPrepare } } #endregion + + protected void btnSave_Click(object sender, EventArgs e) + { + Model.SGGLDB db = Funs.DB; + var items = from x in db.DriverPrepare_SchemePlanItem + join y in db.DriverPrepare_SchemePlan on x.SchemePlanId equals y.SchemePlanId + where y.ProjectId == this.CurrUser.LoginProjectId + select x; + foreach (JObject mergedRow in Grid1.GetMergedData()) + { + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + var item = items.FirstOrDefault(x => x.SchemePlanItemId == this.Grid1.Rows[i].DataKeys[0].ToString()); + if (item != null) + { + item.FileCode = values.Value("FileCode"); + item.CompileMan = values.Value("CompileMan"); + item.PlanCompletedDate = Funs.GetNewDateTime(values.Value("PlanCompletedDate")); + db.SubmitChanges(); + } + } + ShowNotify("保存成功！", MessageBoxIcon.Success); + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.designer.cs index 47e4ff3c..d67fc6a0 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.designer.cs @@ -66,6 +66,15 @@ namespace FineUIPro.Web.TestRun.DriverPrepare { /// protected global::FineUIPro.TextBox hdItemsString; + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + /// /// btnSelect 控件。 /// @@ -102,6 +111,33 @@ namespace FineUIPro.Web.TestRun.DriverPrepare { /// protected global::FineUIPro.Button btnDel; + /// + /// txtFileCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtFileCode; + + /// + /// txtCompileMan 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCompileMan; + + /// + /// txtPlanCompletedDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtPlanCompletedDate; + /// /// Window1 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRun.aspx b/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRun.aspx index f70b7302..c23634a3 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRun.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRun.aspx @@ -9,7 +9,7 @@
- + @@ -34,20 +34,38 @@ - - + FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center" Width="210px"> + + + FieldType="String" HeaderText="内容" HeaderTextAlign="Center" Width="300px" ExpandUnusedSpace="true"> - + - + + + + + + + + + + + + + + + <%----%> @@ -70,7 +88,7 @@ - \ No newline at end of file + diff --git a/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunEdit.aspx.cs index 3501ffd1..281b217c 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunEdit.aspx.cs @@ -5,6 +5,21 @@ namespace FineUIPro.Web.TestRun.DriverRun { public partial class DriverRunEdit : PageBase { + /// + /// 办理类型 + /// + public string State + { + get + { + return (string)ViewState["State"]; + } + set + { + ViewState["State"] = value; + } + } + #region 加载 /// /// 页面加载 @@ -16,32 +31,104 @@ namespace FineUIPro.Web.TestRun.DriverRun if (!IsPostBack) { BLL.UnitService.InitUnitDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true); - this.drpImplement.DataTextField = "Text"; - this.drpImplement.DataValueField = "Value"; - this.drpImplement.DataSource = BLL.DropListService.drpDriverRunImplementItemList(); - this.drpImplement.DataBind(); - Funs.FineUIPleaseSelect(this.drpImplement); - + BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkIds, this.CurrUser.LoginProjectId, true); + plApprove1.Hidden = true; + plApprove2.Hidden = true; + txtRealCompletedDate.Hidden = true; string id = Request.Params["id"]; if (!string.IsNullOrEmpty(id)) { Model.DriverRun_DriverRun data = BLL.DriverRunService.GetDriverRunById(id); if (data != null) { + plApprove1.Hidden = false; + plApprove2.Hidden = false; + var dt = DriverRunApproveService.getListData(id); + gvApprove.DataSource = dt; + gvApprove.DataBind(); this.hdId.Text = id; this.txtCode.Text = data.Code; if (!string.IsNullOrEmpty(data.UnitId)) { this.drpUnitId.SelectedValue = data.UnitId; } - if (!string.IsNullOrEmpty(data.Code)) - { - this.drpImplement.SelectedValue = data.Code; - } + this.drpUnitWorkIds.SelectedValueArray = data.InstallationId.Split(','); this.txtDescriptions.Text = data.Descriptions; - this.txtRemark.Text = data.Remark; + this.txtObjective.Text = data.Objective; + if (data.NeedCompletedDate != null) + { + this.txtNeedCompletedDate.Text = string.Format("{0:yyyy-MM-dd}", data.NeedCompletedDate); + } + if (data.RealCompletedDate != null) + { + this.txtRealCompletedDate.Text = string.Format("{0:yyyy-MM-dd}", data.RealCompletedDate); + } + if (!string.IsNullOrEmpty(data.State)) + { + State = data.State; + } + else + { + State = BLL.Const.DriverRun_Compile; + } + if (State != BLL.Const.DriverRun_Complete) + { + DriverRunService.Init(drpHandleType, State, false); + } + if (State == BLL.Const.DriverRun_Compile) + { + UserService.Init2(drpHandleMan, CurrUser.LoginProjectId, false); + this.drpHandleMan.SelectedIndex = 1; + } + else + { + if (State == BLL.Const.DriverRun_Audit2) + { + Model.DriverRun_DriverRunApprove approve = BLL.DriverRunApproveService.GetAudit2(id); + if (approve != null) + { + ListItem[] list = new ListItem[1]; + list[0] = new ListItem(BLL.UserService.GetUserByUserId(approve.ApproveMan).UserName ?? "", approve.ApproveMan); + drpHandleMan.DataValueField = "Value"; + drpHandleMan.DataTextField = "Text"; + drpHandleMan.DataSource = list; + drpHandleMan.DataBind(); + } + } + else if (State == BLL.Const.DriverRun_Audit3) + { + txtRealCompletedDate.Hidden = false; + Model.DriverRun_DriverRunApprove approve = BLL.DriverRunApproveService.GetAudit1(id); + if (approve != null) + { + ListItem[] list = new ListItem[1]; + list[0] = new ListItem(BLL.UserService.GetUserByUserId(approve.ApproveMan).UserName ?? "", approve.ApproveMan); + drpHandleMan.DataValueField = "Value"; + drpHandleMan.DataTextField = "Text"; + drpHandleMan.DataSource = list; + drpHandleMan.DataBind(); + } + } + else if (State == BLL.Const.DriverRun_Audit4) + { + txtRealCompletedDate.Hidden = false; + drpHandleMan.Items.Clear(); + drpHandleMan.Enabled = false; + } + else + { + UserService.Init2(drpHandleMan, CurrUser.LoginProjectId, false); + } + } + this.txtOpinions.Text = "同意"; } } + else + { + State = Const.DriverRun_Compile; + DriverRunService.Init(drpHandleType, State, false); + UserService.Init2(drpHandleMan, CurrUser.LoginProjectId, false); + } } } #endregion @@ -62,7 +149,7 @@ namespace FineUIPro.Web.TestRun.DriverRun } #endregion - #region 保存 + #region 保存/提交 /// /// 保存按钮 /// @@ -70,16 +157,50 @@ namespace FineUIPro.Web.TestRun.DriverRun /// protected void btnSave_Click(object sender, EventArgs e) { - if (this.drpImplement.SelectedValue == BLL.Const._Null) - { - Alert.ShowInTop("请选择记录/报告/执行情况！", MessageBoxIcon.Warning); - return; - } if (this.drpUnitId.SelectedValue == BLL.Const._Null) { Alert.ShowInTop("请选择单位名称！", MessageBoxIcon.Warning); return; } + if (this.drpUnitWorkIds.SelectedValue == BLL.Const._Null) + { + Alert.ShowInTop("请选择区域！", MessageBoxIcon.Warning); + return; + } + if (State == BLL.Const.DriverRun_Audit4 && string.IsNullOrEmpty(this.txtRealCompletedDate.Text.Trim())) + { + Alert.ShowInTop("请选择实际完成时间！", MessageBoxIcon.Warning); + return; + } + SaveData("save"); + ShowNotify("保存成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + protected void btnSubmit_Click(object sender, EventArgs e) + { + if (this.drpUnitId.SelectedValue == BLL.Const._Null) + { + Alert.ShowInTop("请选择单位名称！", MessageBoxIcon.Warning); + return; + } + if (this.drpUnitWorkIds.SelectedValue == BLL.Const._Null) + { + Alert.ShowInTop("请选择区域！", MessageBoxIcon.Warning); + return; + } + if (State == BLL.Const.DriverRun_Audit4 && string.IsNullOrEmpty(this.txtRealCompletedDate.Text.Trim())) + { + Alert.ShowInTop("请选择实际完成时间！", MessageBoxIcon.Warning); + return; + } + SaveData("submit"); + ShowNotify("提交成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + private void SaveData(string saveType) + { string id = Request.Params["id"]; Model.DriverRun_DriverRun newData = new Model.DriverRun_DriverRun(); newData.Code = this.txtCode.Text.Trim(); @@ -87,15 +208,77 @@ namespace FineUIPro.Web.TestRun.DriverRun { newData.UnitId = this.drpUnitId.SelectedValue; } - if (this.drpImplement.SelectedValue != BLL.Const._Null) + if (!string.IsNullOrEmpty(this.drpUnitWorkIds.SelectedValue)) { - newData.Implement = this.drpImplement.SelectedItem.Text; + newData.InstallationId = GetStringByArray(this.drpUnitWorkIds.SelectedValueArray); + string unitWorkNames = string.Empty; + foreach (var item in this.drpUnitWorkIds.SelectedValueArray) + { + var unitWork = BLL.UnitWorkService.getUnitWorkByUnitWorkId(item); + if (unitWork != null) + { + unitWorkNames += unitWork.UnitWorkName + ","; + } + } + if (!string.IsNullOrEmpty(unitWorkNames)) + { + newData.InstallationNames = unitWorkNames.Substring(0, unitWorkNames.LastIndexOf(",")); + } } newData.Descriptions = this.txtDescriptions.Text.Trim(); - newData.Remark = this.txtRemark.Text.Trim(); + newData.Objective = this.txtObjective.Text.Trim(); + newData.NeedCompletedDate = Funs.GetNewDateTime(this.txtNeedCompletedDate.Text.Trim()); newData.ProjectId = this.CurrUser.LoginProjectId; + newData.RealCompletedDate = Funs.GetNewDateTime(this.txtRealCompletedDate.Text.Trim()); + if (saveType == "submit") + { + newData.State = drpHandleType.SelectedValue.Trim(); + } + else + { + Model.DriverRun_DriverRun newData1 = BLL.DriverRunService.GetDriverRunById(id); + + if (newData1 != null) + { + if (string.IsNullOrEmpty(newData1.State)) + { + newData.State = BLL.Const.DriverRun_Compile; + } + else + { + newData.State = newData1.State; + } + } + else + { + newData.State = BLL.Const.DriverRun_Compile; + } + } if (!string.IsNullOrEmpty(id)) { + Model.DriverRun_DriverRunApprove approve1 = BLL.DriverRunApproveService.GetDriverRunApproveByDriverRunId(id); + if (approve1 != null && saveType == "submit") + { + approve1.ApproveDate = DateTime.Now; + approve1.ApproveIdea = txtOpinions.Text.Trim(); + BLL.DriverRunApproveService.UpdateDriverRunApprove(approve1); + } + if (saveType == "submit" && !string.IsNullOrEmpty(this.drpHandleMan.SelectedValue)) + { + Model.DriverRun_DriverRunApprove approve = new Model.DriverRun_DriverRunApprove(); + approve.DriverRunId = id; + if (!string.IsNullOrEmpty(this.drpHandleMan.SelectedValue)) + { + approve.ApproveMan = this.drpHandleMan.SelectedValue; + } + approve.ApproveType = this.drpHandleType.SelectedValue; + if (this.drpHandleType.SelectedValue == BLL.Const.DriverRun_Complete) + { + approve.ApproveDate = DateTime.Now; + } + BLL.DriverRunApproveService.AddDriverRunApprove(approve); + APICommonService.SendSubscribeMessage(approve.ApproveMan, "开车保运委托单待办理", this.CurrUser.UserName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now)); + } newData.DriverRunId = id; BLL.DriverRunService.UpdateDriverRun(newData); } @@ -110,25 +293,97 @@ namespace FineUIPro.Web.TestRun.DriverRun newData.DriverRunId = SQLHelper.GetNewID(typeof(Model.DriverRun_DriverRun)); this.hdId.Text = newData.DriverRunId; } + newData.CompileMan = this.CurrUser.UserId; + newData.CompileDate = DateTime.Now; BLL.DriverRunService.AddDriverRun(newData); + if (saveType == "submit") + { + Model.DriverRun_DriverRunApprove approve1 = new Model.DriverRun_DriverRunApprove(); + approve1.DriverRunId = newData.DriverRunId; + approve1.ApproveDate = DateTime.Now; + approve1.ApproveMan = this.CurrUser.UserId; + approve1.ApproveType = BLL.Const.DriverRun_Compile; + BLL.DriverRunApproveService.AddDriverRunApprove(approve1); + + Model.DriverRun_DriverRunApprove approve = new Model.DriverRun_DriverRunApprove(); + approve.DriverRunId = newData.DriverRunId; + if (this.drpHandleMan.SelectedValue != "0") + { + approve.ApproveMan = this.drpHandleMan.SelectedValue; + } + approve.ApproveType = this.drpHandleType.SelectedValue; + + BLL.DriverRunApproveService.AddDriverRunApprove(approve); + APICommonService.SendSubscribeMessage(approve.ApproveMan, "开车保运委托单待办理", this.CurrUser.UserName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now)); + } + else + { + Model.DriverRun_DriverRunApprove approve1 = new Model.DriverRun_DriverRunApprove(); + approve1.DriverRunId = newData.DriverRunId; + approve1.ApproveMan = this.CurrUser.UserId; + approve1.ApproveType = BLL.Const.DriverRun_Compile; + BLL.DriverRunApproveService.AddDriverRunApprove(approve1); + } } - ShowNotify("保存成功！", MessageBoxIcon.Success); - PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + private string GetStringByArray(string[] array) + { + string str = string.Empty; + foreach (var item in array) + { + if (item != BLL.Const._Null) + { + str += item + ","; + } + } + if (!string.IsNullOrEmpty(str)) + { + str = str.Substring(0, str.LastIndexOf(",")); + } + return str; } #endregion - #region DropDownList下拉选择事件 - protected void drpImplement_SelectedIndexChanged(object sender, EventArgs e) + /// + /// 把状态转换代号为文字形式 + /// + /// + /// + protected string ConvertState(object state) { - if (this.drpImplement.SelectedValue == BLL.Const._Null) + if (state != null) { - this.txtCode.Text = string.Empty; - } - else - { - this.txtCode.Text = this.drpImplement.SelectedValue; + if (state.ToString() == BLL.Const.DriverRun_Compile) + { + return "编制"; + } + else if (state.ToString() == BLL.Const.DriverRun_Audit1) + { + return "开车负责人审批"; + } + else if (state.ToString() == BLL.Const.DriverRun_Audit2) + { + return "保运主任审批"; + } + else if (state.ToString() == BLL.Const.DriverRun_Audit3) + { + return "保运主任确认完成"; + } + else if (state.ToString() == BLL.Const.DriverRun_Audit4) + { + return "开车负责人确认完成"; + } + else if (state.ToString() == BLL.Const.DriverRun_Complete) + { + return "流程闭环"; + } + else + { + return ""; + } } + return ""; } - #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunEdit.aspx.designer.cs index 74c39a17..6a62700c 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunEdit.aspx.designer.cs @@ -66,6 +66,15 @@ namespace FineUIPro.Web.TestRun.DriverRun { /// protected global::FineUIPro.Button btnSave; + /// + /// btnSubmit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSubmit; + /// /// hdAttachUrl 控件。 /// @@ -102,15 +111,6 @@ namespace FineUIPro.Web.TestRun.DriverRun { /// protected global::FineUIPro.Form Form2; - /// - /// drpImplement 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpImplement; - /// /// txtCode 控件。 /// @@ -129,6 +129,15 @@ namespace FineUIPro.Web.TestRun.DriverRun { /// protected global::FineUIPro.DropDownList drpUnitId; + /// + /// drpUnitWorkIds 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnitWorkIds; + /// /// txtDescriptions 控件。 /// @@ -139,13 +148,31 @@ namespace FineUIPro.Web.TestRun.DriverRun { protected global::FineUIPro.TextArea txtDescriptions; /// - /// txtRemark 控件。 + /// txtObjective 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextArea txtRemark; + protected global::FineUIPro.TextArea txtObjective; + + /// + /// txtNeedCompletedDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtNeedCompletedDate; + + /// + /// txtRealCompletedDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtRealCompletedDate; /// /// Panel3 控件。 @@ -174,6 +201,87 @@ namespace FineUIPro.Web.TestRun.DriverRun { /// protected global::FineUIPro.Button btnAttach; + /// + /// ContentPanel5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel5; + + /// + /// Form5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form5; + + /// + /// drpHandleType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpHandleType; + + /// + /// drpHandleMan 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpHandleMan; + + /// + /// plApprove1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.FormRow plApprove1; + + /// + /// txtOpinions 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinions; + + /// + /// plApprove2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.FormRow plApprove2; + + /// + /// gvApprove 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvApprove; + + /// + /// lbtype 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lbtype; + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunPlan.aspx b/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunPlan.aspx index 56d47f46..d22b8689 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunPlan.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunPlan.aspx @@ -20,9 +20,9 @@ - + + EnablePostBack="true" runat="server" OnClick="btnSearch_Click" Hidden="true">