diff --git a/DataBase/版本日志/SGGLDB_WH_2024-03-19-phf.sql b/DataBase/版本日志/SGGLDB_WH_2024-03-19-phf.sql
new file mode 100644
index 00000000..bc880423
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-03-19-phf.sql
@@ -0,0 +1,48 @@
+--
+update sys_menu set IsUsed=0 where menuid='ec1d25f6-fc6d-4b76-877d-d545669b21c9'
+
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('9CB732E5-21D3-4B5D-ABF9-1DADB1CA3A88','','CQMS/ProcessControl/NondestructiveTest_New.aspx',25,'149f1f1c-a925-412b-970e-e9b79d54e03f','Menu_CQMS',0,1,1)
+go
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('BC7C9DE9-24C2-4FA7-B03B-4B47C2E49627','9CB732E5-21D3-4B5D-ABF9-1DADB1CA3A88','',1)
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('51C295E7-2129-448D-92C9-D095E96869A8','9CB732E5-21D3-4B5D-ABF9-1DADB1CA3A88','',2)
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('0047CA81-925C-4D1B-B8DC-5484AB35859D','9CB732E5-21D3-4B5D-ABF9-1DADB1CA3A88','ɾ',3)
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('7F728497-368C-46FB-B67A-B7A3233C98D0','9CB732E5-21D3-4B5D-ABF9-1DADB1CA3A88','',4)
+go
+
+--µ
+CREATE TABLE [dbo].[ProcessControl_NondestructiveTest_New](
+ [Id] [nvarchar](50) NOT NULL,
+ [ProjectId] [nvarchar](50) NULL,
+ [UnitId] [nvarchar](50) NULL,
+ [ProfessionalName] [nvarchar](50) NULL,
+ [MonthQuantity] [int] NULL,
+ [TotalQuantity] [int] NULL,
+ [MonthRate] [nvarchar](50) NULL,
+ [TotalRate] [nvarchar](50) NULL,
+ [CreateDate] [datetime] NULL,
+ [CreateMan] [nvarchar](50) NULL,
+ CONSTRAINT [PK_ProcessControl_NondestructiveTest_New] PRIMARY KEY CLUSTERED
+(
+ [Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'רҵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ProcessControl_NondestructiveTest_New', @level2type=N'COLUMN',@level2name=N'ProfessionalName'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ƭ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ProcessControl_NondestructiveTest_New', @level2type=N'COLUMN',@level2name=N'MonthQuantity'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ۼƬ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ProcessControl_NondestructiveTest_New', @level2type=N'COLUMN',@level2name=N'TotalQuantity'
+GO
+
+--Ӻϸֶ
+ALTER TABLE Report_Construction_Plan
+ADD QuaRate nvarchar(50) NULL;
\ No newline at end of file
diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index 3566682a..65d69dbc 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -271,6 +271,7 @@
+
diff --git a/SGGL/BLL/CQMS/ProcessControl/NondestructiveTestNewService.cs b/SGGL/BLL/CQMS/ProcessControl/NondestructiveTestNewService.cs
new file mode 100644
index 00000000..f099fb2a
--- /dev/null
+++ b/SGGL/BLL/CQMS/ProcessControl/NondestructiveTestNewService.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections;
+
+namespace BLL
+{
+ public class NondestructiveTestNewService
+ {
+ public static bool Insert(Model.ProcessControl_NondestructiveTest_New model)
+ {
+ try
+ {
+ Funs.DB.ProcessControl_NondestructiveTest_New.InsertOnSubmit(model);
+ Funs.DB.SubmitChanges();
+ return true;
+ }
+ catch (Exception ex)
+ {
+ ErrLogInfo.WriteLog($"插入数据失败,原因：{ex.Message}");
+ return false;
+ }
+ }
+
+ public static bool Update(Model.ProcessControl_NondestructiveTest_New model)
+ {
+ try
+ {
+ var result = Funs.DB.ProcessControl_NondestructiveTest_New.FirstOrDefault(a => a.Id == model.Id);
+ if (result != null)
+ {
+ result.UnitId = model.UnitId;
+ result.ProfessionalName = model.ProfessionalName;
+ result.MonthQuantity = model.MonthQuantity;
+ result.TotalQuantity = model.TotalQuantity;
+ result.MonthRate = model.MonthRate;
+ result.TotalRate = model.TotalRate;
+ Funs.DB.SubmitChanges();
+ }
+ return true;
+ }
+ catch (Exception ex)
+ {
+ ErrLogInfo.WriteLog($"更新表数据失败,原因：{ex.Message}");
+ return false;
+ }
+ }
+
+ public static bool Delete(List newId)
+ {
+ try
+ {
+ var result = Funs.DB.ProcessControl_NondestructiveTest_New.Where(a => newId.Contains(a.Id)).ToList();
+ if (result.Count > 0)
+ {
+ Funs.DB.ProcessControl_NondestructiveTest_New.DeleteAllOnSubmit(result);
+ Funs.DB.SubmitChanges();
+ }
+ return true;
+ }
+ catch (Exception ex)
+ {
+ ErrLogInfo.WriteLog($"删除数据失败,原因：{ex.Message}");
+ return false;
+ }
+ }
+
+ public static bool Delete(string newId)
+ {
+ try
+ {
+ var result = Funs.DB.ProcessControl_NondestructiveTest_New.Where(a => a.Id == newId).ToList();
+ if (result.Count > 0)
+ {
+ Funs.DB.ProcessControl_NondestructiveTest_New.DeleteAllOnSubmit(result);
+ Funs.DB.SubmitChanges();
+ }
+ return true;
+ }
+ catch (Exception ex)
+ {
+ ErrLogInfo.WriteLog($"删除数据失败,原因：{ex.Message}");
+ return false;
+ }
+ }
+
+ public static Model.ProcessControl_NondestructiveTest_New Detail(string newId)
+ {
+ var result = Funs.DB.ProcessControl_NondestructiveTest_New.FirstOrDefault(a => a.Id == newId);
+ return result;
+ }
+ }
+}
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index d2dce73f..e65a3e3b 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -3231,6 +3231,10 @@ namespace BLL
///
public const string DriverSubContactTemplateUrl = "File\\Excel\\TestRun\\开车合作单位名录.xlsx";
+ ///
+ /// 新项目质量月报模板文件原始虚拟路径
+ ///
+ public const string MonthReportNewTemplateUrl = "File\\Word\\CQMS\\项目质量月报.doc";
#endregion
#region 绩效考核模板文件路径
@@ -3691,6 +3695,10 @@ namespace BLL
///
public const string ProjectControlPointMenuId = "5AA08233-9E04-4808-AC43-DD411C5F9D31";
+ ///
+ /// 无损检测管理（新）
+ ///
+ public const string NondestructiveTestNewMenuId = "9CB732E5-21D3-4B5D-ABF9-1DADB1CA3A88";
#region 国外项目
#region 资料库
///
diff --git a/SGGL/BLL/SysManage/UnitService.cs b/SGGL/BLL/SysManage/UnitService.cs
index 647c8449..4e193bbb 100644
--- a/SGGL/BLL/SysManage/UnitService.cs
+++ b/SGGL/BLL/SysManage/UnitService.cs
@@ -777,5 +777,18 @@ namespace BLL
}
return name;
}
+
+ //获取下拉单位，value和text都是中文
+ public static void InitUnitDownListByText(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
+ {
+ dropName.DataValueField = "Text";
+ dropName.DataTextField = "Text";
+ dropName.DataSource = drpMainOrSubUnitList(projectId);
+ dropName.DataBind();
+ if (isShowPlease)
+ {
+ Funs.FineUIPleaseSelect(dropName);
+ }
+ }
}
}
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx
index 9792a0bd..61249dbd 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx
@@ -67,9 +67,9 @@
-
-
+ --%>
-
+
-
+
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx
index d29af678..a820844e 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx
@@ -61,6 +61,9 @@
+