diff --git a/DataBase/版本日志/SGGLDB_WH_2025-05-23-xiaj.sql b/DataBase/版本日志/SGGLDB_WH_2025-05-23-xiaj.sql
new file mode 100644
index 00000000..5fe5e2fc
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2025-05-23-xiaj.sql
@@ -0,0 +1,13 @@
+
+
+--½Ȳ״̬
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'JDGL_MonthPlan' AND COLUMN_NAME = 'IsOK')
+BEGIN
+ ALTER TABLE JDGL_MonthPlan ADD IsOK bit;
+END
+GO
+
+update JDGL_MonthPlan set IsOK =1 where RealDate is not null
+update JDGL_MonthPlan set IsOK =0 where RealDate is null
+GO
+
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index 9105a736..b9c0676f 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -574,35 +574,40 @@ namespace BLL
public static string WorkPost_Fitter2 = "F49B8430-AC71-40B2-86A3-6825C73F59E5";
///
- /// 焊工岗位Id
+ /// 焊工岗位Id——管道焊工
///
public static string WorkPost_Welder = "97afac2d-7ffb-49de-bf15-4b49ef24df63";
///
- /// 焊工岗位Id
+ /// 焊工岗位Id——结构焊工
///
public static string WorkPost_Welder1 = "16c736b6-7ee1-4069-8b57-1a658e6a615f";
///
- /// 焊工岗位Id
+ /// 焊工岗位Id——设备焊工
///
public static string WorkPost_Welder2 = "36644e8c-0593-4ca7-880f-6a55510c51a1";
///
- /// 焊工岗位Id
+ /// 焊工岗位Id——电焊工
///
public static string WorkPost_Welder3 = "5383f797-da4a-4547-b2aa-905a99c1bcfa";
///
- /// 焊工岗位Id
+ /// 焊工岗位Id——管道焊工
///
public static string WorkPost_Welder4 = "97afac2d-7ffb-49de-bf15-4b49ef24df63";
///
- /// 焊工岗位Id
+ /// 焊工岗位Id——其他焊工
///
public static string WorkPost_Welder5 = "F8CD2EB0-1D46-422B-A21C-331669B2CF6C";
+ ///
+ /// 焊工岗位Id——工艺焊工
+ ///
+ public static string WorkPost_Welder6 = "4ACC633F-BD81-4CBB-9058-A4E4DFFE7881";
+
///
/// 铆工岗位Id
///
diff --git a/SGGL/BLL/HSSE/SitePerson/PersonService.cs b/SGGL/BLL/HSSE/SitePerson/PersonService.cs
index 8ea2b202..3c4c6b51 100644
--- a/SGGL/BLL/HSSE/SitePerson/PersonService.cs
+++ b/SGGL/BLL/HSSE/SitePerson/PersonService.cs
@@ -122,7 +122,7 @@ namespace BLL
/// 每页数量
///
public static IEnumerable getListData(string projectId, string unitId, string personName, string identityCard, string treamGroupId, string workPostIds,
- bool ckTrain, string postType, bool ckJT, bool ckIdCardInfoNotOK, Grid Grid1,bool isBlack=false)
+ bool ckTrain, string postType, bool ckJT, bool ckIdCardInfoNotOK, bool chManager, Grid Grid1,bool isBlack=false)
{
IQueryable getPersonList = getPersonLists.Where(x => x.ProjectId == projectId);
if (!string.IsNullOrEmpty(unitId))
@@ -180,6 +180,10 @@ namespace BLL
{
getPersonList = getPersonList.Where(x => x.RealNameAddTime == null);
}
+ if (chManager)
+ {
+ getPersonList = getPersonList.Where(x => x.PostType == Const.PostType_1);
+ }
if (ckIdCardInfoNotOK)
{
getPersonList = getPersonList.Where(x => x.IdentityCard == null || x.HeadImage == null || (x.IdentityCard.Length != 15 && x.IdentityCard.Length != 18));
diff --git a/SGGL/BLL/JDGL/Check/MonthPlanService.cs b/SGGL/BLL/JDGL/Check/MonthPlanService.cs
index 504449a2..f5e1cc5b 100644
--- a/SGGL/BLL/JDGL/Check/MonthPlanService.cs
+++ b/SGGL/BLL/JDGL/Check/MonthPlanService.cs
@@ -49,6 +49,7 @@ namespace BLL
PlanDate = MonthPlan.PlanDate,
DutyPerson = MonthPlan.DutyPerson,
RealDate = MonthPlan.RealDate,
+ IsOK = MonthPlan.IsOK,
Remark = MonthPlan.Remark,
CompileMan = MonthPlan.CompileMan,
CompileDate = MonthPlan.CompileDate,
@@ -73,6 +74,7 @@ namespace BLL
newMonthPlan.PlanDate = MonthPlan.PlanDate;
newMonthPlan.DutyPerson = MonthPlan.DutyPerson;
newMonthPlan.RealDate = MonthPlan.RealDate;
+ newMonthPlan.IsOK = MonthPlan.IsOK;
newMonthPlan.Remark = MonthPlan.Remark;
newMonthPlan.CompileMan = MonthPlan.CompileMan;
newMonthPlan.CompileDate = MonthPlan.CompileDate;
diff --git a/SGGL/BLL/PMP/PMPDataService.cs b/SGGL/BLL/PMP/PMPDataService.cs
index c092d745..1670d8b1 100644
--- a/SGGL/BLL/PMP/PMPDataService.cs
+++ b/SGGL/BLL/PMP/PMPDataService.cs
@@ -189,7 +189,7 @@ namespace BLL
/// 项目OBS查询接口
///
/// 项目Id
- public static List GetPMPProjectOBSMasterData(string proId)
+ public static List GetPMPProjectOBSData(string proId)
{
string url = $"{PmpApiUrl}/api/standard/dis/query_all";
var token = GetToken();
diff --git a/SGGL/FineUIPro.Web/DataShow/JD.aspx b/SGGL/FineUIPro.Web/DataShow/JD.aspx
index caa8d497..243e007a 100644
--- a/SGGL/FineUIPro.Web/DataShow/JD.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/JD.aspx
@@ -31,7 +31,7 @@
@@ -53,7 +53,7 @@
-
-
@@ -110,10 +110,10 @@
-
+
-
-
@@ -184,10 +184,10 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+