lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
杨红卫
2023-06-30 16:24:32 +08:00
parent f20df61fe5 a4f541fd35
commit 542cdc9ffb
5 changed files with 109 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/SGGL_SeDin/v17/.wsuo
BIN
View File
Binary file not shown.
DataBase/版本日志/SGGLDB_V2023-06-30.sql
+49
View File
@@ -0,0 +1,49 @@
--获取当前人项目级待办事项
ALTER PROCEDURE [dbo].[Sp_Project_GetToDoItems]
@projectId NVARCHAR(50)=NULL,
@personId NVARCHAR(200)=NULL
AS
/*获取当前人本部待办事项*/
BEGIN
SELECT CostManageId AS DataId
,'HSE费用申请' AS MenuName
,('HSE费用申请'+ CONVERT(varchar(100),CostManage.CostManageDate, 23)+'待处理。') AS Content
,PersonId
,persons.PersonName
,CostManage.CostManageDate AS DataTime
,CONVERT(varchar(100),CostManage.CostManageDate, 23) AS DataTimeStr
,(CASE WHEN CostManage.States = '0' THEN '../HSSE/CostGoods/CostManageEdit.aspx?CostManageId='+CostManageId
ELSE '../HSSE/CostGoods/CostManageAudit.aspx?CostManageId='+CostManageId END)AS PCUrl
FROM CostGoods_CostManage AS CostManage
LEFT JOIN Person_Persons AS persons ON CostManage.NextManId= persons.PersonId
WHERE CostManage.ProjectId=@projectId AND (CostManage.States = '0' or CostManage.States='1' )
AND CostManage.NextManId =@personId
UNION ALL
SELECT ActionPlan.ActionPlanListId AS DataId
,'安全实施计划' AS MenuName
,('安全实施计划'+ CONVERT(varchar(100),ActionPlan.CompileDate, 23)+'待处理。')+'待处理' AS Content
,approve.ApproveMan AS PersonId
,persons.PersonName
,CompileDate AS DataTime
,CONVERT(varchar(100),CompileDate, 23) AS DataTimeStr
,'../HSSE/ActionPlan/ActionPlanListEdit.aspx?ActionPlanListId='+ActionPlan.ActionPlanListId AS PCUrl
FROM ActionPlan_ActionPlanList AS ActionPlan
LEFT JOIN ActionPlan_ActionPlanListApprove as approve on ActionPlan.ActionPlanListId=approve.ActionPlanListId and ApproveType!='S' and approve.ApproveMan='2dabba4e-19e3-4ccd-8382-7393d9084894'
LEFT JOIN Person_Persons AS persons ON persons.PersonId =approve.ApproveMan
WHERE ActionPlan.ProjectId=@projectId and ActionPlan.ActionPlanListId in (select ActionPlanListId from dbo.ActionPlan_ActionPlanListApprove
where PersonId=@PersonId and ApproveDate is null and ApproveType!='S')
ORDER BY DataTime DESC
END
GO
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx
+8 -1
View File
@@ -11,6 +11,10 @@
color: red; color: red;
font-weight: bold; font-weight: bold;
} }
.customlabelNum span {
color: blue;
font-weight: bold;
}
</style> </style>
</head> </head>
<body> <body>
@@ -96,9 +100,12 @@
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left"> <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items> <Items>
<f:Label ID="lbSinglePreRate" CssClass="customlabel" runat="server" Label="主项预制率(达因)" LabelWidth="140"></f:Label> <f:Label ID="lbSinglePreRate" CssClass="customlabel" runat="server" Label="主项预制率(达因)" LabelWidth="140"></f:Label>
<f:Label ID="lbSinglePreRateByWeldJoint" CssClass="customlabel" runat="server" Label="主项预制率(焊口)" LabelWidth="140"></f:Label>
<f:Label ID="lbShopSize" CssClass="customlabel" runat="server" Label="预制口达因" LabelWidth="100"></f:Label> <f:Label ID="lbShopSize" CssClass="customlabel" runat="server" Label="预制口达因" LabelWidth="100"></f:Label>
<f:Label ID="lbFiledSize" CssClass="customlabel" runat="server" Label="安装口达因" LabelWidth="100"></f:Label> <f:Label ID="lbFiledSize" CssClass="customlabel" runat="server" Label="安装口达因" LabelWidth="100"></f:Label>
<f:Label ID="Label2" runat="server" LabelWidth="100"></f:Label>
<f:Label ID="lbSinglePreRateByWeldJoint" CssClass="customlabelNum" runat="server" Label="主项预制率(焊口)" LabelWidth="140"></f:Label>
<f:Label ID="lbShopSum" CssClass="customlabelNum" runat="server" Label="预制口数量" LabelWidth="140"></f:Label>
<f:Label ID="lbFiledSum" CssClass="customlabelNum" runat="server" Label="安装口数量" LabelWidth="140"></f:Label>
</Items> </Items>
</f:Toolbar> </f:Toolbar>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs
+15
View File
@@ -26,6 +26,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// 安装口总达因 /// 安装口总达因
/// </summary> /// </summary>
public static string FieldSumSize = "0"; public static string FieldSumSize = "0";
/// <summary>
/// 预制口总数量
/// </summary>
public static string ShopSum = "0";
/// <summary>
/// 安装口总数量
/// </summary>
public static string FieldSum = "0";
protected void Page_Load(object sender, EventArgs e) protected void Page_Load(object sender, EventArgs e)
{ {
@@ -253,6 +262,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
} }
this.lbShopSize.Text = ShopSumSize; this.lbShopSize.Text = ShopSumSize;
this.lbFiledSize.Text = FieldSumSize; this.lbFiledSize.Text = FieldSumSize;
this.lbShopSum.Text = ShopSum;
this.lbFiledSum.Text = FieldSum;
} }
} }
@@ -462,6 +473,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
where x.JointAttribute == "安装口" where x.JointAttribute == "安装口"
select x select x
).Count(); ).Count();
ShopSum = ShopNum.ToString();
FieldSum = FieldSum.ToString();
AllNum = ShopNum + FieldNum; AllNum = ShopNum + FieldNum;
if (AllNum > 0) if (AllNum > 0)
@@ -543,6 +556,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
where x.JointAttribute == "安装口" where x.JointAttribute == "安装口"
select x select x
).Count(); ).Count();
ShopSum = ShopNum.ToString();
FieldSum = FieldSum.ToString();
AllNum = ShopNum + FieldNum; AllNum = ShopNum + FieldNum;
if (AllNum > 0) if (AllNum > 0)
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.designer.cs
Generated
+36 -9
View File
@@ -221,15 +221,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks> /// </remarks>
protected global::FineUIPro.Label lbSinglePreRate; protected global::FineUIPro.Label lbSinglePreRate;
/// <summary>
/// lbSinglePreRateByWeldJoint 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbSinglePreRateByWeldJoint;
/// <summary> /// <summary>
/// lbShopSize 控件。 /// lbShopSize 控件。
/// </summary> /// </summary>
@@ -248,6 +239,42 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks> /// </remarks>
protected global::FineUIPro.Label lbFiledSize; protected global::FineUIPro.Label lbFiledSize;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label2;
/// <summary>
/// lbSinglePreRateByWeldJoint 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbSinglePreRateByWeldJoint;
/// <summary>
/// lbShopSum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbShopSum;
/// <summary>
/// lbFiledSum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbFiledSum;
/// <summary> /// <summary>
/// Grid1 控件。 /// Grid1 控件。
/// </summary> /// </summary>