代码无效引用清理,试压包资料界面看板修改

This commit is contained in:
2025-10-10 14:33:21 +08:00
parent 87fb529521
commit 55b798135c
933 changed files with 5897 additions and 7541 deletions
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Data;
using System.Linq;
using Model;
namespace BLL
{
+2 -2
View File
@@ -8,7 +8,7 @@ namespace BLL
{
public class CheckControlService
{
/// <summary>
/// 根据质量检查与控制Id删除一个质量检查与控制信息
/// </summary>
@@ -504,7 +504,7 @@ namespace BLL
x.WorkPackageName,
CNProfessionalName = (from y in db.Base_CNProfessional where y.CNProfessionalId == x.CNProfessionalCode select y.ProfessionalName).First(),
UnitWork = (from y in db.WBS_UnitWork where y.UnitWorkId == x.UnitWorkId select y.UnitWorkCode + "-" + y.UnitWorkName + (y.ProjectType == "1" ? "(建筑)" : "(安装)")).First(),
CheckMan = (from y in db.Person_Persons where y.PersonId == x.CheckMan select y.PersonName).First(),
CheckMan = (from y in db.Person_Persons where y.PersonId == x.CheckMan select y.PersonName).First(),
};
var list = qq1.Skip(index * page).Take(page).ToList();
@@ -1,7 +1,6 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -3,7 +3,6 @@ using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using Model;
namespace BLL
{
@@ -1,10 +1,7 @@
using FineUIPro;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Model;
namespace BLL
@@ -31,7 +28,7 @@ namespace BLL
(string.IsNullOrEmpty(table.FileName) || x.FileName.Contains(table.FileName)) &&
(string.IsNullOrEmpty(table.CompileMan) || x.CompileMan.Contains(table.CompileMan)) &&
(string.IsNullOrEmpty(table.State) || x.State.Contains(table.State)) &&
(string.IsNullOrEmpty(table.FilePath) || x.FilePath.Contains(table.FilePath))
(string.IsNullOrEmpty(table.FilePath) || x.FilePath.Contains(table.FilePath))
select x
;
-1
View File
@@ -1,7 +1,6 @@
using System;
using System.Collections;
using System.Linq;
using Model;
namespace BLL
{
@@ -1,7 +1,6 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
-1
View File
@@ -4,7 +4,6 @@ using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Web.UI.WebControls;
using Model;
namespace BLL
{
@@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -2,7 +2,6 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -387,7 +386,8 @@ namespace BLL
return newApprove;
}
return null;
};
}
;
}
}
@@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -1,7 +1,6 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -2,7 +2,6 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -2,7 +2,6 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
+1 -1
View File
@@ -8,7 +8,7 @@ namespace BLL
{
public class SpotCheckService
{
/// <summary>
/// 添加实体验收记录
@@ -2,7 +2,6 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -4,7 +4,6 @@ using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Web.UI.WebControls;
using Model;
namespace BLL
{
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Linq;
namespace BLL
{
@@ -65,7 +61,7 @@ namespace BLL
newCon.DisclosureDate = con.DisclosureDate;
newCon.UnitWorkId = con.UnitWorkId;
newCon.AttendMan = con.AttendMan;
newCon.DisclosurePersonNum = con.DisclosurePersonNum;
newCon.DisclosurePersonNum = con.DisclosurePersonNum;
newCon.RemarkCode = con.RemarkCode;
Funs.DB.SubmitChanges();
}
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Linq;
namespace BLL
{
@@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Collections;
namespace BLL
{
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Linq;
namespace BLL
{
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Linq;
namespace BLL
{
@@ -27,11 +23,11 @@ namespace BLL
/// <param name="unitId">单位Id</param>
/// <param name="year">年度</param>
/// <returns>季度工程项目质量信息表</returns>
public static Model.InformationProject_QuarterlyProjectQuality GetQuarterlyProjectQualityByUnitIdAndYearAndQuarter(string unitId, int year,int quarter)
public static Model.InformationProject_QuarterlyProjectQuality GetQuarterlyProjectQualityByUnitIdAndYearAndQuarter(string unitId, int year, int quarter)
{
return Funs.DB.InformationProject_QuarterlyProjectQuality.FirstOrDefault(e => e.UnitId == unitId && e.Year == year && e.Quarter == quarter);
}
/// <summary>
/// 添加季度工程项目质量信息表
/// </summary>
@@ -43,38 +39,38 @@ namespace BLL
QuarterlyProjectQualityId = quarterlyProjectQuality.QuarterlyProjectQualityId,
ProjectId = quarterlyProjectQuality.ProjectId,
UnitId = quarterlyProjectQuality.UnitId,
Year=quarterlyProjectQuality.Year,
Year = quarterlyProjectQuality.Year,
Quarter = quarterlyProjectQuality.Quarter,
QualityManagePersonNum=quarterlyProjectQuality.QualityManagePersonNum,
AdvancedTitlePersonNum=quarterlyProjectQuality.AdvancedTitlePersonNum,
IntermediateTitlePersonNum=quarterlyProjectQuality.IntermediateTitlePersonNum,
BeImplementedProjectNum=quarterlyProjectQuality.BeImplementedProjectNum,
StartImplementedProjectNum=quarterlyProjectQuality.StartImplementedProjectNum,
AccumulativeStartImplemented=quarterlyProjectQuality.AccumulativeStartImplemented,
CompleteProjectNum=quarterlyProjectQuality.CompleteProjectNum,
QualityManagePersonNum = quarterlyProjectQuality.QualityManagePersonNum,
AdvancedTitlePersonNum = quarterlyProjectQuality.AdvancedTitlePersonNum,
IntermediateTitlePersonNum = quarterlyProjectQuality.IntermediateTitlePersonNum,
BeImplementedProjectNum = quarterlyProjectQuality.BeImplementedProjectNum,
StartImplementedProjectNum = quarterlyProjectQuality.StartImplementedProjectNum,
AccumulativeStartImplemented = quarterlyProjectQuality.AccumulativeStartImplemented,
CompleteProjectNum = quarterlyProjectQuality.CompleteProjectNum,
YearCompleteProjectNum = quarterlyProjectQuality.YearCompleteProjectNum,
QuarterTotal= quarterlyProjectQuality.QuarterTotal,
QuarterFirstPassNum=quarterlyProjectQuality.QuarterFirstPassNum,
QuarterFirstPassRate=quarterlyProjectQuality.QuarterFirstPassRate,
YearTotal=quarterlyProjectQuality.YearTotal,
YearFirstPassNum=quarterlyProjectQuality.YearFirstPassNum,
YearFirstPassRate=quarterlyProjectQuality.YearFirstPassRate,
QuaterCheckSuperviseNum=quarterlyProjectQuality.QuaterCheckSuperviseNum,
QuaterCorrectiveNoticeNum=quarterlyProjectQuality.QuaterCorrectiveNoticeNum,
QuaterQualityProblemNum=quarterlyProjectQuality.QuaterQualityProblemNum,
QuaterClosedQualityProblemNum=quarterlyProjectQuality.QuaterClosedQualityProblemNum,
QuarterTotal = quarterlyProjectQuality.QuarterTotal,
QuarterFirstPassNum = quarterlyProjectQuality.QuarterFirstPassNum,
QuarterFirstPassRate = quarterlyProjectQuality.QuarterFirstPassRate,
YearTotal = quarterlyProjectQuality.YearTotal,
YearFirstPassNum = quarterlyProjectQuality.YearFirstPassNum,
YearFirstPassRate = quarterlyProjectQuality.YearFirstPassRate,
QuaterCheckSuperviseNum = quarterlyProjectQuality.QuaterCheckSuperviseNum,
QuaterCorrectiveNoticeNum = quarterlyProjectQuality.QuaterCorrectiveNoticeNum,
QuaterQualityProblemNum = quarterlyProjectQuality.QuaterQualityProblemNum,
QuaterClosedQualityProblemNum = quarterlyProjectQuality.QuaterClosedQualityProblemNum,
YearCheckSuperviseNum = quarterlyProjectQuality.YearCheckSuperviseNum,
YearCorrectiveNoticeNum=quarterlyProjectQuality.YearCorrectiveNoticeNum,
YearCorrectiveNoticeNum = quarterlyProjectQuality.YearCorrectiveNoticeNum,
YearQualityProblemNum = quarterlyProjectQuality.YearQualityProblemNum,
YearClosedQualityProblemNum=quarterlyProjectQuality.YearClosedQualityProblemNum,
YearClosedQualityProblemNum = quarterlyProjectQuality.YearClosedQualityProblemNum,
QuaterQualityAccidentNum = quarterlyProjectQuality.QuaterQualityAccidentNum,
QuaterDirectEconomicLoss = quarterlyProjectQuality.QuaterDirectEconomicLoss,
YearQualityAccidentNum = quarterlyProjectQuality.YearQualityAccidentNum,
YearDirectEconomicLoss=quarterlyProjectQuality.YearDirectEconomicLoss,
ResponsiblePerson=quarterlyProjectQuality.ResponsiblePerson,
YearDirectEconomicLoss = quarterlyProjectQuality.YearDirectEconomicLoss,
ResponsiblePerson = quarterlyProjectQuality.ResponsiblePerson,
CompileMan = quarterlyProjectQuality.CompileMan,
CompileDate = quarterlyProjectQuality.CompileDate,
Tel=quarterlyProjectQuality.Tel
Tel = quarterlyProjectQuality.Tel
};
Funs.DB.InformationProject_QuarterlyProjectQuality.InsertOnSubmit(newQuarterlyProjectQuality);
Funs.DB.SubmitChanges();
@@ -1,6 +1,4 @@
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using System.Linq;
namespace BLL
{
@@ -1,6 +1,4 @@
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using System.Linq;
namespace BLL
{
@@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using Model;
namespace BLL
{
@@ -1,5 +1,4 @@
using System.Collections.Generic;
using System.Linq;
using System.Linq;
using System.Web.UI.WebControls;
namespace BLL
@@ -1,6 +1,4 @@
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using System.Linq;
namespace BLL
{
@@ -1,6 +1,4 @@
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using System.Linq;
namespace BLL
{
@@ -1,6 +1,4 @@
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using System.Linq;
namespace BLL
{
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Data;
using System.Linq;
using Model;
namespace BLL
{
+1 -1
View File
@@ -10,7 +10,7 @@ namespace BLL
/// </summary>
public static class CQMS_MeetingService
{
/// <summary>
/// 根据主键获取质量会议
+5 -8
View File
@@ -1,8 +1,5 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BLL
{
@@ -219,10 +216,10 @@ namespace BLL
var q = db.Model_QualityModel.FirstOrDefault(e => e.QualityModelId == QualityModelId);
if (q != null)
{
q.CompanyModelId = q.CompanyModelId + "$" + (from y in db.Base_CompanyModel where y.CompanyModelId == q.CompanyModelId select y.ModelType).First() + "$"+ (from y in db.Base_CompanyModelKind
join z in db.Base_CompanyModel on y.CompanyModelKindId equals z.CompanyModelKindId
where z.CompanyModelId == q.CompanyModelId
select y.CompanyModelKindName).First();
q.CompanyModelId = q.CompanyModelId + "$" + (from y in db.Base_CompanyModel where y.CompanyModelId == q.CompanyModelId select y.ModelType).First() + "$" + (from y in db.Base_CompanyModelKind
join z in db.Base_CompanyModel on y.CompanyModelKindId equals z.CompanyModelKindId
where z.CompanyModelId == q.CompanyModelId
select y.CompanyModelKindName).First();
q.CompileMan = q.CompileMan + "$" + BLL.Person_PersonsService.GetPersonsNameById(q.CompileMan);
q.AttachUrlModel = AttachFileService.getFileUrl(q.CompanyModelId);
q.AttachUrl = AttachFileService.getFileUrl(q.QualityModelId);
@@ -1,10 +1,6 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Collections;
using Model;
namespace BLL
{
@@ -1,6 +1,4 @@
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using System.Linq;
namespace BLL
{
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Data;
using System.Linq;
using Model;
namespace BLL
{
+7 -8
View File
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
namespace BLL
{
@@ -60,7 +59,7 @@ namespace BLL
newSubPlan.CompileDate = SubPlan.CompileDate;
newSubPlan.State = SubPlan.State;
newSubPlan.Edition = SubPlan.Edition;
newSubPlan.FilePath=SubPlan.FilePath;
newSubPlan.FilePath = SubPlan.FilePath;
db.Plan_SubPlan.InsertOnSubmit(newSubPlan);
db.SubmitChanges();
}
@@ -226,8 +225,8 @@ namespace BLL
StateStr = ConvertState(x.State),
CompileManName = (from y in db.Person_Persons where y.PersonId == x.CompileMan select y.PersonName).First(),
UnitName = BLL.UnitService.GetUnitNameByUnitId(x.UnitId),
UnitWorkNames=BLL.UnitWorkService.GetUnitWorkName(x.UnitWorkIds),
CNProfessionalNames=BLL.CNProfessionalService.GetCNProfessionalNameByCode(x.CNProfessionalCodes),
UnitWorkNames = BLL.UnitWorkService.GetUnitWorkName(x.UnitWorkIds),
CNProfessionalNames = BLL.CNProfessionalService.GetCNProfessionalNameByCode(x.CNProfessionalCodes),
HandleManName = BLL.CQMS_SubPlanApproveService.GetHandleManName(x.SubPlanId),
FilePath = x.FilePath,
};
@@ -239,9 +238,9 @@ namespace BLL
cd.SubPlanId = item.SubPlanId;
cd.ProjectId = item.ProjectId;
cd.Code = item.Code;
cd.UnitId=item.UnitId + "$" + item.UnitName;
cd.UnitId = item.UnitId + "$" + item.UnitName;
cd.PlanName = item.PlanName;
cd.UnitWorkIds=item.UnitWorkIds + "$" + item.UnitWorkNames;
cd.UnitWorkIds = item.UnitWorkIds + "$" + item.UnitWorkNames;
cd.CNProfessionalCodes = item.CNProfessionalCodes + "$" + item.CNProfessionalNames;
cd.CompileDate = item.CompileDate;
cd.CompileMan = item.CompileMan + "$" + item.CompileManName;
@@ -261,13 +260,13 @@ namespace BLL
/// <returns>一个分包施工质量计划实体</returns>
public static Model.Plan_SubPlan GetSubPlanBySubPlanIdForApi(string SubPlanId)
{
var q= Funs.DB.Plan_SubPlan.FirstOrDefault(x => x.SubPlanId == SubPlanId);
var q = Funs.DB.Plan_SubPlan.FirstOrDefault(x => x.SubPlanId == SubPlanId);
if (q != null)
{
q.UnitId = q.UnitId + "$" + BLL.UnitService.GetUnitNameByUnitId(q.UnitId);
q.UnitWorkIds = q.UnitWorkIds + "$" + BLL.UnitWorkService.GetUnitWorkName(q.UnitWorkIds);
q.CNProfessionalCodes = q.CNProfessionalCodes + "$" + BLL.CNProfessionalService.GetCNProfessionalNameByCode(q.CNProfessionalCodes);
q.CompileMan=q.CompileMan + "$" + BLL.Person_PersonsService.GetPersonsNameById(q.CompileMan);
q.CompileMan = q.CompileMan + "$" + BLL.Person_PersonsService.GetPersonsNameById(q.CompileMan);
q.State = q.State + "$" + ConvertState(q.State) + "$" + BLL.CQMS_SubPlanApproveService.GetHandleManName(q.SubPlanId);
}
return q;
@@ -1,6 +1,4 @@
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using System.Linq;
namespace BLL
{
@@ -1,6 +1,4 @@
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using System.Linq;
namespace BLL
{
@@ -54,7 +52,7 @@ namespace BLL
newQCGroupRegistration.Code = QCGroupRegistration.Code;
newQCGroupRegistration.Name = QCGroupRegistration.Name;
newQCGroupRegistration.CompileMan = QCGroupRegistration.CompileMan;
newQCGroupRegistration.CompileDate = QCGroupRegistration.CompileDate;
newQCGroupRegistration.CompileDate = QCGroupRegistration.CompileDate;
newQCGroupRegistration.UnitId = QCGroupRegistration.UnitId;
newQCGroupRegistration.Subjects = QCGroupRegistration.Subjects;
newQCGroupRegistration.Process = QCGroupRegistration.Process;
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Data;
using System.Linq;
using Model;
namespace BLL
{
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
@@ -10,7 +9,7 @@ namespace BLL
/// </summary>
public static class RewardAndPunishService
{
/// <summary>
/// 根据主键获取质量奖罚
@@ -63,7 +62,7 @@ namespace BLL
State = RewardAndPunish.State,
CompileMan = RewardAndPunish.CompileMan,
CompileDate = RewardAndPunish.CompileDate,
RewardAndPunishDecision=RewardAndPunish.RewardAndPunishDecision,
RewardAndPunishDecision = RewardAndPunish.RewardAndPunishDecision,
};
db.RewardAndPunish_RewardAndPunish.InsertOnSubmit(newRewardAndPunish);
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using System.Linq;
namespace BLL
{
@@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
namespace BLL
{
@@ -2,7 +2,6 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -1,9 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Web.UI.WebControls;
namespace BLL
{
+1 -1
View File
@@ -87,7 +87,7 @@ namespace BLL
public static string GetWorkPackageCodeByPackageContent(string packageContent)
{
string workPackageCode = string.Empty;
var q= Funs.DB.WBS_WorkPackageInit.FirstOrDefault(x => x.PackageContent == packageContent);
var q = Funs.DB.WBS_WorkPackageInit.FirstOrDefault(x => x.PackageContent == packageContent);
if (q != null)
{
workPackageCode = q.WorkPackageCode;
@@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BLL
{