gaofei/SGGL_HBAZ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

Browse Source
This commit is contained in:
高飞
2025-03-05 16:48:17 +08:00
parent 64ee6e8635
commit 58beeab458
59 changed files with 4829 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/BLL.csproj
+1
View File
@@ -378,6 +378,7 @@
<Compile Include="CQMS\ProcessControl\InspectionManagementApproveService.cs" />
<Compile Include="CQMS\ProcessControl\NondestructiveTestService.cs" />
<Compile Include="CQMS\ProcessControl\TestPackageManagementService.cs" />
<Compile Include="CQMS\QuantityManagement\BaseApproveService.cs" />
<Compile Include="CQMS\QuantityManagement\BaseService.cs" />
<Compile Include="CQMS\QuantityManagement\ChangeService.cs" />
<Compile Include="CQMS\QuantityManagement\DayInputService.cs" />
SGGL/BLL/CQMS/QuantityManagement/BaseApproveService.cs
+176
View File
@@ -0,0 +1,176 @@
using Newtonsoft.Json.Serialization;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BLL
{
public class BaseApproveService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 获取工程量基础表模板列表
/// </summary>
/// <param name="satartRowIndex"></param>
/// <param name="maximumRows"></param>
/// <returns></returns>
public static DataTable getListData(string BaseId)
{
var res = from x in db.QuantityManagement_BaseApprove
where x.BaseId == BaseId && x.ApproveDate != null && x.ApproveType != "S"
orderby x.ApproveDate
select new
{
x.BaseApproveId,
x.BaseId,
ApproveMan = (from y in db.Sys_User where y.UserId == x.ApproveMan select y.UserName).First(),
x.ApproveDate,
x.IsAgree,
x.ApproveIdea,
x.ApproveType,
};
return Funs.LINQToDataTable(res);
}
/// <summary>
/// 根据工程量基础表编号删除对应的所有工程量基础表审批信息
/// </summary>
/// <param name="BaseId">工程量基础表编号</param>
public static void DeleteBaseApprovesByBaseId(string BaseId)
{
Model.SGGLDB db = Funs.DB;
var q = (from x in db.QuantityManagement_BaseApprove where x.BaseId == BaseId select x).ToList();
db.QuantityManagement_BaseApprove.DeleteAllOnSubmit(q);
db.SubmitChanges();
}
/// <summary>
/// 获取登录人的通知信息
/// </summary>
/// <param name="BaseId"></param>
/// <param name="userId"></param>
/// <returns></returns>
public static IQueryable getList(string userId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var res = from x in db.QuantityManagement_BaseApprove
join ca in db.QuantityManagement_Base on x.BaseId equals ca.BaseId
where x.ApproveDate == null && x.ApproveType == "S" && x.ApproveMan == userId
orderby x.ApproveDate
select new
{
//x.BaseApproveId,
x.BaseId,
//x.ApproveDate,
//x.IsAgree,
//x.ApproveIdea,
//x.ApproveType,
};
return res.AsQueryable().Distinct();
}
}
/// <summary>
/// 更新通知信息提醒
/// </summary>
/// <param name="BaseId"></param>
/// <param name="userId"></param>
/// <returns></returns>
public static Model.QuantityManagement_BaseApprove GetSee(string BaseId, string userId)
{
return db.QuantityManagement_BaseApprove.FirstOrDefault(x => x.BaseId == BaseId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
}
public static void See(string BaseId, string userId)
{
using (var db = new Model.SGGLDB(Funs.ConnString))
{
var res = db.QuantityManagement_BaseApprove.FirstOrDefault(x => x.BaseId == BaseId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
if (res != null)
{
res.ApproveDate = DateTime.Now;
db.SubmitChanges();
}
}
}
/// <summary>
/// 根据工程量基础表编号获取一个工程量基础表审批信息
/// </summary>
/// <param name="BaseId">工程量基础表编号</param>
/// <returns>一个工程量基础表审批实体</returns>
public static Model.QuantityManagement_BaseApprove GetBaseApproveByBaseId(string BaseId)
{
return db.QuantityManagement_BaseApprove.FirstOrDefault(x => x.BaseId == BaseId && x.ApproveType != "S" && x.ApproveDate == null);
}
/// <summary>
/// 修改工程量基础表审批信息
/// </summary>
/// <param name="managerRuleApprove">工程量基础表审批实体</param>
public static void UpdateBaseApprove(Model.QuantityManagement_BaseApprove approve)
{
Model.SGGLDB db = Funs.DB;
Model.QuantityManagement_BaseApprove newApprove = db.QuantityManagement_BaseApprove.First(e => e.BaseApproveId == approve.BaseApproveId && e.ApproveDate == null);
newApprove.BaseId = approve.BaseId;
newApprove.ApproveMan = approve.ApproveMan;
newApprove.ApproveDate = approve.ApproveDate;
newApprove.ApproveIdea = approve.ApproveIdea;
newApprove.IsAgree = approve.IsAgree;
newApprove.ApproveType = approve.ApproveType;
db.SubmitChanges();
}
/// <summary>
/// 增加工程量基础表审批信息
/// </summary>
/// <param name="managerRuleApprove">工程量基础表审批实体</param>
public static void AddBaseApprove(Model.QuantityManagement_BaseApprove approve)
{
Model.SGGLDB db = Funs.DB;
string newKeyID = SQLHelper.GetNewID(typeof(Model.QuantityManagement_BaseApprove));
Model.QuantityManagement_BaseApprove newApprove = new Model.QuantityManagement_BaseApprove();
newApprove.BaseApproveId = newKeyID;
newApprove.BaseId = approve.BaseId;
newApprove.ApproveMan = approve.ApproveMan;
newApprove.ApproveDate = approve.ApproveDate;
newApprove.ApproveIdea = approve.ApproveIdea;
newApprove.IsAgree = approve.IsAgree;
newApprove.ApproveType = approve.ApproveType;
db.QuantityManagement_BaseApprove.InsertOnSubmit(newApprove);
db.SubmitChanges();
}
public static string AddBaseApproveForApi(Model.QuantityManagement_BaseApprove approve)
{
using (var db = new Model.SGGLDB(Funs.ConnString))
{
string newKeyID = SQLHelper.GetNewID(typeof(Model.QuantityManagement_BaseApprove));
Model.QuantityManagement_BaseApprove newApprove = new Model.QuantityManagement_BaseApprove();
newApprove.BaseApproveId = newKeyID;
newApprove.BaseId = approve.BaseId;
newApprove.ApproveMan = approve.ApproveMan;
newApprove.ApproveDate = approve.ApproveDate;
newApprove.ApproveIdea = approve.ApproveIdea;
newApprove.IsAgree = approve.IsAgree;
newApprove.ApproveType = approve.ApproveType;
db.QuantityManagement_BaseApprove.InsertOnSubmit(newApprove);
db.SubmitChanges();
return newKeyID;
}
}
/// <summary>
/// 总包负责人审批信息
/// </summary>
/// <param name="BaseId"></param>
/// <returns></returns>
public static Model.QuantityManagement_BaseApprove GetAudit1(string BaseId)
{
return db.QuantityManagement_BaseApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.BaseId == BaseId && x.ApproveType == BLL.Const.Base_Audit1);
}
public static Model.QuantityManagement_BaseApprove GetComplie(string BaseId)
{
return db.QuantityManagement_BaseApprove.FirstOrDefault(x => x.BaseId == BaseId && x.ApproveType == BLL.Const.Base_Compile);
}
}
}
SGGL/BLL/CQMS/QuantityManagement/BaseService.cs
+41 -2
View File
@@ -39,6 +39,7 @@ namespace BLL
newBase.WorkTeam = Base.WorkTeam;
newBase.CompileMan = Base.CompileMan;
newBase.CompileDate = Base.CompileDate;
newBase.State = Base.State;
db.QuantityManagement_Base.InsertOnSubmit(newBase);
db.SubmitChanges();
@@ -62,6 +63,7 @@ namespace BLL
newBase.Amount = Base.Amount;
newBase.WorkTeam = Base.WorkTeam;
newBase.CompileMan = Base.CompileMan;
newBase.State = Base.State;
db.SubmitChanges();
}
}
@@ -108,7 +110,7 @@ namespace BLL
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var q = (from x in db.QuantityManagement_Base
where x.DrawingId == drawingId
where x.DrawingId == drawingId && x.State == BLL.Const.Base_Complete
orderby x.Part
select x.Part).Distinct().ToList();
ListItem[] list = new ListItem[q.Count()];
@@ -147,10 +149,47 @@ namespace BLL
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
return (from x in db.QuantityManagement_Base
where x.DrawingId == drawingId && x.Part == part
where x.DrawingId == drawingId && x.Part == part && x.State == BLL.Const.Base_Complete
orderby x.ProjectContent
select x).ToList();
}
}
public static void Init(FineUIPro.DropDownList dropName, string state, bool isShowPlease)
{
dropName.DataValueField = "Value";
dropName.DataTextField = "Text";
dropName.DataSource = GetDHandleTypeByState(state);
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
/// <summary>
/// 根据状态选择下一步办理类型
/// </summary>
/// <param name="state"></param>
/// <returns></returns>
public static ListItem[] GetDHandleTypeByState(string state)
{
if (state == Const.Base_Compile || state == Const.Base_ReCompile) //无是否同意
{
ListItem[] lis = new ListItem[1];
lis[0] = new ListItem("审核", Const.Base_Audit1);
return lis;
}
else if (state == Const.Base_Audit1)//有是否同意
{
ListItem[] lis = new ListItem[2];
lis[0] = new ListItem("审批完成", Const.Base_Complete);//是 加载
lis[1] = new ListItem("重新编制", Const.Base_ReCompile);//否加载
return lis;
}
else
return null;
}
}
}
SGGL/BLL/CQMS/QuantityManagement/ChangeService.cs
+4
View File
@@ -37,7 +37,9 @@ namespace BLL
newChange.Major = Change.Major;
newChange.AcceptDate = Change.AcceptDate;
newChange.CompletionStatus = Change.CompletionStatus;
newChange.CompletionStatus2 = Change.CompletionStatus2;
newChange.DutyPerson = Change.DutyPerson;
newChange.DrawingId = Change.DrawingId;
newChange.Remark = Change.Remark;
newChange.CompileMan = Change.CompileMan;
newChange.CompileDate = Change.CompileDate;
@@ -63,7 +65,9 @@ namespace BLL
newChange.Major = Change.Major;
newChange.AcceptDate = Change.AcceptDate;
newChange.CompletionStatus = Change.CompletionStatus;
newChange.CompletionStatus2 = Change.CompletionStatus2;
newChange.DutyPerson = Change.DutyPerson;
newChange.DrawingId = Change.DrawingId;
newChange.Remark = Change.Remark;
newChange.CompileMan = Change.CompileMan;
db.SubmitChanges();
SGGL/BLL/CQMS/QuantityManagement/DayInputService.cs
+2
View File
@@ -33,6 +33,7 @@ namespace BLL
newDayInput.ProjectId = DayInput.ProjectId;
newDayInput.BaseId = DayInput.BaseId;
newDayInput.Date = DayInput.Date;
newDayInput.WorkTeam = DayInput.WorkTeam;
newDayInput.DayAmount = DayInput.DayAmount;
newDayInput.CompileMan = DayInput.CompileMan;
newDayInput.CompileDate = DayInput.CompileDate;
@@ -54,6 +55,7 @@ namespace BLL
newDayInput.ProjectId = DayInput.ProjectId;
newDayInput.BaseId = DayInput.BaseId;
newDayInput.Date = DayInput.Date;
newDayInput.WorkTeam = DayInput.WorkTeam;
newDayInput.DayAmount = DayInput.DayAmount;
newDayInput.CompileMan = DayInput.CompileMan;
db.SubmitChanges();
SGGL/BLL/CQMS/QuantityManagement/DrawingService.cs
+50 -1
View File
@@ -37,6 +37,7 @@ namespace BLL
newDrawing.Major = Drawing.Major;
newDrawing.AcceptDate = Drawing.AcceptDate;
newDrawing.CompletionStatus = Drawing.CompletionStatus;
newDrawing.CompletionStatus2 = Drawing.CompletionStatus2;
newDrawing.DutyPerson = Drawing.DutyPerson;
newDrawing.Remark = Drawing.Remark;
newDrawing.CompileMan = Drawing.CompileMan;
@@ -63,6 +64,7 @@ namespace BLL
newDrawing.Major = Drawing.Major;
newDrawing.AcceptDate = Drawing.AcceptDate;
newDrawing.CompletionStatus = Drawing.CompletionStatus;
newDrawing.CompletionStatus2 = Drawing.CompletionStatus2;
newDrawing.DutyPerson = Drawing.DutyPerson;
newDrawing.Remark = Drawing.Remark;
newDrawing.CompileMan = Drawing.CompileMan;
@@ -102,6 +104,23 @@ namespace BLL
}
}
/// <summary>
/// 图纸登记下拉框
/// </summary>
/// <param name="dropName">下拉框名字</param>
/// <param name="isShowPlease">是否显示请选择</param>
public static void InitDrawingChangeDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
{
dropName.DataValueField = "Value";
dropName.DataTextField = "Text";
dropName.DataSource = GetDrawingChangeListByProjectId(projectId);
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
/// <summary>
/// 根据项目Id获取图纸登记下拉选择项
/// </summary>
@@ -112,11 +131,41 @@ namespace BLL
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var q = (from x in db.QuantityManagement_Drawing
where x.ProjectId == projectId
where x.ProjectId == projectId
orderby x.DrawingNo
select x).ToList();
return q;
}
}
/// <summary>
/// 根据项目Id获取图纸登记下拉选择项
/// </summary>
/// <param name="projectId"></param>
/// <returns></returns>
public static ListItem[] GetDrawingChangeListByProjectId(string projectId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var q1 = (from x in db.QuantityManagement_Drawing
where x.ProjectId == projectId
orderby x.DrawingNo
select x).ToList();
var q2 = (from x in db.QuantityManagement_Change
where x.ProjectId == projectId
orderby x.ChangeNo
select x).ToList();
ListItem[] list = new ListItem[q1.Count() + q2.Count()];
for (int i = 0; i < q1.Count(); i++)
{
list[i] = new ListItem(q1[i].DrawingNo ?? "", q1[i].DrawingId.ToString());
}
for (int j = q1.Count(); j < q1.Count() + q2.Count(); j++)
{
list[j] = new ListItem(q2[j - q1.Count()].ChangeNo ?? "", q2[j - q1.Count()].ChangeId.ToString());
}
return list;
}
}
}
}
SGGL/BLL/Common/Const.cs
+35 -1
View File
@@ -106,8 +106,21 @@ namespace BLL
/// </summary>
public const string PersonManageUrl = "File\\Excel\\HJGL_DataIn\\焊工人员导入模板.xls";
/// <summary>
/// 工程量日常统计表导出模板
/// </summary>
public const string DayInputStatisticsTemplateUrl = "File\\Excel\\DataOut\\工程量日常统计表.xlsx";
/// <summary>
/// 整体及分类汇总表导出模板
/// </summary>
public const string WorkTeamStatisticsTemplateUrl = "File\\Excel\\DataOut\\整体及分类汇总表.xlsx";
/// <summary>
/// 项目内容汇总表导出模板
/// </summary>
public const string ProjectContentStatisticsTemplateUrl = "File\\Excel\\DataOut\\项目内容汇总表.xlsx";
/// <summary>
/// 管道点口日报表
/// </summary>
@@ -5004,6 +5017,27 @@ namespace BLL
#endregion
#region 工程量基础表流程定义
/// <summary>
/// 重新编制
/// </summary>
public const string Base_ReCompile = "0";//总包
/// <summary>
/// 编制
/// </summary>
public const string Base_Compile = "1";//总包
/// <summary>
/// 审核
/// </summary>
public static string Base_Audit1 = "2";//总包
/// <summary>
/// 审批完成
/// </summary>
public static string Base_Complete = "3";
#endregion
#region 施工方案及审查流程定义
SGGL/BLL/ProjectData/TeamGroupService.cs
+33
View File
@@ -127,6 +127,20 @@ namespace BLL
orderby x.TeamGroupCode select x).ToList();
}
/// <summary>
/// 根据项目ID获取班组下拉选择项
/// </summary>
/// <param name="p"></param>
/// <param name="p_2"></param>
/// <returns></returns>
public static object GetTeamGroupListByProjectId(string projectId)
{
return (from x in Funs.DB.ProjectData_TeamGroup
where x.ProjectId == projectId
orderby x.TeamGroupCode
select x).ToList();
}
#region 表下拉框
/// <summary>
/// 表下拉框
@@ -146,6 +160,25 @@ namespace BLL
}
#endregion
#region 表下拉框
/// <summary>
/// 表下拉框
/// </summary>
/// <param name="dropName">下拉框名字</param>
/// <param name="isShowPlease">是否显示请选择</param>
public static void InitTeamGroupProjectDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
{
dropName.DataValueField = "TeamGroupId";
dropName.DataTextField = "TeamGroupName";
dropName.DataSource = GetTeamGroupListByProjectId(projectId);
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
#endregion
#region 表下拉框
/// <summary>
/// 表下拉框
SGGL/BLL/SysManage/UserService.cs
+31 -12
View File
@@ -196,7 +196,7 @@ namespace BLL
db.SubmitChanges();
}
}
public static void UpdatePassword(string userId )
public static void UpdatePassword(string userId)
{
Model.SGGLDB db = Funs.DB;
Model.Sys_User m = db.Sys_User.FirstOrDefault(e => e.UserId == userId);
@@ -295,7 +295,8 @@ namespace BLL
db.SubmitChanges();
}
}
catch (Exception e) {
catch (Exception e)
{
}
}
@@ -397,7 +398,7 @@ namespace BLL
{
getPUser = (from x in db.Project_ProjectUser
join u in db.Project_ProjectUnit on new { x.ProjectId, x.UnitId } equals new { u.ProjectId, u.UnitId }
where x.ProjectId == projectId && (u.UnitId == unitId)
where x.ProjectId == projectId && (u.UnitId == unitId)
select x).ToList();
}
else
@@ -412,7 +413,7 @@ namespace BLL
foreach (var item in getPUser)
{
List<string> roleIdList = Funs.GetStrListByStr(item.RoleId, ',');
var getRoles = db.Sys_Role.FirstOrDefault(x =>roleIdList.Contains(x.RoleId));
var getRoles = db.Sys_Role.FirstOrDefault(x => roleIdList.Contains(x.RoleId));
if (getRoles != null)
{
string userName = RoleService.getRoleNamesRoleIds(item.RoleId) + "-" + UserService.GetUserNameByUserId(item.UserId);
@@ -445,7 +446,7 @@ namespace BLL
{
users = (from x in db.Sys_User
join z in db.Sys_Role on x.RoleId equals z.RoleId
where x.IsPost == true
where x.IsPost == true
orderby x.UserCode
select new Model.SpSysUserItem
{
@@ -600,12 +601,12 @@ namespace BLL
return list;
}
}
/// <summary>
/// 根据项目号和角色Id获取用户下拉选项
/// </summary>
/// <returns></returns>
public static List<Model.Sys_User> GetUserListByProjectIdUnitIdRoleId(string projectId,string unitId, string roleIds)
public static List<Model.Sys_User> GetUserListByProjectIdUnitIdRoleId(string projectId, string unitId, string roleIds)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
@@ -618,7 +619,7 @@ namespace BLL
list = (from x in db.Sys_User
join y in db.Project_ProjectUser
on x.UserId equals y.UserId
where y.ProjectId == projectId && x.UnitId == unitId && listRoles.Contains(y.RoleId)
where y.ProjectId == projectId && x.UnitId == unitId && listRoles.Contains(y.RoleId)
orderby x.UserName
select x).ToList();
}
@@ -635,7 +636,7 @@ namespace BLL
else
{
list = (from x in db.Sys_User
where x.UnitId == unitId && x.UserId != BLL.Const.hfnbdId && x.UserId != Const.sedinId
where x.UnitId == unitId && x.UserId != BLL.Const.hfnbdId && x.UserId != Const.sedinId
orderby x.UserName
select x).ToList();
@@ -734,7 +735,7 @@ namespace BLL
{
dropName.DataValueField = "UserId";
dropName.DataTextField = "UserName";
dropName.DataSource = BLL.UserService.GetUserListByProjectIdUnitIdRoleId(projectId,unitId, roleIds);
dropName.DataSource = BLL.UserService.GetUserListByProjectIdUnitIdRoleId(projectId, unitId, roleIds);
dropName.DataBind();
if (isShowPlease)
{
@@ -858,6 +859,24 @@ namespace BLL
}
}
/// <summary>
/// 用户下拉框
/// </summary>
/// <param name="dropName">下拉框名字</param>
/// <param name="projectId">项目id</param>
/// <param name="isShowPlease">是否显示请选择</param>
public static void InitUserDropDownList2(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease, string UnitId)
{
dropName.DataValueField = "Value";
dropName.DataTextField = "Text";
dropName.DataSource = GetUserByUnitId(projectId, UnitId);
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
/// <summary>
/// 按照单位查询用户
/// </summary>
@@ -1611,7 +1630,7 @@ namespace BLL
{
if (getUnit.UnitCode.Length > 4)
{
prefixValue = getUnit.UnitCode.Substring(getUnit.UnitCode.Length-4, 4);
prefixValue = getUnit.UnitCode.Substring(getUnit.UnitCode.Length - 4, 4);
}
else
{
@@ -1623,7 +1642,7 @@ namespace BLL
{
if (idCard.Length > 4)
{
suffixValue = idCard.Substring(idCard.Length-4, 4);
suffixValue = idCard.Substring(idCard.Length - 4, 4);
}
else
{