diff --git a/DataBase/版本日志/SGGLDB_WH_2024-05-05-gaofei.sql b/DataBase/版本日志/SGGLDB_WH_2024-05-05-gaofei.sql new file mode 100644 index 00000000..812d5821 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-05-05-gaofei.sql @@ -0,0 +1,32 @@ +alter table [dbo].[JDGL_QuantityCompletion] add NextNum decimal(9,2) null +GO + + +ALTER VIEW [dbo].[View_JDGL_QuantityCompletion] +AS +select qc.*,ql.DesignNum,ql.Name,ql.Unit,ql.SortIndex, + CONVERT(FLOAT,(select sum(ISNULL(PlanNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and EndDate<=getdate())) as TotalPlanNum, + CONVERT(FLOAT,(select sum(ISNULL(RealNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and EndDate<=getdate())) as TotalRealNum, + CONVERT(NVARCHAR(10),((CAST(CASE ISNULL(qc.PlanNum,0) WHEN 0 THEN 0 + ELSE 100*ISNULL(qc.RealNum,0) / (1.0 *qc.PlanNum) END AS DECIMAL(9,2)))))+'%' + AS Rate, + CONVERT(NVARCHAR(10),((CAST(CASE (select sum(ISNULL(PlanNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and EndDate<=getdate()) WHEN 0 THEN 0 + ELSE 100*(select sum(ISNULL(RealNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and EndDate<=getdate()) / (1.0 *(select sum(ISNULL(PlanNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and EndDate<=getdate())) END AS DECIMAL(9,2)))))+'%' + AS TotalRate, + CONVERT(NVARCHAR(10),((CAST(CASE ISNULL(ql.DesignNum,0) WHEN 0 THEN 0 + ELSE 100*(select sum(ISNULL(RealNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and EndDate<=getdate()) / (1.0 *ql.DesignNum) END AS DECIMAL(9,2)))))+'%' + AS SumRate, + CONVERT(FLOAT,(select sum(ISNULL(PlanNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and Months0) +or (GJSX.User_Acceptance like '%'+@userId+'%' and (select count(*) from GJSX_detail detail where detail.GJSXID=GJSX.GJSXID)=(select count(*) from GJSX_Process process where process.GJSXID=GJSX.GJSXID)) +) + +UNION ALL +SELECT InspectionEquipmentId AS DataId + ,'6c2c1e5e-1812-4e1c-a683-7125518e28c7' AS MenuId + ,'豸ϱȷ' AS MenuName + ,Equipment.InspectionName AS Content + ,UserId + ,users.UserName + ,Equipment.InspectionDate AS DataTime + ,CONVERT(varchar(100),Equipment.InspectionDate, 23) AS DataTimeStr + ,'../CQMS/Comprehensive/InspectionEquipmentEdit.aspx?ToDo=ToDo&InspectionEquipmentId='+Equipment.InspectionEquipmentId AS PCUrl +FROM Comprehensive_InspectionEquipment AS Equipment +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE Equipment.ProjectId=@projectId and +Equipment.Status!='3' AND Equipment.InspectionEquipmentId in (select InspectionEquipmentId from Comprehensive_InspectionEquipmentApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null ) +UNION ALL +SELECT InspectionPersonId AS DataId + ,'8ed133de-5899-4687-878a-20b1f5280f18' AS MenuId + ,'Աȷ' AS MenuName + ,Person.PersonName AS Content + ,UserId + ,users.UserName + ,Person.CompileDate AS DataTime + ,CONVERT(varchar(100),Person.CompileDate, 23) AS DataTimeStr + ,'../CQMS/Comprehensive/InspectionPersonEdit.aspx?ToDo=ToDo&InspectionPersonId='+Person.InspectionPersonId AS PCUrl +FROM Comprehensive_InspectionPerson AS Person +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE Person.ProjectId=@projectId and +Person.Status!='3' AND Person.InspectionPersonId in (select InspectionPersonId from Comprehensive_InspectionPersonApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null ) +UNION ALL +SELECT InspectionMachineId AS DataId + ,'aa55fad1-6c51-43f5-8c99-3c6aaae79118' AS MenuId + ,'߱ȷ' AS MenuName + ,Machine.InspectionMachineName AS Content + ,UserId + ,users.UserName + ,Machine.CompileDate AS DataTime + ,CONVERT(varchar(100),Machine.CompileDate, 23) AS DataTimeStr + ,'../CQMS/Comprehensive/InspectionMachineEdit.aspx?ToDo=ToDo&InspectionMachineId='+Machine.InspectionMachineId AS PCUrl +FROM Comprehensive_InspectionMachine AS Machine +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE Machine.ProjectId=@projectId and +Machine.Status!='3' AND Machine.InspectionMachineId in (select InspectionMachineId from Comprehensive_InspectionMachineApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null ) +UNION ALL +SELECT ConstructSolutionId AS DataId + ,'91C4BFDB-0A51-4992-99CC-EB4EC185593D' AS MenuId + ,'ʩ' AS MenuName + ,Solution.SolutionName AS Content + ,UserId + ,users.UserName + ,Solution.CompileDate AS DataTime + ,CONVERT(varchar(100),Solution.CompileDate, 23) AS DataTimeStr + ,'../CQMS/Solution/EditConstructSolution.aspx?ToDo=ToDo&ConstructSolutionId='+Solution.ConstructSolutionId AS PCUrl +FROM Solution_CQMSConstructSolution AS Solution +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE Solution.ProjectId=@projectId and +Solution.State!='3' +AND Solution.ConstructSolutionId in +(select top 1 ConstructSolutionId from ( +SELECT Solution_CQMSConstructSolutionApprove.* +FROM Solution_CQMSConstructSolutionApprove, +(SELECT MIN([order]) AS [order],ConstructSolutionId FROM Solution_CQMSConstructSolutionApprove where ApproveType!='S' and ApproveDate is null GROUP BY ConstructSolutionId )b +WHERE Solution_CQMSConstructSolutionApprove.[order] = b.[order] and Solution_CQMSConstructSolutionApprove.ConstructSolutionId = b.ConstructSolutionId + ) approve +where approve.ApproveMan=@userId ) + +UNION ALL +SELECT InspectionId AS DataId + ,'4781f467-35bf-4cf2-aaa4-7960a175eb61' AS MenuId + ,'֪ͨ' AS MenuName + ,InspectionManagement.AcceptanceSite AS Content + ,UserId + ,users.UserName + ,InspectionManagement.CompileDate AS DataTime + ,CONVERT(varchar(100),InspectionManagement.CompileDate, 23) AS DataTimeStr + ,'../CQMS/ProcessControl/InspectionNoticeEdit.aspx?View=View&InspectionId='+InspectionManagement.InspectionId AS PCUrl +FROM ProcessControl_InspectionManagement AS InspectionManagement +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE InspectionManagement.ProjectId=@projectId and +dateadd(day,3,InspectionManagement.CompileDate)>getdate() and InspectionManagement.AcceptanceCheckMan like '%'+@userId+'%' +UNION ALL +SELECT CheckSpecialId AS DataId + ,'1B08048F-93ED-4E84-AE65-DB7917EA2DFB' AS MenuId + ,'ר' AS MenuName + ,CheckItemSet.CheckItemName AS Content + ,UserId + ,users.UserName + ,CheckSpecial.CheckTime AS DataTime + ,CONVERT(varchar(100),CheckSpecial.CheckTime, 23) AS DataTimeStr + ,'../HSSE/Check/CheckSpecialView.aspx?CheckSpecialId='+CheckSpecial.CheckSpecialId AS PCUrl +FROM Check_CheckSpecial AS CheckSpecial +LEFT JOIN Sys_User AS users ON users.UserId =@userId +LEFT JOIN Technique_CheckItemSet AS CheckItemSet ON CheckItemSet.CheckItemSetId =CheckSpecial.CheckItemSetId +WHERE CheckSpecial.ProjectId=@projectId and +dateadd(day,3,CheckSpecial.CheckTime)>getdate() and CheckSpecial.PartInPersonIds like '%'+@userId+'%' +UNION ALL +SELECT CheckColligationId AS DataId + ,'C198EBA8-9E23-4654-92E1-09C61105C522' AS MenuId + ,'ۺϼ' AS MenuName + ,case CheckType when '0' then 'ܼ' when '1' then '¼' else '' end AS Content + ,users.UserId + ,users.UserName + ,CheckColligation.CheckTime AS DataTime + ,CONVERT(varchar(100),CheckColligation.CheckTime, 23) AS DataTimeStr + ,'../HSSE/Check/CheckColligationEdit.aspx?CheckColligationId='+CheckColligation.CheckColligationId AS PCUrl +FROM Check_CheckColligation AS CheckColligation +LEFT JOIN Sys_User AS users ON users.UserId =@userId +LEFT JOIN Sys_FlowOperate AS FlowOperate ON CheckColligation.CheckColligationId=FlowOperate.DataId +LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId +WHERE CheckColligation.ProjectId=@projectId and FlowOperate.IsClosed <> 1 and FlowOperate.OperaterId=@userId +UNION ALL +SELECT PatrolPlanId AS DataId + ,'D256E5C8-DC76-4F4D-BABE-A253418823F4' AS MenuId + ,'Ѳ' AS MenuName + ,HazardListItem.HazardItems AS Content + ,UserId + ,users.UserName + ,PatrolPlan.LimitCheckDate AS DataTime + ,CONVERT(varchar(100),PatrolPlan.LimitCheckDate, 23) AS DataTimeStr + ,'../HSSE/Hazard/RoutingInspectionEdit.aspx?PatrolPlanId='+PatrolPlan.PatrolPlanId AS PCUrl +FROM Hazard_PatrolPlan AS PatrolPlan +LEFT JOIN Sys_User AS users ON users.UserId =@userId +LEFT JOIN Hazard_HazardSelectedItem AS HazardListItem on HazardListItem.HazardSelectedItemId=PatrolPlan.HazardSelectedItemId +WHERE HazardListItem.ProjectId=@projectId and +dateadd(day,-3,PatrolPlan.LimitCheckDate)=22 and (select COUNT(*) from JDGL_QuantityCompletion WHERE ProjectId=@projectId and DATENAME(year,GETDATE())=DATENAME(year,EndDate) and DATENAME(MONTH,GETDATE())=DATENAME(MONTH,EndDate))=0) +or (DATEADD(day,60,(select top 1 EndDate from JDGL_QuantityCompletion WHERE ProjectId=@projectId order by EndDate desc)) + diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index a4e7d619..fefebab6 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -5762,6 +5762,11 @@ namespace BLL /// public const string RectificationMeasureMenuId = "0629BAB1-DB1C-42CE-A333-49F3813617D7"; + /// + /// 工程量完成情况 + /// + public const string MonthPlanMenuId = "94287B92-7E96-4B90-BC6F-DAF30AE3B314"; + /// /// 进度完成情况 /// diff --git a/SGGL/BLL/JDGL/Check/MonthPlanService.cs b/SGGL/BLL/JDGL/Check/MonthPlanService.cs new file mode 100644 index 00000000..9b21c6f6 --- /dev/null +++ b/SGGL/BLL/JDGL/Check/MonthPlanService.cs @@ -0,0 +1,88 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace BLL +{ + /// + /// 月度计划情况 + /// + public class MonthPlanService + { + public static Model.SGGLDB db = Funs.DB; + + /// + /// 根据主键获取月度计划情况 + /// + /// + /// + public static Model.JDGL_MonthPlan GetMonthPlanById(string MonthPlanId) + { + return Funs.DB.JDGL_MonthPlan.FirstOrDefault(e => e.MonthPlanId == MonthPlanId); + } + + /// + /// 添加月度计划情况 + /// + /// + public static void AddMonthPlan(Model.JDGL_MonthPlan MonthPlan) + { + Model.SGGLDB db = Funs.DB; + Model.JDGL_MonthPlan newMonthPlan = new Model.JDGL_MonthPlan + { + MonthPlanId = MonthPlan.MonthPlanId, + ProjectId = MonthPlan.ProjectId, + Months = MonthPlan.Months, + UnitId = MonthPlan.UnitId, + NodeContent = MonthPlan.NodeContent, + PlanDate = MonthPlan.PlanDate, + DutyPerson = MonthPlan.DutyPerson, + RealDate = MonthPlan.RealDate, + Remark = MonthPlan.Remark, + CompileMan = MonthPlan.CompileMan, + CompileDate = MonthPlan.CompileDate, + }; + db.JDGL_MonthPlan.InsertOnSubmit(newMonthPlan); + db.SubmitChanges(); + } + + /// + /// 修改月度计划情况 + /// + /// + public static void UpdateMonthPlan(Model.JDGL_MonthPlan MonthPlan) + { + Model.SGGLDB db = Funs.DB; + Model.JDGL_MonthPlan newMonthPlan = db.JDGL_MonthPlan.FirstOrDefault(e => e.MonthPlanId == MonthPlan.MonthPlanId); + if (newMonthPlan != null) + { + newMonthPlan.UnitId = MonthPlan.UnitId; + newMonthPlan.NodeContent = MonthPlan.NodeContent; + newMonthPlan.PlanDate = MonthPlan.PlanDate; + newMonthPlan.DutyPerson = MonthPlan.DutyPerson; + newMonthPlan.RealDate = MonthPlan.RealDate; + newMonthPlan.Remark = MonthPlan.Remark; + newMonthPlan.CompileMan = MonthPlan.CompileMan; + newMonthPlan.CompileDate = MonthPlan.CompileDate; + + db.SubmitChanges(); + } + } + + /// + /// 根据主键删除月度计划情况 + /// + /// + public static void DeleteMonthPlanByMonthPlanId(string MonthPlanId) + { + Model.SGGLDB db = Funs.DB; + var q = (from x in db.JDGL_MonthPlan where x.MonthPlanId == MonthPlanId select x).FirstOrDefault(); + if (q != null) + { + db.JDGL_MonthPlan.DeleteOnSubmit(q); + db.SubmitChanges(); + } + } + } +} diff --git a/SGGL/BLL/JDGL/Check/QuantityCompletionService.cs b/SGGL/BLL/JDGL/Check/QuantityCompletionService.cs index 401eb7c0..ea800f4d 100644 --- a/SGGL/BLL/JDGL/Check/QuantityCompletionService.cs +++ b/SGGL/BLL/JDGL/Check/QuantityCompletionService.cs @@ -37,10 +37,11 @@ namespace BLL Months = quantityCompletion.Months, PlanNum = quantityCompletion.PlanNum, RealNum = quantityCompletion.RealNum, + NextNum = quantityCompletion.NextNum, CompileMan = quantityCompletion.CompileMan, CompileDate = quantityCompletion.CompileDate, - StartDate=quantityCompletion.StartDate, - EndDate=quantityCompletion.EndDate + StartDate = quantityCompletion.StartDate, + EndDate = quantityCompletion.EndDate }; db.JDGL_QuantityCompletion.InsertOnSubmit(newQuantityCompletion); db.SubmitChanges(); @@ -56,10 +57,29 @@ namespace BLL Model.JDGL_QuantityCompletion newQuantityCompletion = db.JDGL_QuantityCompletion.FirstOrDefault(e => e.QuantityCompletionId == quantityCompletion.QuantityCompletionId); if (newQuantityCompletion != null) { + newQuantityCompletion.QuantityListId = quantityCompletion.QuantityListId; newQuantityCompletion.PlanNum = quantityCompletion.PlanNum; newQuantityCompletion.RealNum = quantityCompletion.RealNum; + newQuantityCompletion.NextNum = quantityCompletion.NextNum; newQuantityCompletion.CompileMan = quantityCompletion.CompileMan; newQuantityCompletion.CompileDate = quantityCompletion.CompileDate; + newQuantityCompletion.StartDate = quantityCompletion.StartDate; + newQuantityCompletion.EndDate = quantityCompletion.EndDate; + db.SubmitChanges(); + } + } + + /// + /// 根据主键删除工程量完成情况 + /// + /// + public static void DeleteQuantityCompletionByQuantityCompletionId(string QuantityCompletionId) + { + Model.SGGLDB db = Funs.DB; + var q = (from x in db.JDGL_QuantityCompletion where x.QuantityCompletionId == QuantityCompletionId select x).FirstOrDefault(); + if (q != null) + { + db.JDGL_QuantityCompletion.DeleteOnSubmit(q); db.SubmitChanges(); } } diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx index 428b6f9f..e44e6139 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx @@ -402,7 +402,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs index 3ec68e33..8459a6b6 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs @@ -103,7 +103,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //加载所有专业 CNProfessionals = (from x in db.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId - && x.CNProfessionalId != BLL.Const.ComprehensiveId + //&& x.CNProfessionalId != BLL.Const.ComprehensiveId orderby x.SortIndex select new ProfessionalsClass { @@ -1542,19 +1542,28 @@ namespace FineUIPro.Web.CQMS.ManageReportNew // orderby y.UnitCode // select new { x.UnitId, y.UnitName }; units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList(); + var cqmsDetail = from c in db.View_CQMS_InspectionManagementDetail + join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin + from u in unitJoin.DefaultIfEmpty() + select new + { + c.CheckDate, + c.ProjectId, + u.UnitId, + u.UnitName, + c.IsOnceQualified + }; foreach (var item in units) { - var query = from c in db.View_CQMS_InspectionManagementDetail - join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin - from u in unitJoin.DefaultIfEmpty() - where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId + var query = from x in cqmsDetail + where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitId == item.UnitId select new { - c.CheckDate, - c.ProjectId, - u.UnitId, - u.UnitName, - c.IsOnceQualified + x.CheckDate, + x.ProjectId, + x.UnitId, + x.UnitName, + x.IsOnceQualified }; var AllList = query.ToList(); var monethCount = query diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx index 898e1075..2aa7e32d 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx @@ -401,7 +401,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs index bcc1e45d..0bbb6454 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs @@ -105,7 +105,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //加载所有专业 CNProfessionals = (from x in db.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId - && x.CNProfessionalId != BLL.Const.ComprehensiveId + //&& x.CNProfessionalId != BLL.Const.ComprehensiveId orderby x.SortIndex select new ProfessionalsClass { @@ -1546,19 +1546,28 @@ namespace FineUIPro.Web.CQMS.ManageReportNew // orderby y.UnitCode // select new { x.UnitId, y.UnitName }; units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList(); + var cqmsDetail = from c in db.View_CQMS_InspectionManagementDetail + join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin + from u in unitJoin.DefaultIfEmpty() + select new + { + c.CheckDate, + c.ProjectId, + u.UnitId, + u.UnitName, + c.IsOnceQualified + }; foreach (var item in units) { - var query = from c in db.View_CQMS_InspectionManagementDetail - join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin - from u in unitJoin.DefaultIfEmpty() - where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId + var query = from x in cqmsDetail + where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitId == item.UnitId select new { - c.CheckDate, - c.ProjectId, - u.UnitId, - u.UnitName, - c.IsOnceQualified + x.CheckDate, + x.ProjectId, + x.UnitId, + x.UnitName, + x.IsOnceQualified }; var AllList = query.ToList(); var monethCount = query diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/项目进度完成情况导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/项目进度完成情况导入模板.xls index 9f71b163..865b5692 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/项目进度完成情况导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/项目进度完成情况导入模板.xls differ diff --git a/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量周报.doc b/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量周报.doc index e8240f66..97ea9d3e 100644 Binary files a/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量周报.doc and b/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量周报.doc differ diff --git a/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量月报.doc b/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量月报.doc index e84a84a9..5bb59508 100644 Binary files a/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量月报.doc and b/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量月报.doc differ diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 0daf201e..772fde5b 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1378,6 +1378,7 @@ + @@ -13743,6 +13744,13 @@ MeterCompletionIn.aspx + + MonthPlan.aspx + ASPXCodeBehind + + + MonthPlan.aspx + PipelineCompletion.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx new file mode 100644 index 00000000..82708f7a --- /dev/null +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx @@ -0,0 +1,103 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MonthPlan.aspx.cs" Inherits="FineUIPro.Web.JDGL.Check.MonthPlan" %> + + + + + + 月度计划情况 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.cs new file mode 100644 index 00000000..86941399 --- /dev/null +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.cs @@ -0,0 +1,184 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.Data; +using System.Data.SqlClient; +using BLL; +using Newtonsoft.Json.Linq; + +namespace FineUIPro.Web.JDGL.Check +{ + public partial class MonthPlan : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + GetButtonPower(); + btnNew.OnClientClick = Window1.GetShowReference("MonthPlanEdit.aspx") + "return false;"; + this.txtMonths.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + BindGrid(); + } + } + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + if (Request.Params["value"] == BLL.Const._Null) + { + return; + } + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.MonthPlanMenuId); + if (buttonList.Count() > 0) + { + if (buttonList.Contains(BLL.Const.BtnSave)) + { + this.btnNew.Hidden = false; + this.btnModify.Hidden = false; + this.btnMenuDel.Hidden = false; + } + } + } + #endregion + + protected void btnModify_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MonthPlanEdit.aspx?Months={0}", this.txtMonths.Text, "编辑 - "))); + } + + /// + /// 加载Grid + /// + private void BindGrid() + { + string strSql = @"select qc.MonthPlanId,(select PlanNum from JDGL_MonthPlan where QuantityListId=ql.QuantityListId and Months=@month) as PlanNum, + (select RealNum from JDGL_MonthPlan where QuantityListId=ql.QuantityListId and Months=@month) as RealNum, + (select NextNum from JDGL_MonthPlan where QuantityListId=ql.QuantityListId and Months=@month) as NextNum,ql.DesignNum,ql.Name,ql.Unit,ql.SortIndex, + CONVERT(FLOAT, (select sum(ISNULL(PlanNum, 0)) from JDGL_MonthPlan where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month)) as TotalPlanNum, + CONVERT(FLOAT, (select sum(ISNULL(RealNum, 0)) from JDGL_MonthPlan where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month)) as TotalRealNum, + CONVERT(NVARCHAR(10), ((CAST(CASE ISNULL(qc.PlanNum, 0) WHEN 0 THEN 0 + + ELSE 100 * ISNULL(qc.RealNum, 0) / (1.0 * qc.PlanNum) END AS DECIMAL(9, 2))))) + '%' + + AS Rate, + CONVERT(NVARCHAR(10), ((CAST(CASE(select sum(ISNULL(PlanNum, 0)) from JDGL_MonthPlan where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month) WHEN 0 THEN 0 + + ELSE 100 * (select sum(ISNULL(RealNum, 0)) from JDGL_MonthPlan where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month) / (1.0 * (select sum(ISNULL(PlanNum, 0)) from JDGL_MonthPlan where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month)) END AS DECIMAL(9, 2)))))+'%' + + AS TotalRate, + CONVERT(NVARCHAR(10), ((CAST(CASE ISNULL(ql.DesignNum, 0) WHEN 0 THEN 0 + + ELSE 100 * (select sum(ISNULL(RealNum, 0)) from JDGL_MonthPlan where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month) / (1.0 * ql.DesignNum) END AS DECIMAL(9, 2)))))+'%' + + AS SumRate, + CONVERT(FLOAT, (select sum(ISNULL(PlanNum, 0)) from JDGL_MonthPlan where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months < qc.Months)) as LastTotalPlanNum, + CONVERT(FLOAT, (select sum(ISNULL(RealNum, 0)) from JDGL_MonthPlan where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months < qc.Months)) as LastTotalRealNum + from[dbo].JDGL_QuantityList ql + left join dbo.[JDGL_MonthPlan] qc on ql.QuantityListId=qc.QuantityListId +where qc.MonthPlanId=(select top 1 MonthPlanId from[JDGL_MonthPlan] q where q.QuantityListId=qc.QuantityListId and q.Months<=@month order by q.Months desc) and qc.ProjectId=@ProjectId order by ql.SortIndex, ql.Name"; + //string strSql = @"select * + // from dbo.View_JDGL_MonthPlan qc + // where qc.ProjectId=@ProjectId order by qc.SortIndex, qc.Name"; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@month", string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(this.txtMonths.Text.Trim() + "-01")))); + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + //tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + #region 月份选择事件 + /// + /// 月份选择事件 + /// + /// + /// + protected void txtMonths_TextChanged(object sender, EventArgs e) + { + BindGrid(); + } + #endregion + + #region 保存按钮 + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (this.Grid1.Rows.Count > 0) + { + JArray mergedData = Grid1.GetMergedData(); + foreach (JObject mergedRow in mergedData) + { + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + Model.JDGL_MonthPlan MonthPlan = BLL.MonthPlanService.GetMonthPlanById(this.Grid1.Rows[i].RowID); + if (MonthPlan != null) + { + MonthPlan.CompileMan = this.CurrUser.UserId; + MonthPlan.CompileDate = DateTime.Now; + BLL.MonthPlanService.UpdateMonthPlan(MonthPlan); + } + } + Alert.ShowInTop("保存成功！", MessageBoxIcon.Success); + } + else + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + } + #endregion + + protected void btnMenuDel_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + BLL.MonthPlanService.DeleteMonthPlanByMonthPlanId(rowID); + } + + BindGrid(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + } + } + + #region 导入 + /// + /// 导入按钮 + /// + /// + /// + protected void btnImport_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MonthPlanIn.aspx?ProjectId={0}", this.CurrUser.LoginProjectId, "导入 - "))); + } + + /// + /// 关闭导入弹出窗口 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.designer.cs new file mode 100644 index 00000000..48d93b0d --- /dev/null +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.designer.cs @@ -0,0 +1,141 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.JDGL.Check { + + + public partial class MonthPlan { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// txtMonths 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtMonths; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// btnModify 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnModify; + + /// + /// btnImport 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnImport; + + /// + /// lblPageIndex 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblPageIndex; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuDel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDel; + } +} diff --git a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx index eaeb9804..0939df71 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx +++ b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx @@ -23,13 +23,19 @@ -
- diff --git a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx.cs index 5e735e42..95013fdc 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx.cs @@ -18,6 +18,8 @@ namespace FineUIPro.Web.JDGL.Check if (!IsPostBack) { GetButtonPower(); + btnNew.OnClientClick = Window1.GetShowReference("QuantityCompletionEdit.aspx") + "return false;"; + this.txtMonths.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); BindGrid(); } } @@ -39,21 +41,17 @@ namespace FineUIPro.Web.JDGL.Check { if (buttonList.Contains(BLL.Const.BtnSave)) { - this.btnMenuModify.Hidden = false; + this.btnNew.Hidden = false; + this.btnModify.Hidden = false; this.btnMenuDel.Hidden = false; } } } #endregion - protected void btnMenuModify_Click(object sender, EventArgs e) + protected void btnModify_Click(object sender, EventArgs e) { - if (Grid1.SelectedRowIndexArray.Length == 0) - { - Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning); - return; - } - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("QuantityCompletionEdit.aspx?QuantityCompletionId={0}", Grid1.SelectedRowID, "编辑 - "))); + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("QuantityCompletionEdit.aspx?Months={0}", this.txtMonths.Text, "编辑 - "))); } /// @@ -90,11 +88,37 @@ namespace FineUIPro.Web.JDGL.Check private void BindGrid() { //GetQuantityCompletion(); - string strSql = @"select * - from dbo.View_JDGL_QuantityCompletion qc - where qc.ProjectId=@ProjectId order by qc.SortIndex, qc.Name"; + string strSql = @"select qc.QuantityCompletionId,(select PlanNum from JDGL_QuantityCompletion where QuantityListId=ql.QuantityListId and Months=@month) as PlanNum, + (select RealNum from JDGL_QuantityCompletion where QuantityListId=ql.QuantityListId and Months=@month) as RealNum, + (select NextNum from JDGL_QuantityCompletion where QuantityListId=ql.QuantityListId and Months=@month) as NextNum,ql.DesignNum,ql.Name,ql.Unit,ql.SortIndex, + CONVERT(FLOAT, (select sum(ISNULL(PlanNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month)) as TotalPlanNum, + CONVERT(FLOAT, (select sum(ISNULL(RealNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month)) as TotalRealNum, + CONVERT(NVARCHAR(10), ((CAST(CASE ISNULL(qc.PlanNum, 0) WHEN 0 THEN 0 + + ELSE 100 * ISNULL(qc.RealNum, 0) / (1.0 * qc.PlanNum) END AS DECIMAL(9, 2))))) + '%' + + AS Rate, + CONVERT(NVARCHAR(10), ((CAST(CASE(select sum(ISNULL(PlanNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month) WHEN 0 THEN 0 + + ELSE 100 * (select sum(ISNULL(RealNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month) / (1.0 * (select sum(ISNULL(PlanNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month)) END AS DECIMAL(9, 2)))))+'%' + + AS TotalRate, + CONVERT(NVARCHAR(10), ((CAST(CASE ISNULL(ql.DesignNum, 0) WHEN 0 THEN 0 + + ELSE 100 * (select sum(ISNULL(RealNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month) / (1.0 * ql.DesignNum) END AS DECIMAL(9, 2)))))+'%' + + AS SumRate, + CONVERT(FLOAT, (select sum(ISNULL(PlanNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months < qc.Months)) as LastTotalPlanNum, + CONVERT(FLOAT, (select sum(ISNULL(RealNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months < qc.Months)) as LastTotalRealNum + from[dbo].JDGL_QuantityList ql + left join dbo.[JDGL_QuantityCompletion] qc on ql.QuantityListId=qc.QuantityListId +where qc.QuantityCompletionId=(select top 1 QuantityCompletionId from[JDGL_QuantityCompletion] q where q.QuantityListId=qc.QuantityListId and q.Months<=@month order by q.Months desc) and qc.ProjectId=@ProjectId order by ql.SortIndex, ql.Name"; + //string strSql = @"select * + // from dbo.View_JDGL_QuantityCompletion qc + // where qc.ProjectId=@ProjectId order by qc.SortIndex, qc.Name"; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@month", string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(this.txtMonths.Text.Trim() + "-01")))); SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); Grid1.RecordCount = tb.Rows.Count; @@ -163,8 +187,8 @@ namespace FineUIPro.Web.JDGL.Check { foreach (int rowIndex in Grid1.SelectedRowIndexArray) { - string rowID = Grid1.DataKeys[rowIndex][1].ToString(); - BLL.QuantityCompletionService.DeleteQuantityCompletionById(rowID); + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + BLL.QuantityCompletionService.DeleteQuantityCompletionByQuantityCompletionId(rowID); } BindGrid(); diff --git a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx.designer.cs index 97e18dcf..fd82f08f 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx.designer.cs @@ -75,6 +75,24 @@ namespace FineUIPro.Web.JDGL.Check { /// protected global::FineUIPro.Button btnSave; + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// btnModify 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnModify; + /// /// btnImport 控件。 /// @@ -111,15 +129,6 @@ namespace FineUIPro.Web.JDGL.Check { /// protected global::FineUIPro.Menu Menu1; - /// - /// btnMenuModify 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.MenuButton btnMenuModify; - /// /// btnMenuDel 控件。 /// diff --git a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx index 32efedc9..c37ac7fd 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx +++ b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx @@ -4,15 +4,122 @@ - +
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + + + + + + + + + + + + + + + + + + + @@ -23,6 +130,11 @@ + + + + + @@ -37,7 +149,7 @@ - + --%> diff --git a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx.cs index c802d8f4..a5db92db 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx.cs @@ -1,4 +1,5 @@ using BLL; +using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.Linq; @@ -10,20 +11,6 @@ namespace FineUIPro.Web.JDGL.Check { public partial class QuantityCompletionEdit : PageBase { - /// - /// id - /// - public string QuantityCompletionId - { - get - { - return (string)ViewState["QuantityCompletionId"]; - } - set - { - ViewState["QuantityCompletionId"] = value; - } - } /// /// 项目id /// @@ -42,58 +29,171 @@ namespace FineUIPro.Web.JDGL.Check { if (!IsPostBack) { - - this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); - QuantityCompletionId = Request.Params["QuantityCompletionId"]; - if (!string.IsNullOrEmpty(QuantityCompletionId)) + DateTime months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString() + "-01"); + if (!string.IsNullOrEmpty(Request.Params["Months"])) { - - Model.JDGL_QuantityCompletion QuantityCompletion = BLL.QuantityCompletionService.GetQuantityCompletionById(QuantityCompletionId); - if (QuantityCompletion != null) - { - this.ProjectId = QuantityCompletion.ProjectId; - if (QuantityCompletion.PlanNum != null) - { - this.txtPlanNum.Text = QuantityCompletion.PlanNum.ToString(); - } - if (QuantityCompletion.RealNum != null) - { - this.txtRealNum.Text = QuantityCompletion.RealNum.ToString(); - } - } + months = Convert.ToDateTime(Request.Params["Months"] + "-01"); } + this.txtMonth.Text = string.Format("{0:yyyy-MM}", months); + BindGrid(); } } + /// + /// 加载Grid + /// + private void BindGrid() + { + DateTime months = Convert.ToDateTime(this.txtMonth.Text + "-01"); + Model.SGGLDB db = Funs.DB; + Grid1.DataSource = from x in db.JDGL_QuantityList + where x.ProjectId == this.CurrUser.LoginProjectId + orderby x.SortIndex, x.Name + select new + { + x.QuantityListId, + x.Name, + x.Unit, + x.DesignNum, + PlanNum = (from y in db.JDGL_QuantityCompletion where y.ProjectId == this.CurrUser.LoginProjectId && y.Months == months && y.QuantityListId == x.QuantityListId select y.PlanNum).First(), + RealNum = (from y in db.JDGL_QuantityCompletion where y.ProjectId == this.CurrUser.LoginProjectId && y.Months == months && y.QuantityListId == x.QuantityListId select y.RealNum).First(), + NextNum = (from y in db.JDGL_QuantityCompletion where y.ProjectId == this.CurrUser.LoginProjectId && y.Months == months && y.QuantityListId == x.QuantityListId select y.NextNum).First(), + }; + Grid1.DataBind(); + } + + #region 月份选择事件 + /// + /// 月份选择事件 + /// + /// + /// + protected void txtMonths_TextChanged(object sender, EventArgs e) + { + BindGrid(); + } + #endregion + protected void btnSave_Click(object sender, EventArgs e) { + if (string.IsNullOrEmpty(this.txtMonth.Text)) + { + ShowNotify("请选择月份！", MessageBoxIcon.Warning); + } SaveData(true); } private void SaveData(bool bl) { - string QuantityCompletionId = Request.Params["QuantityCompletionId"]; - Model.JDGL_QuantityCompletion QuantityCompletion = new Model.JDGL_QuantityCompletion(); - if (!string.IsNullOrEmpty(this.txtPlanNum.Text.Trim())) + DateTime months = Convert.ToDateTime(this.txtMonth.Text + "-01"); + var list = GetDetails(); + Model.SGGLDB db = Funs.DB; + foreach (var item in list) { - QuantityCompletion.PlanNum = Convert.ToDecimal(this.txtPlanNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtRealNum.Text.Trim())) - { - QuantityCompletion.RealNum = Convert.ToDecimal(this.txtRealNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(QuantityCompletionId)) - { - QuantityCompletion.QuantityCompletionId = QuantityCompletionId; - BLL.QuantityCompletionService.UpdateQuantityCompletion(QuantityCompletion); - } - else - { - QuantityCompletion.QuantityCompletionId = SQLHelper.GetNewID(typeof(Model.JDGL_QuantityCompletion)); - BLL.QuantityCompletionService.AddQuantityCompletion(QuantityCompletion); + string quantityListId = string.Empty; + var oldQuantityList = db.JDGL_QuantityList.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.Name == item.Name); + if (oldQuantityList == null) + { + Model.JDGL_QuantityList newQuantityList = new Model.JDGL_QuantityList(); + quantityListId = SQLHelper.GetNewID(typeof(Model.JDGL_QuantityList)); + newQuantityList.QuantityListId = quantityListId; + newQuantityList.ProjectId = this.CurrUser.LoginProjectId; + newQuantityList.Name = item.Name; + newQuantityList.Unit = item.Unit; + newQuantityList.DesignNum = item.DesignNum; + BLL.QuantityListService.AddQuantityList(newQuantityList); + } + else + { + quantityListId = oldQuantityList.QuantityListId; + oldQuantityList.Unit = item.Unit; + oldQuantityList.DesignNum = item.DesignNum; + BLL.QuantityListService.UpdateQuantityList(oldQuantityList); + } + var oldQuantityCompletion = db.JDGL_QuantityCompletion.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.QuantityListId == quantityListId && x.Months == months); + if (oldQuantityCompletion == null) + { + Model.JDGL_QuantityCompletion QuantityCompletion = new Model.JDGL_QuantityCompletion(); + QuantityCompletion.QuantityCompletionId = SQLHelper.GetNewID(typeof(Model.JDGL_QuantityCompletion)); + QuantityCompletion.PlanNum = item.PlanNum; + QuantityCompletion.RealNum = item.RealNum; + QuantityCompletion.NextNum = item.NextNum; + QuantityCompletion.Months = months; + QuantityCompletion.QuantityListId = quantityListId; + QuantityCompletion.CompileMan = this.CurrUser.UserId; + QuantityCompletion.CompileDate = DateTime.Now; + QuantityCompletion.ProjectId = this.CurrUser.LoginProjectId; + BLL.QuantityCompletionService.AddQuantityCompletion(QuantityCompletion); + } + else + { + oldQuantityCompletion.PlanNum = item.PlanNum; + oldQuantityCompletion.RealNum = item.RealNum; + oldQuantityCompletion.NextNum = item.NextNum; + BLL.QuantityCompletionService.UpdateQuantityCompletion(oldQuantityCompletion); + } } ShowNotify("保存成功！", MessageBoxIcon.Success); PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); } + + #region 增加按钮事件 + /// + /// 增加按钮事件 + /// + /// + /// + protected void btnNew_Click(object sender, EventArgs e) + { + var list = GetDetails(); + Model.View_JDGL_QuantityCompletion ql = new Model.View_JDGL_QuantityCompletion(); + ql.QuantityListId = SQLHelper.GetNewID(); + list.Add(ql); + Grid1.DataSource = list; + Grid1.DataBind(); + } + private List GetDetails() + { + List list = new List(); + foreach (JObject mergedRow in Grid1.GetMergedData()) + { + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + Model.View_JDGL_QuantityCompletion ql = new Model.View_JDGL_QuantityCompletion(); + ql.QuantityListId = Grid1.Rows[i].RowID; + ql.Name = values.Value("Name"); + ql.Unit = values.Value("Unit"); + ql.DesignNum = Funs.GetNewDecimal(values.Value("DesignNum")); + ql.PlanNum = Funs.GetNewDecimal(values.Value("PlanNum")); + ql.RealNum = Funs.GetNewDecimal(values.Value("RealNum")); + ql.NextNum = Funs.GetNewDecimal(values.Value("NextNum")); + list.Add(ql); + } + return list; + } + #endregion + + #region 行点击事件 + /// + /// Grid行点击事件 + /// + /// + /// + protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) + { + string quantityListId = Grid1.DataKeys[e.RowIndex][0].ToString(); + var list = GetDetails(); + if (e.CommandName == "del")//删除 + { + var Report = list.FirstOrDefault(x => x.QuantityListId == quantityListId); + if (Report != null) + { + list.Remove(Report); + } + this.Grid1.DataSource = list; + this.Grid1.DataBind(); + } + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx.designer.cs index c474d371..009ff37b 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx.designer.cs @@ -31,13 +31,112 @@ namespace FineUIPro.Web.JDGL.Check { protected global::FineUIPro.PageManager PageManager1; /// - /// SimpleForm1 控件。 + /// Panel17 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Form SimpleForm1; + protected global::FineUIPro.Panel Panel17; + + /// + /// Toolbar5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar5; + + /// + /// txtMonth 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtMonth; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// Form15 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form15; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar3; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label1; + + /// + /// txtName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtName; + + /// + /// txtUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtUnit; + + /// + /// txtDesignNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtDesignNum; /// /// txtPlanNum 控件。 @@ -58,39 +157,12 @@ namespace FineUIPro.Web.JDGL.Check { protected global::FineUIPro.NumberBox txtRealNum; /// - /// Toolbar1 控件。 + /// txtNextNum 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Toolbar Toolbar1; - - /// - /// hdCheckerId 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.HiddenField hdCheckerId; - - /// - /// btnSave 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnSave; - - /// - /// btnClose 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnClose; + protected global::FineUIPro.NumberBox txtNextNum; } } diff --git a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx index 7b40e96f..0b91d671 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx +++ b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx @@ -15,10 +15,7 @@ - - - @@ -49,7 +46,7 @@ @@ -74,6 +71,9 @@ + + diff --git a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx.cs index d6c468f9..65d06f96 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx.cs @@ -150,7 +150,7 @@ namespace FineUIPro.Web.JDGL.Check oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL(ds.Tables[0], 5); + AddDatasetToSQL(ds.Tables[0], 6); } catch (Exception ex) { @@ -242,6 +242,19 @@ namespace FineUIPro.Web.JDGL.Check { result += "第" + (i + 2).ToString() + "行," + "实际完成" + "," + "此项为必填项！" + "|"; } + + string col5 = pds.Rows[i][5].ToString().Trim(); + if (!string.IsNullOrEmpty(col5)) + { + try + { + decimal dec = Convert.ToDecimal(col5); + } + catch (Exception) + { + result += "第" + (i + 2).ToString() + "行," + "下月计划" + "," + "[" + col5 + "]错误！" + "|"; + } + } } if (!string.IsNullOrEmpty(result)) { @@ -334,7 +347,7 @@ namespace FineUIPro.Web.JDGL.Check oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL2(ds.Tables[0], 5); + AddDatasetToSQL2(ds.Tables[0], 6); } catch (Exception ex) { @@ -371,6 +384,7 @@ namespace FineUIPro.Web.JDGL.Check string col2 = pds.Rows[i][2].ToString().Trim(); string col3 = pds.Rows[i][3].ToString().Trim(); string col4 = pds.Rows[i][4].ToString().Trim(); + string col5 = pds.Rows[i][5].ToString().Trim(); if (!string.IsNullOrEmpty(col0))//类型 { quantityCompletion.Name = col0; @@ -387,10 +401,14 @@ namespace FineUIPro.Web.JDGL.Check { quantityCompletion.PlanNum = Funs.GetNewDecimalOrZero(col3); } - if (!string.IsNullOrEmpty(col4))//计划完成 + if (!string.IsNullOrEmpty(col4))//实际完成 { quantityCompletion.RealNum = Funs.GetNewDecimalOrZero(col4); } + if (!string.IsNullOrEmpty(col5))//下月计划 + { + quantityCompletion.NextNum = Funs.GetNewDecimalOrZero(col5); + } quantityCompletion.QuantityCompletionId = SQLHelper.GetNewID(typeof(Model.JDGL_QuantityCompletion)); quantityCompletions.Add(quantityCompletion); } @@ -418,9 +436,9 @@ namespace FineUIPro.Web.JDGL.Check /// protected void btnSave_Click(object sender, EventArgs e) { - if (string.IsNullOrEmpty(this.txtStartDate.Text.Trim()) || string.IsNullOrEmpty(this.txtEndDate.Text.Trim())) + if (string.IsNullOrEmpty(this.txtMonth.Text.Trim())) { - ShowNotify("请选择开始、结束日期！", MessageBoxIcon.Warning); + ShowNotify("请选择月份！", MessageBoxIcon.Warning); return; } if (string.IsNullOrEmpty(errorInfos)) @@ -429,8 +447,7 @@ namespace FineUIPro.Web.JDGL.Check var quantityCompletionLists = from x in Funs.DB.JDGL_QuantityCompletion where x.ProjectId == this.ProjectId select x; string quantityListId = string.Empty; int a = quantityCompletions.Count(); - DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); - DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + DateTime month = Convert.ToDateTime(this.txtMonth.Text.Trim()); for (int i = 0; i < a; i++) { var oldQuantityList = quantityLists.FirstOrDefault(x => x.ProjectId == this.ProjectId && x.Name == quantityCompletions[i].Name); @@ -452,7 +469,7 @@ namespace FineUIPro.Web.JDGL.Check oldQuantityList.DesignNum = quantityCompletions[i].DesignNum; BLL.QuantityListService.UpdateQuantityList(oldQuantityList); } - var oldQuantityCompletion = quantityCompletionLists.FirstOrDefault(x => x.ProjectId == this.ProjectId && x.QuantityListId == quantityListId && x.StartDate == startDate && x.EndDate == endDate); + var oldQuantityCompletion = quantityCompletionLists.FirstOrDefault(x => x.ProjectId == this.ProjectId && x.QuantityListId == quantityListId && x.Months == month); if (oldQuantityCompletion == null) { Model.JDGL_QuantityCompletion newQuantityCompletion = new Model.JDGL_QuantityCompletion(); @@ -461,16 +478,17 @@ namespace FineUIPro.Web.JDGL.Check newQuantityCompletion.QuantityListId = quantityListId; newQuantityCompletion.PlanNum = quantityCompletions[i].PlanNum; newQuantityCompletion.RealNum = quantityCompletions[i].RealNum; + newQuantityCompletion.NextNum = quantityCompletions[i].NextNum; newQuantityCompletion.CompileMan = this.CurrUser.UserId; newQuantityCompletion.CompileDate = DateTime.Now; - newQuantityCompletion.StartDate = startDate; - newQuantityCompletion.EndDate = endDate; + newQuantityCompletion.Months = month; BLL.QuantityCompletionService.AddQuantityCompletion(newQuantityCompletion); } else { oldQuantityCompletion.PlanNum= quantityCompletions[i].PlanNum; oldQuantityCompletion.RealNum= quantityCompletions[i].RealNum; + oldQuantityCompletion.NextNum = quantityCompletions[i].NextNum; BLL.QuantityCompletionService.UpdateQuantityCompletion(oldQuantityCompletion); } } diff --git a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx.designer.cs index a6af568c..f094f32d 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx.designer.cs @@ -49,22 +49,13 @@ namespace FineUIPro.Web.JDGL.Check { protected global::FineUIPro.Toolbar Toolbar2; /// - /// txtStartDate 控件。 + /// txtMonth 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DatePicker txtStartDate; - - /// - /// txtEndDate 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DatePicker txtEndDate; + protected global::FineUIPro.DatePicker txtMonth; /// /// btnAudit 控件。 diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/FeedingRunApplication.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/FeedingRunApplication.aspx.cs index f346ae2e..5120677f 100644 --- a/SGGL/FineUIPro.Web/TestRun/Feeding/FeedingRunApplication.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/FeedingRunApplication.aspx.cs @@ -42,7 +42,7 @@ namespace FineUIPro.Web.TestRun.Feeding var inspectTerms = Funs.DB.FeedingRun_SubInspectTerm.Where(x => x.InspectIsClose == 1).ToList(); if (inspectTerms.Count == 0) return; var subInstallationIds = inspectTerms.ConvertAll(x => x.InstallationId); - var list = Funs.DB.PreRun_SysDevice.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1 && subInstallationIds.Contains(x.PreRunId)); + var list = Funs.DB.PreRun_SysDevice.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1 && subInstallationIds.Contains(x.PreRunId)).OrderBy(a => a.Sort); if (list.Count() > 0) { foreach (var item in list) diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermList.aspx.cs index 4e6bc5e0..92a8f4e3 100644 --- a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermList.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermList.aspx.cs @@ -38,7 +38,7 @@ namespace FineUIPro.Web.TestRun.Feeding var userSubInspects = Funs.DB.FeedingRun_SubInspectTermItem.Where(x => x.InspectedUser == this.CurrUser.UserId && x.InspectionResults == 0).ToList(); if (userSubInspects.Count == 0) return; var subInstallationIds = userSubInspects.ConvertAll(x => x.InstallationId); - var list = Funs.DB.PreRun_SysDevice.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1 && subInstallationIds.Contains(x.PreRunId)); + var list = Funs.DB.PreRun_SysDevice.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1 && subInstallationIds.Contains(x.PreRunId)).OrderBy(a => a.Sort); if (list.Count() > 0) { foreach (var item in list) diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPassList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPassList.aspx.cs index 9827ed08..09007559 100644 --- a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPassList.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPassList.aspx.cs @@ -38,7 +38,7 @@ namespace FineUIPro.Web.TestRun.Feeding var inspectTerms = Funs.DB.FeedingRun_SubInspectTerm.Where(x => x.InspectionIsAllPass == 1).ToList(); if (inspectTerms.Count == 0) return; var subInstallationIds = inspectTerms.ConvertAll(x => x.InstallationId); - var list = Funs.DB.PreRun_SysDevice.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1 && subInstallationIds.Contains(x.PreRunId)); + var list = Funs.DB.PreRun_SysDevice.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1 && subInstallationIds.Contains(x.PreRunId)).OrderBy(a => a.Sort); if (list.Count() > 0) { foreach (var item in list) diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutList.aspx.cs index 7ecbe513..15267545 100644 --- a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutList.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutList.aspx.cs @@ -39,7 +39,7 @@ namespace FineUIPro.Web.TestRun.Feeding var inspectTerms = Funs.DB.FeedingRun_SubInspectTerm.Where(x => (x.DriverCharge == this.CurrUser.UserId && x.InspectionIsAllPass == 1) || (x.DrivingManager == this.CurrUser.UserId && x.InspectionIsAllPass == 1) || (x.ProjectManager == this.CurrUser.UserId && x.InspectionIsAllPass == 1)).ToList(); if (inspectTerms.Count == 0) return; var subInstallationIds = inspectTerms.ConvertAll(x => x.InstallationId); - var list = Funs.DB.PreRun_SysDevice.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1 && subInstallationIds.Contains(x.PreRunId)); + var list = Funs.DB.PreRun_SysDevice.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1 && subInstallationIds.Contains(x.PreRunId)).OrderBy(a => a.Sort); if (list.Count() > 0) { var ids = list.Select(x => x.ProcessesId).ToList(); diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTerm.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTerm.aspx.cs index 0ea4804e..a215f8ea 100644 --- a/SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTerm.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTerm.aspx.cs @@ -37,7 +37,7 @@ namespace FineUIPro.Web.TestRun.Feeding rootNode.ToolTip = ""; rootNode.EnableClickEvent = true; this.tvControlItem.Nodes.Add(rootNode); - var list = Funs.DB.PreRun_SysDevice.Where(a => a.ProjectId == this.CurrUser.LoginProjectId && a.PreRunLevel == 1); + var list = Funs.DB.PreRun_SysDevice.Where(a => a.ProjectId == this.CurrUser.LoginProjectId && a.PreRunLevel == 1).OrderBy(a => a.Sort); if (list.Count() > 0) { foreach (var item in list) diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/SubWorkInspect.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/SubWorkInspect.aspx.cs index 84f4156b..c5074abe 100644 --- a/SGGL/FineUIPro.Web/TestRun/Feeding/SubWorkInspect.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/SubWorkInspect.aspx.cs @@ -34,10 +34,10 @@ namespace FineUIPro.Web.TestRun.Feeding rootNode.ToolTip = ""; rootNode.EnableClickEvent = true; this.tvControlItem.Nodes.Add(rootNode); - var userSubInspects = Funs.DB.FeedingRun_SubInspectTermItem.Where(x => x.InspectedUser == this.CurrUser.UserId).ToList(); + var userSubInspects = Funs.DB.FeedingRun_SubInspectTermItem.Where(x => x.InspectedUser == this.CurrUser.UserId).OrderBy(a => a.Sort).ToList(); if (userSubInspects.Count == 0) return; var subInstallationIds = userSubInspects.ConvertAll(x => x.InstallationId); - var list = Funs.DB.PreRun_SysDevice.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1 && subInstallationIds.Contains(x.PreRunId)); + var list = Funs.DB.PreRun_SysDevice.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1 && subInstallationIds.Contains(x.PreRunId)).OrderBy(a => a.Sort); if (list.Count() > 0) { foreach (var item in list) diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApproveList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApproveList.aspx.cs index f6f6d357..b01bde74 100644 --- a/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApproveList.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApproveList.aspx.cs @@ -46,7 +46,7 @@ namespace FineUIPro.Web.TestRun.Feeding var userSubInspects = Funs.DB.FeedingRun_SubInspectTermItem.Where(x => termIds.Contains(x.TermItemId) && x.ProjectId == this.CurrUser.LoginProjectId).ToList(); if (userSubInspects.Count() == 0) return; var subInstallationIds = userSubInspects.ConvertAll(x => x.InstallationId); - var list = Funs.DB.PreRun_SysDevice.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1 && subInstallationIds.Contains(x.PreRunId)); + var list = Funs.DB.PreRun_SysDevice.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1 && subInstallationIds.Contains(x.PreRunId)).OrderBy(a => a.Sort); if (list.Count() > 0) { var ids = list.Select(x => x.ProcessesId).ToList(); diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandleList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandleList.aspx.cs index e4f65791..5afc2ef3 100644 --- a/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandleList.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandleList.aspx.cs @@ -45,7 +45,7 @@ namespace FineUIPro.Web.TestRun.Feeding var userSubInspects = Funs.DB.FeedingRun_SubInspectTermItem.Where(x => termIds.Contains(x.TermItemId) && x.ProjectId == this.CurrUser.LoginProjectId).ToList(); if (userSubInspects.Count == 0) return; var subInstallationIds = userSubInspects.ConvertAll(x => x.InstallationId); - var list = Funs.DB.PreRun_SysDevice.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1 && subInstallationIds.Contains(x.PreRunId)); + var list = Funs.DB.PreRun_SysDevice.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1 && subInstallationIds.Contains(x.PreRunId)).OrderBy(a => a.Sort); if (list.Count() > 0) { foreach (var item in list) diff --git a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx index b4b3642a..ff84b5d7 100644 --- a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx +++ b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx @@ -57,6 +57,16 @@ + + + + + + @@ -107,8 +117,8 @@ - - + + diff --git a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx.cs index d56b9dfe..78739ad3 100644 --- a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx.cs @@ -24,10 +24,54 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun if (!IsPostBack) { //绑定数据 + InitTreeMenu(); BindGrid(); } } + #region 树绑定 + + /// + /// 加载树 + /// + private void InitTreeMenu() + { + this.tvControlItem.Nodes.Clear(); + TreeNode rootNode = new TreeNode(); + rootNode.Text = "装置"; + rootNode.NodeID = "0"; + rootNode.Expanded = true; + rootNode.ToolTip = ""; + rootNode.EnableClickEvent = true; + this.tvControlItem.Nodes.Add(rootNode); + var list = Funs.DB.PreRun_SysDevice.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1).OrderBy(x => x.Sort).ToList(); + if (list.Count() > 0) + { + foreach (var itemOne in list) + { + TreeNode rootOneNode = new TreeNode(); + rootOneNode.NodeID = itemOne.PreRunId; + rootOneNode.Text = itemOne.PreRunName; + rootOneNode.ToolTip = itemOne.PreRunName; + rootOneNode.CommandName = ""; + rootOneNode.EnableClickEvent = true; + rootOneNode.EnableExpandEvent = false; + rootNode.Nodes.Add(rootOneNode); + rootOneNode.Expanded = true; + } + } + } + + /// + /// 点击TreeView + /// + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + this.BindGrid(); + } + + #endregion + #region 绑定数据 /// @@ -39,6 +83,14 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun string strSql = @"select a.RunningId,a.ProjectId,project.ProjectName as ProjectName,a.InstallationId,a.ProcessesId,a.SystemId,inst.PreRunName as InstallationName,proce.PreRunName as ProcessesName,syst.PreRunName as SystemName,a.JobNo,a.ShiftType,(case a.ShiftType when 1 then '白班' else '夜班' end) as ShiftTypeName,a.ShiftUser,shiftuser.UserName as ShiftUserName,a.SuccessionUser,successuser.UserName as SuccessionUserName,a.StartData,a.EndData,a.AddUser,a.AddTime,a.Sort from Running_LogManagement as a inner join Sys_User as shiftuser on shiftuser.UserId=a.ShiftUser inner join Sys_User as successuser on successuser.UserId=a.SuccessionUser inner join Base_Project as project on project.ProjectId=a.ProjectId inner join PreRun_SysDevice as inst on inst.PreRunId=a.InstallationId inner join PreRun_SysDevice as proce on proce.PreRunId=a.ProcessesId inner join PreRun_SysDevice as syst on syst.PreRunId=a.SystemId where a.ProjectId=@ProjectId "; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + if (!string.IsNullOrWhiteSpace(this.tvControlItem.SelectedNodeID)) + { + if (this.tvControlItem.SelectedNodeID != "0" && !string.IsNullOrWhiteSpace(this.tvControlItem.SelectedNodeID)) + { + strSql += " and a.InstallationId=@InstallationId"; + listStr.Add(new SqlParameter("@InstallationId", this.tvControlItem.SelectedNodeID)); + } + } if (!string.IsNullOrWhiteSpace(txtStartData.Text)) { strSql += " and a.StartData>=@StartData"; diff --git a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx.designer.cs index 96b43d03..7db22016 100644 --- a/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx.designer.cs @@ -41,6 +41,24 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun /// protected global::FineUIPro.Panel Panel1; + /// + /// panelLeftRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelLeftRegion; + + /// + /// tvControlItem 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tree tvControlItem; + /// /// Grid1 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/Report/ScheduleSetUp.aspx b/SGGL/FineUIPro.Web/TestRun/Report/ScheduleSetUp.aspx index a09e302f..7f19d0cb 100644 --- a/SGGL/FineUIPro.Web/TestRun/Report/ScheduleSetUp.aspx +++ b/SGGL/FineUIPro.Web/TestRun/Report/ScheduleSetUp.aspx @@ -36,6 +36,7 @@ AutoPostBack="true" OnTabIndexChanged="TabStrip1_TabIndexChanged" ShowBorder="true" ActiveTabIndex="1" runat="server"> + @@ -128,7 +129,6 @@ - @@ -170,6 +170,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -217,6 +314,7 @@ }); return valid; } + //预试车合计 function onGridYscAfterEdit(event, value, params) { var me = F('<%= GridYsc.ClientID %>'); @@ -309,6 +407,7 @@ }); return valid; } + //三查四定合计 function onGridScsdAfterEdit(event, value, params) { var me = F('<%= GridScsd.ClientID %>'); @@ -327,6 +426,25 @@ me.updateSummaryCellValue('CompleteNum', completeNumTotal, true); } + //投料试车状态 + var ddlRunType = '<%= ddlRunType.ClientID %>'; + function renderRunType(value) { + if (value == -1) { + return ''; + } else { + return F(ddlRunType).getTextByValue(value); + } + } + + //生产试运行状态 + var ddlProducRunType = '<%= ddlProducRunType.ClientID %>'; + function renderProducRunType(value) { + if (value == -1) { + return ''; + } else { + return F(ddlProducRunType).getTextByValue(value); + } + } diff --git a/SGGL/FineUIPro.Web/TestRun/Report/ScheduleSetUp.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Report/ScheduleSetUp.aspx.cs index 0ddb1ea1..25b0786c 100644 --- a/SGGL/FineUIPro.Web/TestRun/Report/ScheduleSetUp.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/Report/ScheduleSetUp.aspx.cs @@ -21,6 +21,8 @@ using NPOI.SS.Util; using NPOI.XSSF.UserModel; using System.IO; using NPOI.SS.Formula.Functions; +using FineUIPro.Web.ProjectData; +using System.Web.Services.Description; namespace FineUIPro.Web.TestRun.Report { @@ -856,6 +858,351 @@ namespace FineUIPro.Web.TestRun.Report #endregion + #region 投料试车 + + /// + /// 投料试车绑定 + /// + public void gvFeedingBrid() + { + var result = new List(); + if (Funs.DB.Run_ParameterSettings.Count(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States == 1) == 0) + { + var query = from runsys in Funs.DB.PreRun_SysDevice + join install in Funs.DB.PreRun_SysDevice on runsys.InstallationId equals install.PreRunId + join proce in Funs.DB.PreRun_SysDevice on runsys.ProcessesId equals proce.PreRunId + join project in Funs.DB.Base_Project on runsys.ProjectId equals project.ProjectId + where runsys.PreRunLevel == 3 && runsys.ProjectId == this.CurrUser.LoginProjectId + orderby runsys.Sort ascending + select new ParameterSettingsDto() + { + ProjectId = this.CurrUser.LoginProjectId, + ProjectName = project.ProjectName, + InstallationId = runsys.InstallationId, + InstallationName = install.PreRunName, + ProcessesId = runsys.ProcessesId, + ProcessesName = proce.PreRunName, + SystemId = runsys.PreRunId, + SystemName = runsys.PreRunName, + States = 1, + RunType = 1 + }; + if (query.Count() > 0) + { + result = query.ToList(); + result.ForEach(x => { x.SettingsId = Guid.NewGuid().ToString(); }); + } + } + else + { + var query = from setting in Funs.DB.Run_ParameterSettings + join install in Funs.DB.PreRun_SysDevice on setting.InstallationId equals install.PreRunId + join proce in Funs.DB.PreRun_SysDevice on setting.ProcessesId equals proce.PreRunId + join sys in Funs.DB.PreRun_SysDevice on setting.SystemId equals sys.PreRunId + join project in Funs.DB.Base_Project on setting.ProjectId equals project.ProjectId + where setting.ProjectId == this.CurrUser.LoginProjectId && setting.States == 1 + orderby setting.Sort ascending + select new ParameterSettingsDto() + { + SettingsId = setting.SettingsId, + ProjectId = setting.ProjectId, + ProjectName = project.ProjectName, + InstallationId = setting.InstallationId, + InstallationName = install.PreRunName, + ProcessesId = setting.ProcessesId, + ProcessesName = proce.PreRunName, + SystemId = setting.SystemId, + SystemName = sys.PreRunName, + States = setting.States, + RunType = setting.RunType, + AddUser = setting.AddUser, + AddTime = setting.AddTime, + Sort = setting.Sort, + }; + if (query.Count() > 0) + { + result = query.ToList(); + } + } + gvFeeding.DataSource = result; + TabStrip1.ActiveTabIndex = 3; + gvFeeding.DataBind(); + } + + /// + /// 投料试车保存 + /// + protected void btnFeedingSave_Click(object sender, EventArgs e) + { + try + { + var deletelist = Funs.DB.Run_ParameterSettings.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States == 1); + Funs.DB.Run_ParameterSettings.DeleteAllOnSubmit(deletelist); + Funs.DB.SubmitChanges(); + var addList = new List(); + JArray mergedData = gvFeeding.GetMergedData(); + foreach (JObject mergedRow in mergedData) + { + string status = mergedRow.Value("status"); + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + var model = new Run_ParameterSettings(); + model.SettingsId = this.gvFeeding.Rows[i].DataKeys[0].ToString(); + model.ProjectId = this.CurrUser.LoginProjectId; + model.InstallationId = this.gvFeeding.Rows[i].DataKeys[1].ToString(); + model.ProcessesId = this.gvFeeding.Rows[i].DataKeys[2].ToString(); + model.SystemId = this.gvFeeding.Rows[i].DataKeys[3].ToString(); + model.States = 1; + var runtype = !string.IsNullOrWhiteSpace(values.Value("RunType")) ? values.Value("RunType") : string.Empty; + if (!string.IsNullOrWhiteSpace(runtype)) + { + model.RunType = int.Parse(runtype); + } + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + model.Sort = i; + addList.Add(model); + } + Funs.DB.Run_ParameterSettings.InsertAllOnSubmit(addList); + Funs.DB.SubmitChanges(); + gvFeedingBrid(); + ShowNotify("保存成功!"); + } + catch (Exception ex) + { + ShowNotify(ex.Message, MessageBoxIcon.Error); + } + } + + #endregion + + #region 生产性能考核 + + /// + /// 生产性能考核绑定 + /// + public void PerformPageInit() + { + var model = Funs.DB.Run_ProductionSettings.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId); + if (model != null) + { + if (model.States == 1) + { + txtStartData.Hidden = true; + txtEndData.Hidden = true; + rbtNotStarted.Checked = true; + } + else if (model.States == 2) + { + txtStartData.Hidden = false; + txtEndData.Hidden = false; + rbtInProgress.Checked = true; + txtStartData.Text = model.StartTime.Value.ToString("yyyy-MM-dd"); + txtEndData.Text = model.EndTime.Value.ToString("yyyy-MM-dd"); + } + else if (model.States == 2) + { + txtStartData.Hidden = true; + txtEndData.Hidden = true; + rbtComplete.Checked = true; + } + } + } + + /// + /// 保存 + /// + protected void btnSubmit_Click(object sender, EventArgs e) + { + bool add = false; + if (rbtInProgress.Checked && string.IsNullOrWhiteSpace(txtStartData.Text)) + { + ShowNotify("开始时间不能为空!", MessageBoxIcon.Warning); + return; + } + if (rbtInProgress.Checked && string.IsNullOrWhiteSpace(txtEndData.Text)) + { + ShowNotify("结束时间不能为空!", MessageBoxIcon.Warning); + return; + } + var state = 0; + if (rbtNotStarted.Checked) + { + state = 1; + } + if (rbtInProgress.Checked) + { + state = 2; + } + if (rbtComplete.Checked) + { + state = 3; + } + var model = Funs.DB.Run_ProductionSettings.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId); + if (model == null) + { + add = true; + model = new Run_ProductionSettings(); + model.ProductionId = Guid.NewGuid().ToString(); + model.ProjectId = this.CurrUser.LoginProjectId; + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + } + model.States = state; + if (state == 2) + { + model.StartTime = DateTime.Parse(txtStartData.Text.ToString()); + model.EndTime = DateTime.Parse(txtEndData.Text.ToString()); + } + else + { + model.StartTime = null; + model.EndTime = null; + } + if (add) Funs.DB.Run_ProductionSettings.InsertOnSubmit(model); + Funs.DB.SubmitChanges(); + PerformPageInit(); + ShowNotify("保存成功!"); + } + + /// + /// 考核选择 + /// + protected void rbtCheck_CheckedChanged(object sender, CheckedEventArgs e) + { + if (rbtInProgress.Checked) + { + txtStartData.Hidden = false; + txtEndData.Hidden = false; + } + else + { + txtStartData.Hidden = true; + txtEndData.Hidden = true; + } + } + + #endregion + + #region 生产试运行 + + /// + ///生产试运行绑定 + /// + public void gvProducBrid() + { + var result = new List(); + if (Funs.DB.Run_ParameterSettings.Count(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States == 2) == 0) + { + var query = from runsys in Funs.DB.PreRun_SysDevice + join install in Funs.DB.PreRun_SysDevice on runsys.InstallationId equals install.PreRunId + join proce in Funs.DB.PreRun_SysDevice on runsys.ProcessesId equals proce.PreRunId + join project in Funs.DB.Base_Project on runsys.ProjectId equals project.ProjectId + where runsys.PreRunLevel == 3 && runsys.ProjectId == this.CurrUser.LoginProjectId + orderby runsys.Sort ascending + select new ParameterSettingsDto() + { + ProjectId = this.CurrUser.LoginProjectId, + ProjectName = project.ProjectName, + InstallationId = runsys.InstallationId, + InstallationName = install.PreRunName, + ProcessesId = runsys.ProcessesId, + ProcessesName = proce.PreRunName, + SystemId = runsys.PreRunId, + SystemName = runsys.PreRunName, + States = 2, + RunType = 1 + }; + if (query.Count() > 0) + { + result = query.ToList(); + result.ForEach(x => { x.SettingsId = Guid.NewGuid().ToString(); }); + } + } + else + { + var query = from setting in Funs.DB.Run_ParameterSettings + join install in Funs.DB.PreRun_SysDevice on setting.InstallationId equals install.PreRunId + join proce in Funs.DB.PreRun_SysDevice on setting.ProcessesId equals proce.PreRunId + join sys in Funs.DB.PreRun_SysDevice on setting.SystemId equals sys.PreRunId + join project in Funs.DB.Base_Project on setting.ProjectId equals project.ProjectId + where setting.ProjectId == this.CurrUser.LoginProjectId && setting.States == 2 + orderby setting.Sort ascending + select new ParameterSettingsDto() + { + SettingsId = setting.SettingsId, + ProjectId = setting.ProjectId, + ProjectName = project.ProjectName, + InstallationId = setting.InstallationId, + InstallationName = install.PreRunName, + ProcessesId = setting.ProcessesId, + ProcessesName = proce.PreRunName, + SystemId = setting.SystemId, + SystemName = sys.PreRunName, + States = setting.States, + RunType = setting.RunType, + AddUser = setting.AddUser, + AddTime = setting.AddTime, + Sort = setting.Sort, + }; + if (query.Count() > 0) + { + result = query.ToList(); + } + } + gvProduc.DataSource = result; + TabStrip1.ActiveTabIndex = 5; + gvProduc.DataBind(); + } + + /// + /// 生产试运行保存 + /// + protected void btnProducSave_Click(object sender, EventArgs e) + { + try + { + var deletelist = Funs.DB.Run_ParameterSettings.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States == 2); + Funs.DB.Run_ParameterSettings.DeleteAllOnSubmit(deletelist); + Funs.DB.SubmitChanges(); + var addList = new List(); + JArray mergedData = gvProduc.GetMergedData(); + foreach (JObject mergedRow in mergedData) + { + string status = mergedRow.Value("status"); + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + var model = new Run_ParameterSettings(); + model.SettingsId = this.gvProduc.Rows[i].DataKeys[0].ToString(); + model.ProjectId = this.CurrUser.LoginProjectId; + model.InstallationId = this.gvProduc.Rows[i].DataKeys[1].ToString(); + model.ProcessesId = this.gvProduc.Rows[i].DataKeys[2].ToString(); + model.SystemId = this.gvProduc.Rows[i].DataKeys[3].ToString(); + model.States = 2; + var runtype = !string.IsNullOrWhiteSpace(values.Value("RunType")) ? values.Value("RunType") : string.Empty; + if (!string.IsNullOrWhiteSpace(runtype)) + { + model.RunType = int.Parse(runtype); + } + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + model.Sort = i; + addList.Add(model); + } + Funs.DB.Run_ParameterSettings.InsertAllOnSubmit(addList); + Funs.DB.SubmitChanges(); + gvProducBrid(); + ShowNotify("保存成功!"); + } + catch (Exception ex) + { + ShowNotify(ex.Message, MessageBoxIcon.Error); + } + } + + #endregion + + #region 私有方法 /// @@ -919,6 +1266,21 @@ namespace FineUIPro.Web.TestRun.Report //三查四定 DataBridScsd(); } + else if (TabStrip1.ActiveTabIndex == 3) + { + //投料试车 + gvFeedingBrid(); + } + else if (TabStrip1.ActiveTabIndex == 4) + { + //生产性能考核 + PerformPageInit(); + } + else if (TabStrip1.ActiveTabIndex == 5) + { + //生产试运行 + gvProducBrid(); + } } public class Run_ScheduleSetUpDto : Run_ScheduleSetUp @@ -979,6 +1341,29 @@ namespace FineUIPro.Web.TestRun.Report public int CloseNum { get; set; } } + /// + /// 投料试车实体 + /// + public class ParameterSettingsDto : Run_ParameterSettings + { + /// + /// 项目名称 + /// + public string ProjectName { get; set; } + /// + /// 装置名称 + /// + public string InstallationName { get; set; } + /// + /// 工序名称 + /// + public string ProcessesName { get; set; } + /// + /// 系统名称 + /// + public string SystemName { get; set; } + } + #endregion diff --git a/SGGL/FineUIPro.Web/TestRun/Report/ScheduleSetUp.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Report/ScheduleSetUp.aspx.designer.cs index a56ee2ad..c571ef20 100644 --- a/SGGL/FineUIPro.Web/TestRun/Report/ScheduleSetUp.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/Report/ScheduleSetUp.aspx.designer.cs @@ -346,5 +346,167 @@ namespace FineUIPro.Web.TestRun.Report /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox NumberBox3; + + /// + /// gvFeeding 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvFeeding; + + /// + /// Toolbar5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar5; + + /// + /// btnFeedingSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnFeedingSave; + + /// + /// ToolbarFill3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill3; + + /// + /// ddlRunType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlRunType; + + /// + /// Toolbar6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar6; + + /// + /// ToolbarFill4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill4; + + /// + /// btnSubmit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSubmit; + + /// + /// rbtNotStarted 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.RadioButton rbtNotStarted; + + /// + /// rbtInProgress 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.RadioButton rbtInProgress; + + /// + /// rbtComplete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.RadioButton rbtComplete; + + /// + /// txtStartData 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartData; + + /// + /// txtEndData 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndData; + + /// + /// gvProduc 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvProduc; + + /// + /// Toolbar7 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar7; + + /// + /// btnProducSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnProducSave; + + /// + /// ToolbarFill5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill5; + + /// + /// ddlProducRunType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlProducRunType; } } diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index 9fc55c34..7c94e245 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -9,10 +9,10 @@
- + - + diff --git a/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx b/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx index fe66d4f7..2106e0fb 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx +++ b/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx @@ -88,7 +88,7 @@
-
+
@@ -101,7 +101,65 @@
-
+
+
+
+
+ +
+
+
+
+
+
未投料
+
+
投料中
+
+
投料完成
+
+
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
+
未运行
+
+
运行中
+
+
停车检修
+
+
+
+
+
+
+
+
+
+
+
+
+
+
考核未开始
+
+
考核进行中
+
+
考核已完成
+
+
+
+
@@ -417,6 +475,124 @@ $("#three").append("
"); }); + //图4 + var fourStr = '<%=feedingRunStr%>'; + var fourData = JSON.parse(fourStr); + var fourwidth = Math.floor(100 / (fourData.length / 2)); + $.each(fourData, function (index, item) { + $("#four").append("
"); + }); + + //图5 + var fiveStr = '<%=productsStr%>'; + var fiveData = JSON.parse(fiveStr); + var fivewidth = Math.floor(100 / (fiveData.length / 2)); + $.each(fourData, function (index, item) { + $("#five").append("
"); + }); + + //图6 + var sixStr = '<%=runProductionStr%>'; + var sixData = JSON.parse(sixStr); + var colorData = ["#988989", "#6D5F5F", "#524747"]; + if (sixData.States == 2) { + colorData = ["#2B1485", "#3E1DC0", "#603FE2"]; + } + if (sixData.States == 3) { + colorData = ["#106722", "#20CE43", "#5DE679"]; + } + var chart = echarts.init(document.getElementById('six')); + var value = 100; + option = { + backgroundColor: '000', + title: { + text: `` + sixData.StatesName, + subtext: sixData.States == 2 ? (sixData.StartTime + "\n" + sixData.EndTime) : "", + left: 'center', + top: '45%', //top待调整 + textStyle: { + color: '#fff', + fontSize: 16, + fontFamily: 'DINAlternate-Bold', + }, + subtextStyle: { + color: '#ff', + fontSize: 16, + fontFamily: 'PingFangSC-Regular', + top: 'center' + }, + itemGap: 10 //主副标题间距 + }, + xAxis: { + splitLine: { + show: false + }, + axisLabel: { + show: false + }, + axisLine: { + show: false + } + }, + yAxis: { + splitLine: { + show: false + }, + axisLabel: { + show: false + }, + axisLine: { + show: false + } + }, + series: [ + // 内圆 + { + type: 'pie', + radius: ['0', '80%'], + center: ['50%', '50%'], + z: 0, + itemStyle: { + normal: { + color: new echarts.graphic.RadialGradient(0.5, 0.5, 0.5, [ + { + offset: 0, + color: colorData[0] + }, + { + offset: 0.44, + color: colorData[0] + }, + { + offset: 0.73, + color: colorData[1] + }, + { + offset: 1, + color: colorData[2] + } + ]), + label: { + show: false + }, + labelLine: { + show: false + } + }, + }, + label: { + normal: { + position: "center", + + } + }, + data: [100], + } + ] + }; + chart.setOption(option); + + $(function () { $.each(threeData, function (index, item) { var chart = echarts.init(document.getElementById('three' + index)); @@ -435,7 +611,7 @@ }, subtextStyle: { color: '#ff', - fontSize: 14, + fontSize: 12, fontFamily: 'PingFangSC-Regular', top: 'center' }, @@ -608,778 +784,213 @@ }; chart.setOption(option); }); + + $.each(fourData, function (index, item) { + + var colorData = ["#808080", "#A2945E", "#B3764D", "#482F1F"]; + if (item.RunType == 2) { + colorData = ["#A2945E", "#4444BB", "#D52B6F", "#DD226D"]; + } + if (item.RunType == 3) { + colorData = ["#CCCC33", "#8FCC33", "#57C43C", "#22DD48"]; + } + var chart = echarts.init(document.getElementById('four' + index)); + var value = 100; + option = { + backgroundColor: '000', + title: { + text: `` + item.SystemName, + subtext: item.RunType == 1 ? "未投料" : item.RunType == 2 ? "投料中" : "投料完成", + left: 'center', + top: '45%', //top待调整 + textStyle: { + color: '#fff', + fontSize: 9, + fontFamily: 'DINAlternate-Bold', + }, + subtextStyle: { + color: '#ff', + fontSize: 9, + fontFamily: 'PingFangSC-Regular', + top: 'center' + }, + itemGap: 10 //主副标题间距 + }, + xAxis: { + splitLine: { + show: false + }, + axisLabel: { + show: false + }, + axisLine: { + show: false + } + }, + yAxis: { + splitLine: { + show: false + }, + axisLabel: { + show: false + }, + axisLine: { + show: false + } + }, + series: [ + // 内圆 + { + type: 'pie', + radius: ['0', '80%'], + center: ['50%', '50%'], + z: 0, + itemStyle: { + normal: { + color: new echarts.graphic.RadialGradient(0.5, 0.5, 0.5, [ + { + offset: 0, + color: colorData[0] + }, + { + offset: 0.44, + color: colorData[1] + }, + { + offset: 0.73, + color: colorData[2] + }, + { + offset: 1, + color: colorData[3] + } + ]), + label: { + show: false + }, + labelLine: { + show: false + } + }, + }, + label: { + normal: { + position: "center", + + } + }, + data: [100], + } + ] + }; + chart.setOption(option); + }); + + $.each(fiveData, function (index, item) { + + var colorData = ["#7A7AA7", "#5656CC", "#3939E9", "#2222FF"]; + if (item.RunType == 2) { + colorData = ["#A5F82A", "#2AF853", "#31F0F0", "#3FC1E2"]; + } + if (item.RunType == 3) { + colorData = ["#F82AF8", "#F0A431", "#E95B39", "#F82A2A"]; + } + var chart = echarts.init(document.getElementById('five' + index)); + var value = 100; + option = { + backgroundColor: '000', + title: { + text: `` + item.SystemName, + subtext: item.RunType == 1 ? "未运行" : item.RunType == 2 ? "运行中" : "停车检修", + left: 'center', + top: '45%', //top待调整 + textStyle: { + color: '#fff', + fontSize: 9, + fontFamily: 'DINAlternate-Bold', + }, + subtextStyle: { + color: '#ff', + fontSize: 9, + fontFamily: 'PingFangSC-Regular', + top: 'center' + }, + itemGap: 10 //主副标题间距 + }, + xAxis: { + splitLine: { + show: false + }, + axisLabel: { + show: false + }, + axisLine: { + show: false + } + }, + yAxis: { + splitLine: { + show: false + }, + axisLabel: { + show: false + }, + axisLine: { + show: false + } + }, + series: [ + // 内圆 + { + type: 'pie', + radius: ['0', '80%'], + center: ['50%', '50%'], + z: 0, + itemStyle: { + normal: { + color: new echarts.graphic.RadialGradient(0.5, 0.5, 0.5, [ + { + offset: 0, + color: colorData[0] + }, + { + offset: 0.44, + color: colorData[1] + }, + { + offset: 0.73, + color: colorData[2] + }, + { + offset: 1, + color: colorData[3] + } + ]), + label: { + show: false + }, + labelLine: { + show: false + } + }, + }, + label: { + normal: { + position: "center", + + } + }, + data: [100], + } + ] + }; + chart.setOption(option); + }); + }); - //data = [ - // { - // name: 'A类', - // value: 20, - // }, - // { - // name: 'B类', - // value: 30, - // }, - // { - // name: 'C类', - // value: 50, - // }, - //]; - //arrName = getArrayValue(data, 'name'); - //arrValue = getArrayValue(data, 'value'); - //sumValue = eval(arrValue.join('+')); - //objData = array2obj(data, 'name'); - //optionData = getData(data); - - //function getArrayValue(array, key) { - // var key = key || 'value'; - // var res = []; - // if (array) { - // array.forEach(function (t) { - // res.push(t[key]); - // }); - // } - // return res; - //} - //function array2obj(array, key) { - // var resObj = {}; - // for (var i = 0; i < array.length; i++) { - // resObj[array[i][key]] = array[i]; - // } - // return resObj; - //} - //function getData(data) { - // var res = { - // series: [], - // yAxis: [], - // }; - // for (let i = 0; i < data.length; i++) { - // res.series.push({ - // name: '', - // type: 'pie', - // clockWise: false, //顺时加载 - // hoverAnimation: false, //鼠标移入变大 - // radius: [73 - i * 15 + '%', 68 - i * 15 + '%'], - // center: ['40%', '55%'], - // label: { - // show: false, - // }, - // itemStyle: { - // label: { - // show: false, - // }, - // labelLine: { - // show: false, - // }, - // borderWidth: 5, - // }, - // data: [ - // { - // value: data[i].value, - // name: data[i].name, - // }, - // { - // value: sumValue - data[i].value, - // name: '', - // itemStyle: { - // color: 'rgba(0,0,0,0)', - // borderWidth: 0, - // }, - // tooltip: { - // show: false, - // }, - // hoverAnimation: false, - // }, - // ], - // }); - // res.series.push({ - // name: '', - // type: 'pie', - // silent: true, - // z: 1, - // clockWise: false, //顺时加载 - // hoverAnimation: false, //鼠标移入变大 - // radius: [73 - i * 15 + '%', 68 - i * 15 + '%'], - // center: ['40%', '55%'], - // label: { - // show: false, - // }, - // itemStyle: { - // label: { - // show: false, - // }, - // labelLine: { - // show: false, - // }, - // borderWidth: 5, - // }, - // data: [ - // { - // value: 7.5, - // itemStyle: { - // color: '#add2d2', //圆环背景色-全 - // borderWidth: 0, - // }, - // tooltip: { - // show: false, - // }, - // hoverAnimation: false, - // }, - // { - // value: 2.5, - // name: '', - // itemStyle: { - // color: 'rgba(0,0,0,0)', - // borderWidth: 0, - // }, - // tooltip: { - // show: false, - // }, - // hoverAnimation: false, - // }, - // ], - // }); - // res.yAxis.push(((data[i].value / sumValue) * 100).toFixed(2) + '%'); - // } - // return res; - //} - //option = { - // //backgroundColor: '#ddd', - // legend: { - // show: true, - // icon: 'circle', - // top: 'center', - // top: '16%', - // bottom: '53%', - // left: '40%', - // data: arrName, - // width: 40, - // padding: [0, 16], - // itemGap: 25, - // //图例显示 - // formatter: function (name) { - // return '{title|' + name + '}{value|' + ((objData[name].value / sumValue) * 100).toFixed(2) + '} {title|%}'; - // }, - - // textStyle: { - // rich: { - // title: { - // fontSize: 20, - // lineHeight: 30, - // color: '#fff', - // }, - // value: { - // fontSize: 18, - // lineHeight: 20, - // color: '#fff', - // }, - // }, - // }, - // }, - // title: { - // text: '', //图形标题，配置在中间对应效果图的80% - // left: '20%', - // top: '50%', - // textStyle: { - // color: 'rgb(50,197,233)', - // fontSize: 16, - // align: 'left', - // }, - // }, - // tooltip: { - // show: true, - // trigger: 'item', - // formatter: '{a}
{b}:{c}({d}%)', - // }, - // color: ['yellow', 'blue', 'green'], - // xAxis: [ - // { - // show: false, - // }, - // ], - // series: optionData.series, - //}; - //chart2.setOption(option); - - -<%-- - - - - ---%> diff --git a/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx.cs index 1f29f58f..cf3c7de1 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx.cs @@ -17,6 +17,7 @@ using static FineUIPro.Web.TestRun.Report.PreRunSchedule; using Aspose.Words; using static FineUIPro.Web.TestRun.Report.TestRunSchedule; using System.Web.UI.DataVisualization.Charting; +using NPOI.POIFS.Crypt.Dsig; namespace FineUIPro.Web { @@ -26,6 +27,9 @@ namespace FineUIPro.Web public string oneDataStr { get; set; } public string twoDataStr { get; set; } public string fourDecisionStr { get; set; } + public string feedingRunStr { get; set; } + public string productsStr { get; set; } + public string runProductionStr { get; set; } protected void Page_Load(object sender, EventArgs e) { @@ -40,6 +44,9 @@ namespace FineUIPro.Web OneYsc(); TwoSc(); FourDecision(); + FeedingRuns(); + Products(); + RunProduction(); } /// @@ -265,6 +272,149 @@ namespace FineUIPro.Web fourDecisionStr = JsonConvert.SerializeObject(result); } + /// + /// 投料试车 + /// + public void FeedingRuns() + { + List result = new List(); + var data = ParamentSettings(1); + if (data.Count > 0) + { + foreach (var item in data) + { + result.Add(new FourFiveDto() + { + RunType = item.RunType.Value, + SystemName = item.SystemName, + InstallationName = item.InstallationName + }); + } + feedingRunStr = JsonConvert.SerializeObject(result); + } + } + + /// + /// 生产试运行 + /// + public void Products() + { + List result = new List(); + var data = ParamentSettings(2); + if (data.Count > 0) + { + foreach (var item in data) + { + result.Add(new FourFiveDto() + { + RunType = item.RunType.Value, + SystemName = item.SystemName, + InstallationName = item.InstallationName + }); + } + productsStr = JsonConvert.SerializeObject(result); + } + } + + /// + /// 投料试车和生产试运行数据获取 + /// + /// + private List ParamentSettings(int state) + { + var result = new List(); + + try + { + if (Funs.DB.Run_ParameterSettings.Count(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States == state) == 0) + { + var query = from runsys in Funs.DB.PreRun_SysDevice + join install in Funs.DB.PreRun_SysDevice on runsys.InstallationId equals install.PreRunId + join proce in Funs.DB.PreRun_SysDevice on runsys.ProcessesId equals proce.PreRunId + join project in Funs.DB.Base_Project on runsys.ProjectId equals project.ProjectId + where runsys.PreRunLevel == 3 && runsys.ProjectId == this.CurrUser.LoginProjectId + orderby runsys.Sort ascending + select new ParameterSettingsDto() + { + ProjectId = this.CurrUser.LoginProjectId, + ProjectName = project.ProjectName, + InstallationId = runsys.InstallationId, + InstallationName = install.PreRunName, + ProcessesId = runsys.ProcessesId, + ProcessesName = proce.PreRunName, + SystemId = runsys.PreRunId, + SystemName = runsys.PreRunName, + States = 1, + RunType = 1 + }; + if (query.Count() > 0) + { + result = query.ToList(); + result.ForEach(x => { x.SettingsId = Guid.NewGuid().ToString(); }); + } + } + else + { + var query = from setting in Funs.DB.Run_ParameterSettings + join install in Funs.DB.PreRun_SysDevice on setting.InstallationId equals install.PreRunId + join proce in Funs.DB.PreRun_SysDevice on setting.ProcessesId equals proce.PreRunId + join sys in Funs.DB.PreRun_SysDevice on setting.SystemId equals sys.PreRunId + join project in Funs.DB.Base_Project on setting.ProjectId equals project.ProjectId + where setting.ProjectId == this.CurrUser.LoginProjectId && setting.States == state + orderby setting.Sort ascending + select new ParameterSettingsDto() + { + SettingsId = setting.SettingsId, + ProjectId = setting.ProjectId, + ProjectName = project.ProjectName, + InstallationId = setting.InstallationId, + InstallationName = install.PreRunName, + ProcessesId = setting.ProcessesId, + ProcessesName = proce.PreRunName, + SystemId = setting.SystemId, + SystemName = sys.PreRunName, + States = setting.States, + RunType = setting.RunType, + AddUser = setting.AddUser, + AddTime = setting.AddTime, + Sort = setting.Sort, + }; + if (query.Count() > 0) + { + result = query.ToList(); + } + } + } + catch (Exception ex) + { + result = new List(); + } + + return result; + } + + /// + /// 生产性能考核 + /// + public void RunProduction() + { + var result = new SixDto(); + var data = Funs.DB.Run_ProductionSettings.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId); + if (data != null) + { + result.States = data.States.Value; + result.StatesName = data.States == 1 ? "考核未开始" : data.States == 2 ? "考核进行中" : data.States == 3 ? "考核已完成" : "考核未开始"; + result.StartTime = data.StartTime != null ? data.StartTime.Value.ToString("yyyy-MM-dd") : string.Empty; + result.EndTime = data.EndTime != null ? data.EndTime.Value.ToString("yyyy-MM-dd") : string.Empty; + } + else + { + result.States = 1; + result.StatesName = "考核未开始"; + } + runProductionStr = JsonConvert.SerializeObject(result); + } + #region 实体类 /// @@ -285,6 +435,27 @@ namespace FineUIPro.Web public float Rate { get; set; } } + /// + /// 图4,5 + /// + public class FourFiveDto + { + public int RunType { get; set; } + public string SystemName { get; set; } + public string InstallationName { get; set; } + } + + /// + /// 图6 + /// + public class SixDto + { + public int States { get; set; } + public string StatesName { get; set; } + public string StartTime { get; set; } + public string EndTime { get; set; } + } + public class WorkPackageInspectDto { /// diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 04f34bf3..31e60f74 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -1316,6 +1316,9 @@ namespace Model partial void InsertJDGL_MeterCompletion(JDGL_MeterCompletion instance); partial void UpdateJDGL_MeterCompletion(JDGL_MeterCompletion instance); partial void DeleteJDGL_MeterCompletion(JDGL_MeterCompletion instance); + partial void InsertJDGL_MonthPlan(JDGL_MonthPlan instance); + partial void UpdateJDGL_MonthPlan(JDGL_MonthPlan instance); + partial void DeleteJDGL_MonthPlan(JDGL_MonthPlan instance); partial void InsertJDGL_PipelineCompletion(JDGL_PipelineCompletion instance); partial void UpdateJDGL_PipelineCompletion(JDGL_PipelineCompletion instance); partial void DeleteJDGL_PipelineCompletion(JDGL_PipelineCompletion instance); @@ -2048,6 +2051,12 @@ namespace Model partial void InsertResources_SignManage(Resources_SignManage instance); partial void UpdateResources_SignManage(Resources_SignManage instance); partial void DeleteResources_SignManage(Resources_SignManage instance); + partial void InsertRun_ParameterSettings(Run_ParameterSettings instance); + partial void UpdateRun_ParameterSettings(Run_ParameterSettings instance); + partial void DeleteRun_ParameterSettings(Run_ParameterSettings instance); + partial void InsertRun_ProductionSettings(Run_ProductionSettings instance); + partial void UpdateRun_ProductionSettings(Run_ProductionSettings instance); + partial void DeleteRun_ProductionSettings(Run_ProductionSettings instance); partial void InsertRun_ScheduleSetUp(Run_ScheduleSetUp instance); partial void UpdateRun_ScheduleSetUp(Run_ScheduleSetUp instance); partial void DeleteRun_ScheduleSetUp(Run_ScheduleSetUp instance); @@ -6126,6 +6135,14 @@ namespace Model } } + public System.Data.Linq.Table JDGL_MonthPlan + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table JDGL_PipelineCompletion { get @@ -8078,6 +8095,22 @@ namespace Model } } + public System.Data.Linq.Table Run_ParameterSettings + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table Run_ProductionSettings + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Run_ScheduleSetUp { get @@ -26360,6 +26393,8 @@ namespace Model private EntitySet _JDGL_LowTankCompletion; + private EntitySet _JDGL_MonthPlan; + private EntitySet _JDGL_PipelineCompletion; private EntitySet _JDGL_ProgressCompletion; @@ -26884,6 +26919,7 @@ namespace Model this._JDGL_ElectricalCompletion = new EntitySet(new Action(this.attach_JDGL_ElectricalCompletion), new Action(this.detach_JDGL_ElectricalCompletion)); this._JDGL_EquipmentCompletion = new EntitySet(new Action(this.attach_JDGL_EquipmentCompletion), new Action(this.detach_JDGL_EquipmentCompletion)); this._JDGL_LowTankCompletion = new EntitySet(new Action(this.attach_JDGL_LowTankCompletion), new Action(this.detach_JDGL_LowTankCompletion)); + this._JDGL_MonthPlan = new EntitySet(new Action(this.attach_JDGL_MonthPlan), new Action(this.detach_JDGL_MonthPlan)); this._JDGL_PipelineCompletion = new EntitySet(new Action(this.attach_JDGL_PipelineCompletion), new Action(this.detach_JDGL_PipelineCompletion)); this._JDGL_ProgressCompletion = new EntitySet(new Action(this.attach_JDGL_ProgressCompletion), new Action(this.detach_JDGL_ProgressCompletion)); this._JDGL_QuantityCompletion = new EntitySet(new Action(this.attach_JDGL_QuantityCompletion), new Action(this.detach_JDGL_QuantityCompletion)); @@ -30030,6 +30066,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_MonthPlan_Base_Project", Storage="_JDGL_MonthPlan", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] + public EntitySet JDGL_MonthPlan + { + get + { + return this._JDGL_MonthPlan; + } + set + { + this._JDGL_MonthPlan.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_PipelineCompletion_Base_Project", Storage="_JDGL_PipelineCompletion", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet JDGL_PipelineCompletion { @@ -33773,6 +33822,18 @@ namespace Model entity.Base_Project = null; } + private void attach_JDGL_MonthPlan(JDGL_MonthPlan entity) + { + this.SendPropertyChanging(); + entity.Base_Project = this; + } + + private void detach_JDGL_MonthPlan(JDGL_MonthPlan entity) + { + this.SendPropertyChanging(); + entity.Base_Project = null; + } + private void attach_JDGL_PipelineCompletion(JDGL_PipelineCompletion entity) { this.SendPropertyChanging(); @@ -39594,6 +39655,8 @@ namespace Model private EntitySet _JDGL_MeterCompletion; + private EntitySet _JDGL_MonthPlan; + private EntitySet _JDGL_PipelineCompletion; private EntitySet _JDGL_SteelStructureCompletion; @@ -39897,6 +39960,7 @@ namespace Model this._JDGL_ElectricalCompletion = new EntitySet(new Action(this.attach_JDGL_ElectricalCompletion), new Action(this.detach_JDGL_ElectricalCompletion)); this._JDGL_EquipmentCompletion = new EntitySet(new Action(this.attach_JDGL_EquipmentCompletion), new Action(this.detach_JDGL_EquipmentCompletion)); this._JDGL_MeterCompletion = new EntitySet(new Action(this.attach_JDGL_MeterCompletion), new Action(this.detach_JDGL_MeterCompletion)); + this._JDGL_MonthPlan = new EntitySet(new Action(this.attach_JDGL_MonthPlan), new Action(this.detach_JDGL_MonthPlan)); this._JDGL_PipelineCompletion = new EntitySet(new Action(this.attach_JDGL_PipelineCompletion), new Action(this.detach_JDGL_PipelineCompletion)); this._JDGL_SteelStructureCompletion = new EntitySet(new Action(this.attach_JDGL_SteelStructureCompletion), new Action(this.detach_JDGL_SteelStructureCompletion)); this._JDGL_UndergroundPipeCompletion = new EntitySet(new Action(this.attach_JDGL_UndergroundPipeCompletion), new Action(this.detach_JDGL_UndergroundPipeCompletion)); @@ -41835,6 +41899,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_MonthPlan_Base_Unit", Storage="_JDGL_MonthPlan", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")] + public EntitySet JDGL_MonthPlan + { + get + { + return this._JDGL_MonthPlan; + } + set + { + this._JDGL_MonthPlan.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_PipelineCompletion_Base_Unit", Storage="_JDGL_PipelineCompletion", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")] public EntitySet JDGL_PipelineCompletion { @@ -44025,6 +44102,18 @@ namespace Model entity.Base_Unit = null; } + private void attach_JDGL_MonthPlan(JDGL_MonthPlan entity) + { + this.SendPropertyChanging(); + entity.Base_Unit = this; + } + + private void detach_JDGL_MonthPlan(JDGL_MonthPlan entity) + { + this.SendPropertyChanging(); + entity.Base_Unit = null; + } + private void attach_JDGL_PipelineCompletion(JDGL_PipelineCompletion entity) { this.SendPropertyChanging(); @@ -212202,6 +212291,472 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.JDGL_MonthPlan")] + public partial class JDGL_MonthPlan : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _MonthPlanId; + + private string _ProjectId; + + private System.Nullable _Months; + + private string _UnitId; + + private string _NodeContent; + + private System.Nullable _PlanDate; + + private string _DutyPerson; + + private System.Nullable _RealDate; + + private string _Remark; + + private string _CompileMan; + + private System.Nullable _CompileDate; + + private EntityRef _Base_Project; + + private EntityRef _Base_Unit; + + private EntityRef _Sys_User; + + private EntityRef _CompileManSys_User; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnMonthPlanIdChanging(string value); + partial void OnMonthPlanIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnMonthsChanging(System.Nullable value); + partial void OnMonthsChanged(); + partial void OnUnitIdChanging(string value); + partial void OnUnitIdChanged(); + partial void OnNodeContentChanging(string value); + partial void OnNodeContentChanged(); + partial void OnPlanDateChanging(System.Nullable value); + partial void OnPlanDateChanged(); + partial void OnDutyPersonChanging(string value); + partial void OnDutyPersonChanged(); + partial void OnRealDateChanging(System.Nullable value); + partial void OnRealDateChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + partial void OnCompileManChanging(string value); + partial void OnCompileManChanged(); + partial void OnCompileDateChanging(System.Nullable value); + partial void OnCompileDateChanged(); + #endregion + + public JDGL_MonthPlan() + { + this._Base_Project = default(EntityRef); + this._Base_Unit = default(EntityRef); + this._Sys_User = default(EntityRef); + this._CompileManSys_User = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthPlanId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string MonthPlanId + { + get + { + return this._MonthPlanId; + } + set + { + if ((this._MonthPlanId != value)) + { + this.OnMonthPlanIdChanging(value); + this.SendPropertyChanging(); + this._MonthPlanId = value; + this.SendPropertyChanged("MonthPlanId"); + this.OnMonthPlanIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + if (this._Base_Project.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Months", DbType="DateTime")] + public System.Nullable Months + { + get + { + return this._Months; + } + set + { + if ((this._Months != value)) + { + this.OnMonthsChanging(value); + this.SendPropertyChanging(); + this._Months = value; + this.SendPropertyChanged("Months"); + this.OnMonthsChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")] + public string UnitId + { + get + { + return this._UnitId; + } + set + { + if ((this._UnitId != value)) + { + if (this._Base_Unit.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnUnitIdChanging(value); + this.SendPropertyChanging(); + this._UnitId = value; + this.SendPropertyChanged("UnitId"); + this.OnUnitIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NodeContent", DbType="NVarChar(500)")] + public string NodeContent + { + get + { + return this._NodeContent; + } + set + { + if ((this._NodeContent != value)) + { + this.OnNodeContentChanging(value); + this.SendPropertyChanging(); + this._NodeContent = value; + this.SendPropertyChanged("NodeContent"); + this.OnNodeContentChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanDate", DbType="DateTime")] + public System.Nullable PlanDate + { + get + { + return this._PlanDate; + } + set + { + if ((this._PlanDate != value)) + { + this.OnPlanDateChanging(value); + this.SendPropertyChanging(); + this._PlanDate = value; + this.SendPropertyChanged("PlanDate"); + this.OnPlanDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DutyPerson", DbType="NVarChar(50)")] + public string DutyPerson + { + get + { + return this._DutyPerson; + } + set + { + if ((this._DutyPerson != value)) + { + if (this._Sys_User.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnDutyPersonChanging(value); + this.SendPropertyChanging(); + this._DutyPerson = value; + this.SendPropertyChanged("DutyPerson"); + this.OnDutyPersonChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RealDate", DbType="DateTime")] + public System.Nullable RealDate + { + get + { + return this._RealDate; + } + set + { + if ((this._RealDate != value)) + { + this.OnRealDateChanging(value); + this.SendPropertyChanging(); + this._RealDate = value; + this.SendPropertyChanged("RealDate"); + this.OnRealDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(200)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")] + public string CompileMan + { + get + { + return this._CompileMan; + } + set + { + if ((this._CompileMan != value)) + { + if (this._CompileManSys_User.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnCompileManChanging(value); + this.SendPropertyChanging(); + this._CompileMan = value; + this.SendPropertyChanged("CompileMan"); + this.OnCompileManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")] + public System.Nullable CompileDate + { + get + { + return this._CompileDate; + } + set + { + if ((this._CompileDate != value)) + { + this.OnCompileDateChanging(value); + this.SendPropertyChanging(); + this._CompileDate = value; + this.SendPropertyChanged("CompileDate"); + this.OnCompileDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_MonthPlan_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] + public Base_Project Base_Project + { + get + { + return this._Base_Project.Entity; + } + set + { + Base_Project previousValue = this._Base_Project.Entity; + if (((previousValue != value) + || (this._Base_Project.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Base_Project.Entity = null; + previousValue.JDGL_MonthPlan.Remove(this); + } + this._Base_Project.Entity = value; + if ((value != null)) + { + value.JDGL_MonthPlan.Add(this); + this._ProjectId = value.ProjectId; + } + else + { + this._ProjectId = default(string); + } + this.SendPropertyChanged("Base_Project"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_MonthPlan_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)] + public Base_Unit Base_Unit + { + get + { + return this._Base_Unit.Entity; + } + set + { + Base_Unit previousValue = this._Base_Unit.Entity; + if (((previousValue != value) + || (this._Base_Unit.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Base_Unit.Entity = null; + previousValue.JDGL_MonthPlan.Remove(this); + } + this._Base_Unit.Entity = value; + if ((value != null)) + { + value.JDGL_MonthPlan.Add(this); + this._UnitId = value.UnitId; + } + else + { + this._UnitId = default(string); + } + this.SendPropertyChanged("Base_Unit"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_MonthPlan_Sys_User", Storage="_Sys_User", ThisKey="DutyPerson", OtherKey="UserId", IsForeignKey=true)] + public Sys_User Sys_User + { + get + { + return this._Sys_User.Entity; + } + set + { + Sys_User previousValue = this._Sys_User.Entity; + if (((previousValue != value) + || (this._Sys_User.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Sys_User.Entity = null; + previousValue.JDGL_MonthPlan.Remove(this); + } + this._Sys_User.Entity = value; + if ((value != null)) + { + value.JDGL_MonthPlan.Add(this); + this._DutyPerson = value.UserId; + } + else + { + this._DutyPerson = default(string); + } + this.SendPropertyChanged("Sys_User"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_MonthPlan_Sys_User1", Storage="_CompileManSys_User", ThisKey="CompileMan", OtherKey="UserId", IsForeignKey=true)] + public Sys_User CompileManSys_User + { + get + { + return this._CompileManSys_User.Entity; + } + set + { + Sys_User previousValue = this._CompileManSys_User.Entity; + if (((previousValue != value) + || (this._CompileManSys_User.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._CompileManSys_User.Entity = null; + previousValue.JDGL_MonthPlan_Sys_User1.Remove(this); + } + this._CompileManSys_User.Entity = value; + if ((value != null)) + { + value.JDGL_MonthPlan_Sys_User1.Add(this); + this._CompileMan = value.UserId; + } + else + { + this._CompileMan = default(string); + } + this.SendPropertyChanged("CompileManSys_User"); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.JDGL_PipelineCompletion")] public partial class JDGL_PipelineCompletion : INotifyPropertyChanging, INotifyPropertyChanged { @@ -212893,6 +213448,8 @@ namespace Model private System.Nullable _EndDate; + private System.Nullable _NextNum; + private EntityRef _Base_Project; private EntityRef _JDGL_QuantityList; @@ -212923,6 +213480,8 @@ namespace Model partial void OnStartDateChanged(); partial void OnEndDateChanging(System.Nullable value); partial void OnEndDateChanged(); + partial void OnNextNumChanging(System.Nullable value); + partial void OnNextNumChanged(); #endregion public JDGL_QuantityCompletion() @@ -213145,6 +213704,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NextNum", DbType="Decimal(9,2)")] + public System.Nullable NextNum + { + get + { + return this._NextNum; + } + set + { + if ((this._NextNum != value)) + { + this.OnNextNumChanging(value); + this.SendPropertyChanging(); + this._NextNum = value; + this.SendPropertyChanged("NextNum"); + this.OnNextNumChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_QuantityCompletion_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -275014,7 +275593,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string Remark { get @@ -275159,20 +275738,6 @@ namespace Model private string _PropertyTechnologyId; - private System.Nullable _InspectTime; - - private string _AddUser; - - private System.Nullable _AddTime; - - private System.Nullable _IsSiteImplement; - - private System.Nullable _SiteImplementConfirmData; - - private System.Nullable _RecordUploadData; - - private string _SiteImplementUser; - private System.Nullable _SubcontractorAllPassData; private System.Nullable _ContractorAllPassData; @@ -275181,22 +275746,36 @@ namespace Model private System.Nullable _OwnerAllPassData; + private System.Nullable _WanderIsComplete; + private System.Nullable _WanderCompleteData; - private System.Nullable _WanderIsComplete; + private System.Nullable _IsSiteImplement; + + private string _SiteImplementUser; + + private System.Nullable _SiteImplementConfirmData; + + private System.Nullable _RecordUploadData; private System.Nullable _InspectIsClose; - private System.Nullable _InspectCloseData; - private string _InspectIsCloseUser; + private System.Nullable _InspectCloseData; + private System.Nullable _IsUnifyWanderAbout; private System.Nullable _UnifyWanderAboutData; private string _UnifyWanderAboutOpinion; + private System.Nullable _InspectTime; + + private string _AddUser; + + private System.Nullable _AddTime; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -275239,20 +275818,6 @@ namespace Model partial void OnWorkPackTypeChanged(); partial void OnPropertyTechnologyIdChanging(string value); partial void OnPropertyTechnologyIdChanged(); - partial void OnInspectTimeChanging(System.Nullable value); - partial void OnInspectTimeChanged(); - partial void OnAddUserChanging(string value); - partial void OnAddUserChanged(); - partial void OnAddTimeChanging(System.Nullable value); - partial void OnAddTimeChanged(); - partial void OnIsSiteImplementChanging(System.Nullable value); - partial void OnIsSiteImplementChanged(); - partial void OnSiteImplementConfirmDataChanging(System.Nullable value); - partial void OnSiteImplementConfirmDataChanged(); - partial void OnRecordUploadDataChanging(System.Nullable value); - partial void OnRecordUploadDataChanged(); - partial void OnSiteImplementUserChanging(string value); - partial void OnSiteImplementUserChanged(); partial void OnSubcontractorAllPassDataChanging(System.Nullable value); partial void OnSubcontractorAllPassDataChanged(); partial void OnContractorAllPassDataChanging(System.Nullable value); @@ -275261,22 +275826,36 @@ namespace Model partial void OnSupervisionAllPassDataChanged(); partial void OnOwnerAllPassDataChanging(System.Nullable value); partial void OnOwnerAllPassDataChanged(); - partial void OnWanderCompleteDataChanging(System.Nullable value); - partial void OnWanderCompleteDataChanged(); partial void OnWanderIsCompleteChanging(System.Nullable value); partial void OnWanderIsCompleteChanged(); + partial void OnWanderCompleteDataChanging(System.Nullable value); + partial void OnWanderCompleteDataChanged(); + partial void OnIsSiteImplementChanging(System.Nullable value); + partial void OnIsSiteImplementChanged(); + partial void OnSiteImplementUserChanging(string value); + partial void OnSiteImplementUserChanged(); + partial void OnSiteImplementConfirmDataChanging(System.Nullable value); + partial void OnSiteImplementConfirmDataChanged(); + partial void OnRecordUploadDataChanging(System.Nullable value); + partial void OnRecordUploadDataChanged(); partial void OnInspectIsCloseChanging(System.Nullable value); partial void OnInspectIsCloseChanged(); - partial void OnInspectCloseDataChanging(System.Nullable value); - partial void OnInspectCloseDataChanged(); partial void OnInspectIsCloseUserChanging(string value); partial void OnInspectIsCloseUserChanged(); + partial void OnInspectCloseDataChanging(System.Nullable value); + partial void OnInspectCloseDataChanged(); partial void OnIsUnifyWanderAboutChanging(System.Nullable value); partial void OnIsUnifyWanderAboutChanged(); partial void OnUnifyWanderAboutDataChanging(System.Nullable value); partial void OnUnifyWanderAboutDataChanged(); partial void OnUnifyWanderAboutOpinionChanging(string value); partial void OnUnifyWanderAboutOpinionChanged(); + partial void OnInspectTimeChanging(System.Nullable value); + partial void OnInspectTimeChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); #endregion public PreRun_SubInspectTerm() @@ -275664,146 +276243,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")] - public System.Nullable InspectTime - { - get - { - return this._InspectTime; - } - set - { - if ((this._InspectTime != value)) - { - this.OnInspectTimeChanging(value); - this.SendPropertyChanging(); - this._InspectTime = value; - this.SendPropertyChanged("InspectTime"); - this.OnInspectTimeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] - public string AddUser - { - get - { - return this._AddUser; - } - set - { - if ((this._AddUser != value)) - { - this.OnAddUserChanging(value); - this.SendPropertyChanging(); - this._AddUser = value; - this.SendPropertyChanged("AddUser"); - this.OnAddUserChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] - public System.Nullable AddTime - { - get - { - return this._AddTime; - } - set - { - if ((this._AddTime != value)) - { - this.OnAddTimeChanging(value); - this.SendPropertyChanging(); - this._AddTime = value; - this.SendPropertyChanged("AddTime"); - this.OnAddTimeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSiteImplement", DbType="Int")] - public System.Nullable IsSiteImplement - { - get - { - return this._IsSiteImplement; - } - set - { - if ((this._IsSiteImplement != value)) - { - this.OnIsSiteImplementChanging(value); - this.SendPropertyChanging(); - this._IsSiteImplement = value; - this.SendPropertyChanged("IsSiteImplement"); - this.OnIsSiteImplementChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementConfirmData", DbType="DateTime")] - public System.Nullable SiteImplementConfirmData - { - get - { - return this._SiteImplementConfirmData; - } - set - { - if ((this._SiteImplementConfirmData != value)) - { - this.OnSiteImplementConfirmDataChanging(value); - this.SendPropertyChanging(); - this._SiteImplementConfirmData = value; - this.SendPropertyChanged("SiteImplementConfirmData"); - this.OnSiteImplementConfirmDataChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordUploadData", DbType="DateTime")] - public System.Nullable RecordUploadData - { - get - { - return this._RecordUploadData; - } - set - { - if ((this._RecordUploadData != value)) - { - this.OnRecordUploadDataChanging(value); - this.SendPropertyChanging(); - this._RecordUploadData = value; - this.SendPropertyChanged("RecordUploadData"); - this.OnRecordUploadDataChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementUser", DbType="VarChar(50)")] - public string SiteImplementUser - { - get - { - return this._SiteImplementUser; - } - set - { - if ((this._SiteImplementUser != value)) - { - this.OnSiteImplementUserChanging(value); - this.SendPropertyChanging(); - this._SiteImplementUser = value; - this.SendPropertyChanged("SiteImplementUser"); - this.OnSiteImplementUserChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorAllPassData", DbType="DateTime")] public System.Nullable SubcontractorAllPassData { @@ -275884,6 +276323,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderIsComplete", DbType="Int")] + public System.Nullable WanderIsComplete + { + get + { + return this._WanderIsComplete; + } + set + { + if ((this._WanderIsComplete != value)) + { + this.OnWanderIsCompleteChanging(value); + this.SendPropertyChanging(); + this._WanderIsComplete = value; + this.SendPropertyChanged("WanderIsComplete"); + this.OnWanderIsCompleteChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderCompleteData", DbType="DateTime")] public System.Nullable WanderCompleteData { @@ -275904,22 +276363,82 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderIsComplete", DbType="Int")] - public System.Nullable WanderIsComplete + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSiteImplement", DbType="Int")] + public System.Nullable IsSiteImplement { get { - return this._WanderIsComplete; + return this._IsSiteImplement; } set { - if ((this._WanderIsComplete != value)) + if ((this._IsSiteImplement != value)) { - this.OnWanderIsCompleteChanging(value); + this.OnIsSiteImplementChanging(value); this.SendPropertyChanging(); - this._WanderIsComplete = value; - this.SendPropertyChanged("WanderIsComplete"); - this.OnWanderIsCompleteChanged(); + this._IsSiteImplement = value; + this.SendPropertyChanged("IsSiteImplement"); + this.OnIsSiteImplementChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementUser", DbType="VarChar(50)")] + public string SiteImplementUser + { + get + { + return this._SiteImplementUser; + } + set + { + if ((this._SiteImplementUser != value)) + { + this.OnSiteImplementUserChanging(value); + this.SendPropertyChanging(); + this._SiteImplementUser = value; + this.SendPropertyChanged("SiteImplementUser"); + this.OnSiteImplementUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementConfirmData", DbType="DateTime")] + public System.Nullable SiteImplementConfirmData + { + get + { + return this._SiteImplementConfirmData; + } + set + { + if ((this._SiteImplementConfirmData != value)) + { + this.OnSiteImplementConfirmDataChanging(value); + this.SendPropertyChanging(); + this._SiteImplementConfirmData = value; + this.SendPropertyChanged("SiteImplementConfirmData"); + this.OnSiteImplementConfirmDataChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordUploadData", DbType="DateTime")] + public System.Nullable RecordUploadData + { + get + { + return this._RecordUploadData; + } + set + { + if ((this._RecordUploadData != value)) + { + this.OnRecordUploadDataChanging(value); + this.SendPropertyChanging(); + this._RecordUploadData = value; + this.SendPropertyChanged("RecordUploadData"); + this.OnRecordUploadDataChanged(); } } } @@ -275944,26 +276463,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectCloseData", DbType="DateTime")] - public System.Nullable InspectCloseData - { - get - { - return this._InspectCloseData; - } - set - { - if ((this._InspectCloseData != value)) - { - this.OnInspectCloseDataChanging(value); - this.SendPropertyChanging(); - this._InspectCloseData = value; - this.SendPropertyChanged("InspectCloseData"); - this.OnInspectCloseDataChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsCloseUser", DbType="VarChar(50)")] public string InspectIsCloseUser { @@ -275984,6 +276483,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectCloseData", DbType="DateTime")] + public System.Nullable InspectCloseData + { + get + { + return this._InspectCloseData; + } + set + { + if ((this._InspectCloseData != value)) + { + this.OnInspectCloseDataChanging(value); + this.SendPropertyChanging(); + this._InspectCloseData = value; + this.SendPropertyChanged("InspectCloseData"); + this.OnInspectCloseDataChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUnifyWanderAbout", DbType="Int")] public System.Nullable IsUnifyWanderAbout { @@ -276044,6 +276563,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")] + public System.Nullable InspectTime + { + get + { + return this._InspectTime; + } + set + { + if ((this._InspectTime != value)) + { + this.OnInspectTimeChanging(value); + this.SendPropertyChanging(); + this._InspectTime = value; + this.SendPropertyChanged("InspectTime"); + this.OnInspectTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] + public string AddUser + { + get + { + return this._AddUser; + } + set + { + if ((this._AddUser != value)) + { + this.OnAddUserChanging(value); + this.SendPropertyChanging(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] + public System.Nullable AddTime + { + get + { + return this._AddTime; + } + set + { + if ((this._AddTime != value)) + { + this.OnAddTimeChanging(value); + this.SendPropertyChanging(); + this._AddTime = value; + this.SendPropertyChanged("AddTime"); + this.OnAddTimeChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -277851,6 +278430,8 @@ namespace Model private string _RestrictCondition; + private System.Nullable _ResponsibilityProposeSatate; + private System.Nullable _ResponsibilityConfirm; private System.Nullable _ProposeConfirm; @@ -277861,9 +278442,11 @@ namespace Model private System.Nullable _OwnerConfirm; + private System.Nullable _ProposeConfirmData; + private System.Nullable _ResponsibilityConfirmData; - private System.Nullable _ProposeConfirmData; + private System.Nullable _ProposeHandleData; private System.Nullable _GeneraConfirmData; @@ -277879,10 +278462,6 @@ namespace Model private System.Nullable _Sort; - private System.Nullable _ResponsibilityProposeSatate; - - private System.Nullable _ProposeHandleData; - private string _FourDecisionCode; #region 可扩展性方法定义 @@ -277919,6 +278498,8 @@ namespace Model partial void OnRealityDestructionTimeChanged(); partial void OnRestrictConditionChanging(string value); partial void OnRestrictConditionChanged(); + partial void OnResponsibilityProposeSatateChanging(System.Nullable value); + partial void OnResponsibilityProposeSatateChanged(); partial void OnResponsibilityConfirmChanging(System.Nullable value); partial void OnResponsibilityConfirmChanged(); partial void OnProposeConfirmChanging(System.Nullable value); @@ -277929,10 +278510,12 @@ namespace Model partial void OnSupervisionConfirmChanged(); partial void OnOwnerConfirmChanging(System.Nullable value); partial void OnOwnerConfirmChanged(); - partial void OnResponsibilityConfirmDataChanging(System.Nullable value); - partial void OnResponsibilityConfirmDataChanged(); partial void OnProposeConfirmDataChanging(System.Nullable value); partial void OnProposeConfirmDataChanged(); + partial void OnResponsibilityConfirmDataChanging(System.Nullable value); + partial void OnResponsibilityConfirmDataChanged(); + partial void OnProposeHandleDataChanging(System.Nullable value); + partial void OnProposeHandleDataChanged(); partial void OnGeneraConfirmDataChanging(System.Nullable value); partial void OnGeneraConfirmDataChanged(); partial void OnSupervisionConfirmDataChanging(System.Nullable value); @@ -277947,10 +278530,6 @@ namespace Model partial void OnAddTimeChanged(); partial void OnSortChanging(System.Nullable value); partial void OnSortChanged(); - partial void OnResponsibilityProposeSatateChanging(System.Nullable value); - partial void OnResponsibilityProposeSatateChanged(); - partial void OnProposeHandleDataChanging(System.Nullable value); - partial void OnProposeHandleDataChanged(); partial void OnFourDecisionCodeChanging(string value); partial void OnFourDecisionCodeChanged(); #endregion @@ -278260,6 +278839,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")] + public System.Nullable ResponsibilityProposeSatate + { + get + { + return this._ResponsibilityProposeSatate; + } + set + { + if ((this._ResponsibilityProposeSatate != value)) + { + this.OnResponsibilityProposeSatateChanging(value); + this.SendPropertyChanging(); + this._ResponsibilityProposeSatate = value; + this.SendPropertyChanged("ResponsibilityProposeSatate"); + this.OnResponsibilityProposeSatateChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirm", DbType="Int")] public System.Nullable ResponsibilityConfirm { @@ -278360,6 +278959,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")] + public System.Nullable ProposeConfirmData + { + get + { + return this._ProposeConfirmData; + } + set + { + if ((this._ProposeConfirmData != value)) + { + this.OnProposeConfirmDataChanging(value); + this.SendPropertyChanging(); + this._ProposeConfirmData = value; + this.SendPropertyChanged("ProposeConfirmData"); + this.OnProposeConfirmDataChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirmData", DbType="DateTime")] public System.Nullable ResponsibilityConfirmData { @@ -278380,22 +278999,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")] - public System.Nullable ProposeConfirmData + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")] + public System.Nullable ProposeHandleData { get { - return this._ProposeConfirmData; + return this._ProposeHandleData; } set { - if ((this._ProposeConfirmData != value)) + if ((this._ProposeHandleData != value)) { - this.OnProposeConfirmDataChanging(value); + this.OnProposeHandleDataChanging(value); this.SendPropertyChanging(); - this._ProposeConfirmData = value; - this.SendPropertyChanged("ProposeConfirmData"); - this.OnProposeConfirmDataChanged(); + this._ProposeHandleData = value; + this.SendPropertyChanged("ProposeHandleData"); + this.OnProposeHandleDataChanged(); } } } @@ -278540,46 +279159,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")] - public System.Nullable ResponsibilityProposeSatate - { - get - { - return this._ResponsibilityProposeSatate; - } - set - { - if ((this._ResponsibilityProposeSatate != value)) - { - this.OnResponsibilityProposeSatateChanging(value); - this.SendPropertyChanging(); - this._ResponsibilityProposeSatate = value; - this.SendPropertyChanged("ResponsibilityProposeSatate"); - this.OnResponsibilityProposeSatateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")] - public System.Nullable ProposeHandleData - { - get - { - return this._ProposeHandleData; - } - set - { - if ((this._ProposeHandleData != value)) - { - this.OnProposeHandleDataChanging(value); - this.SendPropertyChanging(); - this._ProposeHandleData = value; - this.SendPropertyChanged("ProposeHandleData"); - this.OnProposeHandleDataChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FourDecisionCode", DbType="VarChar(20)")] public string FourDecisionCode { @@ -279292,7 +279871,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string Remark { get @@ -316135,6 +316714,538 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Run_ParameterSettings")] + public partial class Run_ParameterSettings : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _SettingsId; + + private string _ProjectId; + + private string _InstallationId; + + private string _ProcessesId; + + private string _SystemId; + + private System.Nullable _States; + + private System.Nullable _RunType; + + private System.Nullable _AllNum; + + private string _AddUser; + + private System.Nullable _AddTime; + + private System.Nullable _Sort; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnSettingsIdChanging(string value); + partial void OnSettingsIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnInstallationIdChanging(string value); + partial void OnInstallationIdChanged(); + partial void OnProcessesIdChanging(string value); + partial void OnProcessesIdChanged(); + partial void OnSystemIdChanging(string value); + partial void OnSystemIdChanged(); + partial void OnStatesChanging(System.Nullable value); + partial void OnStatesChanged(); + partial void OnRunTypeChanging(System.Nullable value); + partial void OnRunTypeChanged(); + partial void OnAllNumChanging(System.Nullable value); + partial void OnAllNumChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); + partial void OnSortChanging(System.Nullable value); + partial void OnSortChanged(); + #endregion + + public Run_ParameterSettings() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SettingsId", DbType="VarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string SettingsId + { + get + { + return this._SettingsId; + } + set + { + if ((this._SettingsId != value)) + { + this.OnSettingsIdChanging(value); + this.SendPropertyChanging(); + this._SettingsId = value; + this.SendPropertyChanged("SettingsId"); + this.OnSettingsIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="VarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationId", DbType="VarChar(50)")] + public string InstallationId + { + get + { + return this._InstallationId; + } + set + { + if ((this._InstallationId != value)) + { + this.OnInstallationIdChanging(value); + this.SendPropertyChanging(); + this._InstallationId = value; + this.SendPropertyChanged("InstallationId"); + this.OnInstallationIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProcessesId", DbType="VarChar(50)")] + public string ProcessesId + { + get + { + return this._ProcessesId; + } + set + { + if ((this._ProcessesId != value)) + { + this.OnProcessesIdChanging(value); + this.SendPropertyChanging(); + this._ProcessesId = value; + this.SendPropertyChanged("ProcessesId"); + this.OnProcessesIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SystemId", DbType="VarChar(50)")] + public string SystemId + { + get + { + return this._SystemId; + } + set + { + if ((this._SystemId != value)) + { + this.OnSystemIdChanging(value); + this.SendPropertyChanging(); + this._SystemId = value; + this.SendPropertyChanged("SystemId"); + this.OnSystemIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_States", DbType="Int")] + public System.Nullable States + { + get + { + return this._States; + } + set + { + if ((this._States != value)) + { + this.OnStatesChanging(value); + this.SendPropertyChanging(); + this._States = value; + this.SendPropertyChanged("States"); + this.OnStatesChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RunType", DbType="Int")] + public System.Nullable RunType + { + get + { + return this._RunType; + } + set + { + if ((this._RunType != value)) + { + this.OnRunTypeChanging(value); + this.SendPropertyChanging(); + this._RunType = value; + this.SendPropertyChanged("RunType"); + this.OnRunTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AllNum", DbType="Int")] + public System.Nullable AllNum + { + get + { + return this._AllNum; + } + set + { + if ((this._AllNum != value)) + { + this.OnAllNumChanging(value); + this.SendPropertyChanging(); + this._AllNum = value; + this.SendPropertyChanged("AllNum"); + this.OnAllNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] + public string AddUser + { + get + { + return this._AddUser; + } + set + { + if ((this._AddUser != value)) + { + this.OnAddUserChanging(value); + this.SendPropertyChanging(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] + public System.Nullable AddTime + { + get + { + return this._AddTime; + } + set + { + if ((this._AddTime != value)) + { + this.OnAddTimeChanging(value); + this.SendPropertyChanging(); + this._AddTime = value; + this.SendPropertyChanged("AddTime"); + this.OnAddTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort", DbType="Int")] + public System.Nullable Sort + { + get + { + return this._Sort; + } + set + { + if ((this._Sort != value)) + { + this.OnSortChanging(value); + this.SendPropertyChanging(); + this._Sort = value; + this.SendPropertyChanged("Sort"); + this.OnSortChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Run_ProductionSettings")] + public partial class Run_ProductionSettings : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _ProductionId; + + private string _ProjectId; + + private System.Nullable _States; + + private System.Nullable _StartTime; + + private System.Nullable _EndTime; + + private string _AddUser; + + private System.Nullable _AddTime; + + private System.Nullable _Sort; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnProductionIdChanging(string value); + partial void OnProductionIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnStatesChanging(System.Nullable value); + partial void OnStatesChanged(); + partial void OnStartTimeChanging(System.Nullable value); + partial void OnStartTimeChanged(); + partial void OnEndTimeChanging(System.Nullable value); + partial void OnEndTimeChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); + partial void OnSortChanging(System.Nullable value); + partial void OnSortChanged(); + #endregion + + public Run_ProductionSettings() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProductionId", DbType="VarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string ProductionId + { + get + { + return this._ProductionId; + } + set + { + if ((this._ProductionId != value)) + { + this.OnProductionIdChanging(value); + this.SendPropertyChanging(); + this._ProductionId = value; + this.SendPropertyChanged("ProductionId"); + this.OnProductionIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="VarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_States", DbType="Int")] + public System.Nullable States + { + get + { + return this._States; + } + set + { + if ((this._States != value)) + { + this.OnStatesChanging(value); + this.SendPropertyChanging(); + this._States = value; + this.SendPropertyChanged("States"); + this.OnStatesChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StartTime", DbType="DateTime")] + public System.Nullable StartTime + { + get + { + return this._StartTime; + } + set + { + if ((this._StartTime != value)) + { + this.OnStartTimeChanging(value); + this.SendPropertyChanging(); + this._StartTime = value; + this.SendPropertyChanged("StartTime"); + this.OnStartTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EndTime", DbType="DateTime")] + public System.Nullable EndTime + { + get + { + return this._EndTime; + } + set + { + if ((this._EndTime != value)) + { + this.OnEndTimeChanging(value); + this.SendPropertyChanging(); + this._EndTime = value; + this.SendPropertyChanged("EndTime"); + this.OnEndTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] + public string AddUser + { + get + { + return this._AddUser; + } + set + { + if ((this._AddUser != value)) + { + this.OnAddUserChanging(value); + this.SendPropertyChanging(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] + public System.Nullable AddTime + { + get + { + return this._AddTime; + } + set + { + if ((this._AddTime != value)) + { + this.OnAddTimeChanging(value); + this.SendPropertyChanging(); + this._AddTime = value; + this.SendPropertyChanged("AddTime"); + this.OnAddTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort", DbType="Int")] + public System.Nullable Sort + { + get + { + return this._Sort; + } + set + { + if ((this._Sort != value)) + { + this.OnSortChanging(value); + this.SendPropertyChanging(); + this._Sort = value; + this.SendPropertyChanged("Sort"); + this.OnSortChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Run_ScheduleSetUp")] public partial class Run_ScheduleSetUp : INotifyPropertyChanging, INotifyPropertyChanged { @@ -350746,6 +351857,10 @@ namespace Model private EntitySet _JDGL_MeterCompletion; + private EntitySet _JDGL_MonthPlan; + + private EntitySet _JDGL_MonthPlan_Sys_User1; + private EntitySet _JDGL_PipelineCompletion; private EntitySet _JDGL_ProgressCompletion; @@ -351402,6 +352517,8 @@ namespace Model this._JDGL_ElectricalCompletion = new EntitySet(new Action(this.attach_JDGL_ElectricalCompletion), new Action(this.detach_JDGL_ElectricalCompletion)); this._JDGL_LowTankCompletion = new EntitySet(new Action(this.attach_JDGL_LowTankCompletion), new Action(this.detach_JDGL_LowTankCompletion)); this._JDGL_MeterCompletion = new EntitySet(new Action(this.attach_JDGL_MeterCompletion), new Action(this.detach_JDGL_MeterCompletion)); + this._JDGL_MonthPlan = new EntitySet(new Action(this.attach_JDGL_MonthPlan), new Action(this.detach_JDGL_MonthPlan)); + this._JDGL_MonthPlan_Sys_User1 = new EntitySet(new Action(this.attach_JDGL_MonthPlan_Sys_User1), new Action(this.detach_JDGL_MonthPlan_Sys_User1)); this._JDGL_PipelineCompletion = new EntitySet(new Action(this.attach_JDGL_PipelineCompletion), new Action(this.detach_JDGL_PipelineCompletion)); this._JDGL_ProgressCompletion = new EntitySet(new Action(this.attach_JDGL_ProgressCompletion), new Action(this.detach_JDGL_ProgressCompletion)); this._JDGL_QuantityCompletion = new EntitySet(new Action(this.attach_JDGL_QuantityCompletion), new Action(this.detach_JDGL_QuantityCompletion)); @@ -354539,6 +355656,32 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_MonthPlan_Sys_User", Storage="_JDGL_MonthPlan", ThisKey="UserId", OtherKey="DutyPerson", DeleteRule="NO ACTION")] + public EntitySet JDGL_MonthPlan + { + get + { + return this._JDGL_MonthPlan; + } + set + { + this._JDGL_MonthPlan.Assign(value); + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_MonthPlan_Sys_User1", Storage="_JDGL_MonthPlan_Sys_User1", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] + public EntitySet JDGL_MonthPlan_Sys_User1 + { + get + { + return this._JDGL_MonthPlan_Sys_User1; + } + set + { + this._JDGL_MonthPlan_Sys_User1.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_PipelineCompletion_Sys_User", Storage="_JDGL_PipelineCompletion", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] public EntitySet JDGL_PipelineCompletion { @@ -358995,6 +360138,30 @@ namespace Model entity.Sys_User = null; } + private void attach_JDGL_MonthPlan(JDGL_MonthPlan entity) + { + this.SendPropertyChanging(); + entity.Sys_User = this; + } + + private void detach_JDGL_MonthPlan(JDGL_MonthPlan entity) + { + this.SendPropertyChanging(); + entity.Sys_User = null; + } + + private void attach_JDGL_MonthPlan_Sys_User1(JDGL_MonthPlan entity) + { + this.SendPropertyChanging(); + entity.CompileManSys_User = this; + } + + private void detach_JDGL_MonthPlan_Sys_User1(JDGL_MonthPlan entity) + { + this.SendPropertyChanging(); + entity.CompileManSys_User = null; + } + private void attach_JDGL_PipelineCompletion(JDGL_PipelineCompletion entity) { this.SendPropertyChanging(); @@ -417802,6 +418969,8 @@ namespace Model private System.Nullable _EndDate; + private System.Nullable _NextNum; + private System.Nullable _DesignNum; private string _Name; @@ -417988,6 +419157,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NextNum", DbType="Decimal(9,2)")] + public System.Nullable NextNum + { + get + { + return this._NextNum; + } + set + { + if ((this._NextNum != value)) + { + this._NextNum = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DesignNum", DbType="Decimal(9,2)")] public System.Nullable DesignNum {