diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo
index c2c0eec0..ae886eaa 100644
Binary files a/.vs/SGGL_SeDin/v17/.wsuo and b/.vs/SGGL_SeDin/v17/.wsuo differ
diff --git a/DataBase/版本日志/SGGLDB_V2023-06-30.sql b/DataBase/版本日志/SGGLDB_V2023-06-30.sql
new file mode 100644
index 00000000..b16797ae
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2023-06-30.sql
@@ -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
+
+
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx
index 8f588d9d..a7bb189f 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx
@@ -11,6 +11,10 @@
color: red;
font-weight: bold;
}
+ .customlabelNum span {
+ color: blue;
+ font-weight: bold;
+ }
@@ -95,10 +99,13 @@
-
-
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs
index 37562ac5..6ed9864d 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs
@@ -26,6 +26,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// 安装口总达因
///
public static string FieldSumSize = "0";
+
+ ///
+ /// 预制口总数量
+ ///
+ public static string ShopSum = "0";
+ ///
+ /// 安装口总数量
+ ///
+ public static string FieldSum = "0";
protected void Page_Load(object sender, EventArgs e)
{
@@ -253,6 +262,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
this.lbShopSize.Text = ShopSumSize;
this.lbFiledSize.Text = FieldSumSize;
+ this.lbShopSum.Text = ShopSum;
+ this.lbFiledSum.Text = FieldSum;
}
}
@@ -462,6 +473,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
where x.JointAttribute == "安装口"
select x
).Count();
+ ShopSum = ShopNum.ToString();
+ FieldSum = FieldSum.ToString();
AllNum = ShopNum + FieldNum;
if (AllNum > 0)
@@ -543,6 +556,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
where x.JointAttribute == "安装口"
select x
).Count();
+ ShopSum = ShopNum.ToString();
+ FieldSum = FieldSum.ToString();
AllNum = ShopNum + FieldNum;
if (AllNum > 0)
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.designer.cs
index 933cb925..85574aad 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.designer.cs
@@ -221,15 +221,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
///
protected global::FineUIPro.Label lbSinglePreRate;
- ///
- /// lbSinglePreRateByWeldJoint 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.Label lbSinglePreRateByWeldJoint;
-
///
/// lbShopSize 控件。
///
@@ -248,6 +239,42 @@ namespace FineUIPro.Web.HJGL.WeldingManage
///
protected global::FineUIPro.Label lbFiledSize;
+ ///
+ /// Label2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label Label2;
+
+ ///
+ /// lbSinglePreRateByWeldJoint 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label lbSinglePreRateByWeldJoint;
+
+ ///
+ /// lbShopSum 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label lbShopSum;
+
+ ///
+ /// lbFiledSum 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label lbFiledSum;
+
///
/// Grid1 控件。
///