From dd40ebf8223e1c92a4bba7096dfcbd083aab7d17 Mon Sep 17 00:00:00 2001
From: geh <1923421292@qq.com>
Date: Fri, 7 Mar 2025 16:30:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=B8=93=E6=A3=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/BLL/API/HSSE/APIHazardRegisterService.cs |    4 +-
 SGGL/BLL/BLL.csproj                           |    2 +-
 .../Inspect/Inspect_InspectionService.cs      |  494 +++++++
 SGGL/Model/APIItem/HSSE/HazardRegisterItem.cs |   11 +
 SGGL/Model/Model.cs                           | 1037 +++++++++++++
 SGGL/WebAPI/Controllers/DatabaseHelper.cs     |   47 +
 .../HSSE/AwardStandardsController.cs          |    4 +-
 .../HSSE/ConstructionStandardsController.cs   |    4 +-
 .../HSSE/ProtectionStandardsController.cs     |    4 +-
 .../HSSE/SafetyInspectionController.cs        |  264 ++++
 .../HSSE/SafetyResponsibilitiesController.cs  |    4 +-
 .../MaterialEntranceAndExitController.cs      | 1283 +++++++++++++++++
 SGGL/WebAPI/WebAPI.csproj                     |    3 +
 13 files changed, 3155 insertions(+), 6 deletions(-)
 create mode 100644 SGGL/BLL/OfficeCheck/Inspect/Inspect_InspectionService.cs
 create mode 100644 SGGL/WebAPI/Controllers/DatabaseHelper.cs
 create mode 100644 SGGL/WebAPI/Controllers/HSSE/SafetyInspectionController.cs
 create mode 100644 SGGL/WebAPI/Controllers/MaterialEntranceAndExitController.cs

diff --git a/SGGL/BLL/API/HSSE/APIHazardRegisterService.cs b/SGGL/BLL/API/HSSE/APIHazardRegisterService.cs
index c60e060..1059d3b 100644
--- a/SGGL/BLL/API/HSSE/APIHazardRegisterService.cs
+++ b/SGGL/BLL/API/HSSE/APIHazardRegisterService.cs
@@ -79,7 +79,9 @@ namespace BLL
                     IsWx = "Y",
                     CCManIds = hazardRegister.CCManIds,
                     Requirements = hazardRegister.Requirements,
-                    Risk_Level = hazardRegister.Risk_Level
+                    Risk_Level = hazardRegister.Risk_Level,
+                    RectifyId = hazardRegister.RectifyId,
+                    RectifyName = hazardRegister.RectifyName,
                 };
                 var isUpdate = db.HSSE_Hazard_HazardRegister.FirstOrDefault(x => x.HazardRegisterId == newHazardRegister.HazardRegisterId);
                 if (isUpdate == null)
diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index 5abdaa4..cd71d61 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -750,6 +750,7 @@
     <Compile Include="OfficeCheck\Check\ProjectSupervision_Check1Service.cs" />
     <Compile Include="OfficeCheck\Check\ProjectSupervision_RectifyItemService.cs" />
     <Compile Include="OfficeCheck\Check\ProjectSupervision_RectifyService.cs" />
+    <Compile Include="OfficeCheck\Inspect\Inspect_InspectionService.cs" />
     <Compile Include="OfficeCheck\ProjectEvaluation\ProjectEvaluationService.cs" />
     <Compile Include="OpenService\FileInsertService.cs" />
     <Compile Include="OpenService\FileStructService.cs" />
@@ -1150,7 +1151,6 @@
   <ItemGroup>
     <WCFMetadataStorage Include="Service References\CNCECHSSEService\" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/SGGL/BLL/OfficeCheck/Inspect/Inspect_InspectionService.cs b/SGGL/BLL/OfficeCheck/Inspect/Inspect_InspectionService.cs
new file mode 100644
index 0000000..e8e7994
--- /dev/null
+++ b/SGGL/BLL/OfficeCheck/Inspect/Inspect_InspectionService.cs
@@ -0,0 +1,494 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections;
+using Model;
+using static BLL.SafetyResponsibilitiesService;
+
+namespace BLL.OfficeCheck.Inspect;
+
+public class Inspect_InspectionService
+{
+   /// <summary>
+    /// 添加安全专项检查
+    /// </summary>
+    /// <param name="Inspection"></param>
+    public static void AddInspection(Model.Inspect_Inspection Inspection)
+    {
+        Model.SGGLDB db = Funs.DB;
+        Model.Inspect_Inspection newInspection = new Model.Inspect_Inspection
+        {
+            InspectionId = Inspection.InspectionId,
+            InspectionCode = Inspection.InspectionCode,
+            ProjectId = Inspection.ProjectId,
+            PersonResponsible = Inspection.PersonResponsible,
+            InspectTime = Inspection.InspectTime,
+            Description = Inspection.Description,
+            States = Inspection.States,
+            InspectMan = Inspection.InspectMan,
+            InspectType = Inspection.InspectType,
+            InspectItemSetId = Inspection.InspectItemSetId,
+            ProjectStates = Inspection.ProjectStates,
+            CreateMan = Inspection.CreateMan,
+            CreateTime = Inspection.CreateTime,
+
+        };
+        db.Inspect_Inspection.InsertOnSubmit(newInspection);
+        db.SubmitChanges();
+        // ////增加一条编码记录
+        // BLL.CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(BLL.Const.SafetyInspectionMenuId,
+        //     Inspection.ProjectId, null, Inspection.InspectionId, new DateTime());
+    }
+
+    /// <summary>
+    /// 添加安全专项明细检查
+    /// </summary>
+    /// <param name="Inspection"></param>
+    public static void AddInspectionItem(Model.Inspect_InspectionItem InspectionItem)
+    {
+        Model.SGGLDB db = Funs.DB;
+        Model.Inspect_InspectionItem newInspectionItem = new Model.Inspect_InspectionItem
+        {
+            InspectionItemId = InspectionItem.InspectionItemId,
+            InspectionId = InspectionItem.InspectionId,
+            InspectionItemCode = InspectionItem.InspectionItemCode,
+            ProjectId = InspectionItem.ProjectId,
+            InspectionDescribe = InspectionItem.InspectionDescribe,
+            PhotoUrl = InspectionItem.PhotoUrl,
+            VideoUrl = InspectionItem.VideoUrl,
+            EvaluateResults = InspectionItem.EvaluateResults,
+            TimeLimited = InspectionItem.TimeLimited,
+            RectificationDescription = InspectionItem.RectificationDescription,
+            RectificationResults = InspectionItem.RectificationResults,
+            States = InspectionItem.States,
+            CompileMan = InspectionItem.CompileMan,
+            CompileTime = InspectionItem.CompileTime,
+            
+        };
+        db.Inspect_InspectionItem.InsertOnSubmit(newInspectionItem);
+        db.SubmitChanges();
+        // ////增加一条编码记录
+        // BLL.CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(BLL.Const.ProjectSafetyInspectionMenuId,
+        //     InspectionItem.ProjectId, null, InspectionItem.InspectionItemId, new DateTime());
+    }
+
+    
+    
+    
+    /// <summary>
+    /// 根据专项检查ID获取专项明细信息
+    /// </summary>
+    /// <param name="CheckSpecialName"></param>
+    /// <returns></returns>
+    public static Model.Inspect_InspectionItem GetInspectItemsById(string InspectionItemId)
+    {
+        return Funs.DB.Inspect_InspectionItem.FirstOrDefault(e => e.InspectionItemId == InspectionItemId);
+    }
+        
+    /// <summary>
+    /// 根据专项检查ID获取专项信息
+    /// </summary>
+    /// <param name="CheckSpecialName"></param>
+    /// <returns></returns>
+    public static Model.Inspect_Inspection GetInspectionByInspectionId(string InspectionId)
+    {
+        return Funs.DB.Inspect_Inspection.FirstOrDefault(e => e.InspectionId == InspectionId);
+    }
+   
+    /// <summary>
+    /// 修改安全专项检查
+    /// </summary>
+    /// <param name="Inspection"></param>
+    public static void UpdateInspection(Model.Inspect_Inspection Inspection)
+    {
+        Model.SGGLDB db = Funs.DB;
+        Model.Inspect_Inspection newInspection =
+            db.Inspect_Inspection.FirstOrDefault(e => e.InspectionId == Inspection.InspectionId);
+        if (newInspection != null)
+        {
+            newInspection.InspectionCode = Inspection.InspectionCode;
+            //newInspection.ProjectId = Inspection.ProjectId;
+            newInspection.PersonResponsible = Inspection.PersonResponsible;
+            newInspection.InspectTime = Inspection.InspectTime;
+            newInspection.Description = Inspection.Description;
+            newInspection.States = Inspection.States;
+            newInspection.InspectMan = Inspection.InspectMan;
+            newInspection.InspectType = Inspection.InspectType;
+            newInspection.InspectItemSetId = Inspection.InspectItemSetId;
+            db.SubmitChanges();
+        }
+    }
+    /// <summary>
+    /// 修改安全专项检查明细
+    /// </summary>
+    /// <param name="Inspection"></param>
+    public static void UpdateInspectionItem(Model.Inspect_InspectionItem InspectionItem)
+    {
+        Model.SGGLDB db = Funs.DB;
+        Model.Inspect_InspectionItem newInspectionItem =
+            db.Inspect_InspectionItem.FirstOrDefault(e => e.InspectionItemId == InspectionItem.InspectionItemId);
+        if (newInspectionItem != null)
+        {
+            newInspectionItem.InspectionItemCode = InspectionItem.InspectionItemCode;
+            //newInspection.ProjectId = Inspection.ProjectId;
+            newInspectionItem.InspectionDescribe = InspectionItem.InspectionDescribe;
+            newInspectionItem.PhotoUrl = InspectionItem.PhotoUrl;
+            newInspectionItem.VideoUrl = InspectionItem.VideoUrl;
+            newInspectionItem.EvaluateResults = InspectionItem.EvaluateResults;
+            newInspectionItem.TimeLimited = InspectionItem.TimeLimited;
+            newInspectionItem.RectificationDescription = InspectionItem.RectificationDescription;
+            newInspectionItem.RectificationResults = InspectionItem.RectificationResults;
+            newInspectionItem.States = InspectionItem.States;
+            newInspectionItem.CompileMan = InspectionItem.CompileMan;
+            newInspectionItem.CompileTime = InspectionItem.CompileTime;
+            db.SubmitChanges();
+        }
+    }
+    
+    
+    /// <summary>
+    /// 根据专项检查ID删除对应专项检查记录信息
+    /// </summary>
+    /// <param name="superviseCheckReportId"></param>
+    public static void DeleteInspectionById(string InspectionId)
+    {
+        Model.SGGLDB db = Funs.DB;
+        var q = (from x in db.Inspect_Inspection where x.InspectionId == InspectionId select x).FirstOrDefault();
+        if (q != null)
+        {
+            ///删除编码表记录
+            BLL.CodeRecordsService.DeleteCodeRecordsByDataId(q.InspectionId);
+            ////删除附件表
+            BLL.CommonService.DeleteAttachFileById(q.InspectionId);              
+            ////删除审核流程表
+            BLL.CommonService.DeleteFlowOperateByID(q.InspectionId);
+            //删除明细
+            var list = (from x in db.Inspect_InspectionItem where x.InspectionId == InspectionId select x).ToList();
+            list.ForEach(e => { db.Inspect_InspectionItem.DeleteOnSubmit(e); });
+            db.Inspect_Inspection.DeleteOnSubmit(q);
+        }
+        db.SubmitChanges();
+    }
+    /// <summary>
+    /// 根据专项明细ID删除对应信息
+    /// </summary>
+    /// <param name="superviseCheckReportId"></param>
+    public static void DeleteInspectItemsById(string InspectionItemId)
+    {
+        Model.SGGLDB db = Funs.DB;
+        var q = (from x in db.Inspect_InspectionItem where x.InspectionItemId == InspectionItemId select x).FirstOrDefault();
+        if (q != null)
+        {
+            db.Inspect_InspectionItem.DeleteOnSubmit(q);
+        }
+        db.SubmitChanges();
+    }
+    /// <summary>
+    /// 根据专项检查ID删除对应专项检查明细记录信息
+    /// </summary>
+    /// <param name="superviseCheckReportId"></param>
+    public static void DeleteInspectionItemsByInspectionId(string InspectionId)
+    {
+        Model.SGGLDB db = Funs.DB;
+        var list = (from x in db.Inspect_InspectionItem where x.InspectionId == InspectionId select x).ToList();
+        list.ForEach(e => { db.Inspect_InspectionItem.DeleteOnSubmit(e); });
+        db.SubmitChanges();
+    }
+
+
+    /// <summary>
+    /// 获取专检集合
+    /// </summary>
+    /// <param name="SafetyResponsibilitiesId"></param>
+    /// <returns></returns>
+    public static List<InspectionDto> GetInspectionList(string? ProjectId,string States,string? PersonResponsible,int PageNumber, int PageSize)
+    {
+
+        var getDataLists = (from x in Funs.DB.Inspect_Inspection
+            join user in Funs.DB.Sys_User on x.InspectMan equals user.UserId into userJoin1
+            from subUser1 in userJoin1.DefaultIfEmpty()
+            join user in Funs.DB.Sys_User on x.CreateMan equals user.UserId into userJoin2
+            from subUser2 in userJoin2.DefaultIfEmpty()
+            join user in Funs.DB.Sys_User on x.PersonResponsible equals user.UserId into userJoin3
+            from subUser3 in userJoin3.DefaultIfEmpty()
+            join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into project
+            from pro in project.DefaultIfEmpty()
+            select new InspectionDto
+            {
+                InspectionId = x.InspectionId,
+                InspectionCode = x.InspectionCode,
+                ProjectId = x.ProjectId,
+                ProjectName = pro.ProjectName,
+                PersonResponsible = x.PersonResponsible,
+                PersonResponsibleName = subUser3.UserName,
+                InspectTime = x.InspectTime,
+                Description = x.Description,
+                States = x.States,
+                InspectMan = subUser1.UserName,
+                InspectManId = x.InspectMan,
+                InspectType = x.InspectType,
+                InspectItemSetId = x.InspectItemSetId,
+                CreateMan = subUser2.UserName,
+                CreateTime = x.CreateTime,
+            });
+        if (!string.IsNullOrEmpty(ProjectId))
+        {
+            getDataLists = getDataLists.Where(q => q.ProjectId == ProjectId);
+        }
+
+        if (!string.IsNullOrEmpty(States))
+        {
+            getDataLists = getDataLists.Where(q => q.States == States);
+        }
+
+        if (!string.IsNullOrEmpty(PersonResponsible))
+        {
+            getDataLists = getDataLists.Where(q => q.PersonResponsible == PersonResponsible);
+        }
+
+        if (PageNumber > 0 && PageSize > 0)
+        {
+            getDataLists = getDataLists.Skip((PageNumber - 1) * PageSize).Take(PageSize);
+        }
+        return getDataLists.ToList();
+        
+    }
+
+
+    /// <summary>
+    /// 获取专检明细集合
+    /// </summary>
+    /// <param name="SafetyResponsibilitiesId"></param>
+    /// <returns></returns>
+    public static List<InspectionItemDto> GetInspectionItemList(string InspectionId, int PageNumber, int PageSize)
+    {
+
+        List<InspectionItemDto> getDataLists = (from x in Funs.DB.Inspect_InspectionItem
+                                                join user in Funs.DB.Sys_User on x.CompileMan equals user.UserId into userJoin1
+                                                from subUser1 in userJoin1.DefaultIfEmpty()
+                                                join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into project
+                                                from pro in project.DefaultIfEmpty()
+                                                where x.InspectionId == InspectionId
+                                                select new InspectionItemDto
+                                            {
+                                                InspectionItemId = x.InspectionItemId,
+                                                InspectionId = x.InspectionId,
+                                                InspectionItemCode = x.InspectionItemCode,
+                                                ProjectId = x.ProjectId,
+                                                ProjectName = pro.ProjectName,
+                                                InspectionDescribe = x.InspectionDescribe,
+                                                PhotoUrl = x.PhotoUrl,
+                                                VideoUrl = x.VideoUrl,
+                                                EvaluateResults = x.EvaluateResults,
+                                                TimeLimited = x.TimeLimited,
+                                                RectificationDescription = x.RectificationDescription,
+                                                RectificationResults = x.RectificationResults,
+                                                States = x.States,
+                                                CompileMan = subUser1.UserName,
+                                                CompileTime = x.CompileTime,
+                                            }).ToList();
+        if (PageNumber > 0 && PageSize > 0)
+        {
+            getDataLists = getDataLists.Skip((PageNumber - 1) * PageSize).Take(PageSize).ToList();
+        }
+        return getDataLists;
+
+    }
+
+    /// <summary>
+    /// 根据专项检查ID获取专项明细检查信息
+    /// </summary>
+    /// <param name="CheckSpecialName"></param>
+    /// <returns></returns>
+    public static List<Model.Inspect_InspectionItem> GetInspectItemsByInspectionId(string InspectionId)
+    {
+        var list = (from x in Funs.DB.Inspect_InspectionItem
+                    where x.InspectionId == InspectionId
+                    select x).ToList();
+        return list;
+    }
+
+
+
+    public class InspectionDto
+    {
+
+        public string InspectionId
+        {
+            get;
+            set;
+        }
+
+        public string InspectionCode
+        {
+            get;
+            set;
+        }
+
+        public string ProjectId
+        {
+            get;
+            set;
+        }
+        public string ProjectName
+        {
+            get;
+            set;
+        }
+
+        public string PersonResponsible
+        {
+            get;
+            set;
+        }
+        public string PersonResponsibleName
+        {
+            get;
+            set;
+        }
+
+        public System.Nullable<System.DateTime> InspectTime
+        {
+            get;
+            set;
+        }
+
+        public string Description
+        {
+            get;
+            set;
+        }
+
+        public string States
+        {
+            get;
+            set;
+        }
+
+        public string InspectMan
+        {
+            get;
+            set;
+        }
+
+        public string InspectManId
+        {
+            get;
+            set;
+        }
+
+        public string InspectType
+        {
+            get;
+            set;
+        } 
+        public string InspectItemSetId
+        {
+            get;
+            set;
+        } 
+        public string CreateMan
+        {
+            get;
+            set;
+        } 
+        public System.Nullable<System.DateTime> CreateTime
+        {
+            get;
+            set;
+        }
+
+    }
+
+
+    public class InspectionItemDto
+    {
+
+        public string InspectionItemId
+        {
+            get;
+            set;
+        }
+
+        public string InspectionId
+        {
+            get;
+            set;
+        }
+
+        public string InspectionItemCode
+        {
+            get;
+            set;
+        }
+
+        public string ProjectId
+        {
+            get;
+            set;
+        } 
+        public string ProjectName
+        {
+            get;
+            set;
+        }
+
+        public string InspectionDescribe
+        {
+            get;
+            set;
+        }
+
+        public string PhotoUrl
+        {
+            get;
+            set;
+        }
+
+        public string VideoUrl
+        {
+            get;
+            set;
+        }
+
+        public string EvaluateResults
+        {
+            get;
+            set;
+        }
+
+        public System.Nullable<System.DateTime> TimeLimited
+        {
+            get;
+            set;
+        }
+        public string RectificationDescription
+        {
+            get;
+            set;
+        }
+        public string RectificationResults
+        {
+            get;
+            set;
+        }
+        public string States
+        {
+            get;
+            set;
+        }
+        public string CompileMan
+        {
+            get;
+            set;
+        }
+        public System.Nullable<System.DateTime> CompileTime
+        {
+            get;
+            set;
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/SGGL/Model/APIItem/HSSE/HazardRegisterItem.cs b/SGGL/Model/APIItem/HSSE/HazardRegisterItem.cs
index f928e53..163066e 100644
--- a/SGGL/Model/APIItem/HSSE/HazardRegisterItem.cs
+++ b/SGGL/Model/APIItem/HSSE/HazardRegisterItem.cs
@@ -367,5 +367,16 @@ namespace Model
             get;
             set;
         }
+        
+        public string RectifyId
+        {
+            get;
+            set;
+        }
+        public string RectifyName
+        {
+            get;
+            set;
+        }
     }
 }
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index da4f40b..12a9d42 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -1415,6 +1415,12 @@ namespace Model
     partial void InsertInformationProject_WorkSummaryReport(InformationProject_WorkSummaryReport instance);
     partial void UpdateInformationProject_WorkSummaryReport(InformationProject_WorkSummaryReport instance);
     partial void DeleteInformationProject_WorkSummaryReport(InformationProject_WorkSummaryReport instance);
+    partial void InsertInspect_Inspection(Inspect_Inspection instance);
+    partial void UpdateInspect_Inspection(Inspect_Inspection instance);
+    partial void DeleteInspect_Inspection(Inspect_Inspection instance);
+    partial void InsertInspect_InspectionItem(Inspect_InspectionItem instance);
+    partial void UpdateInspect_InspectionItem(Inspect_InspectionItem instance);
+    partial void DeleteInspect_InspectionItem(Inspect_InspectionItem instance);
     partial void InsertInterFaceLog(InterFaceLog instance);
     partial void UpdateInterFaceLog(InterFaceLog instance);
     partial void DeleteInterFaceLog(InterFaceLog instance);
@@ -6437,6 +6443,22 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Inspect_Inspection> Inspect_Inspection
+		{
+			get
+			{
+				return this.GetTable<Inspect_Inspection>();
+			}
+		}
+		
+		public System.Data.Linq.Table<Inspect_InspectionItem> Inspect_InspectionItem
+		{
+			get
+			{
+				return this.GetTable<Inspect_InspectionItem>();
+			}
+		}
+		
 		public System.Data.Linq.Table<InterFaceLog> InterFaceLog
 		{
 			get
@@ -28425,6 +28447,10 @@ namespace Model
 		
 		private EntitySet<InformationProject_WorkSummaryReport> _InformationProject_WorkSummaryReport;
 		
+		private EntitySet<Inspect_Inspection> _Inspect_Inspection;
+		
+		private EntitySet<Inspect_InspectionItem> _Inspect_InspectionItem;
+		
 		private EntitySet<Law_LawRegulationIdentify> _Law_LawRegulationIdentify;
 		
 		private EntitySet<License_BreakGround> _License_BreakGround;
@@ -28946,6 +28972,8 @@ namespace Model
 			this._InformationProject_ReceiveFileManager = new EntitySet<InformationProject_ReceiveFileManager>(new Action<InformationProject_ReceiveFileManager>(this.attach_InformationProject_ReceiveFileManager), new Action<InformationProject_ReceiveFileManager>(this.detach_InformationProject_ReceiveFileManager));
 			this._InformationProject_SafetyQuarterlyReport = new EntitySet<InformationProject_SafetyQuarterlyReport>(new Action<InformationProject_SafetyQuarterlyReport>(this.attach_InformationProject_SafetyQuarterlyReport), new Action<InformationProject_SafetyQuarterlyReport>(this.detach_InformationProject_SafetyQuarterlyReport));
 			this._InformationProject_WorkSummaryReport = new EntitySet<InformationProject_WorkSummaryReport>(new Action<InformationProject_WorkSummaryReport>(this.attach_InformationProject_WorkSummaryReport), new Action<InformationProject_WorkSummaryReport>(this.detach_InformationProject_WorkSummaryReport));
+			this._Inspect_Inspection = new EntitySet<Inspect_Inspection>(new Action<Inspect_Inspection>(this.attach_Inspect_Inspection), new Action<Inspect_Inspection>(this.detach_Inspect_Inspection));
+			this._Inspect_InspectionItem = new EntitySet<Inspect_InspectionItem>(new Action<Inspect_InspectionItem>(this.attach_Inspect_InspectionItem), new Action<Inspect_InspectionItem>(this.detach_Inspect_InspectionItem));
 			this._Law_LawRegulationIdentify = new EntitySet<Law_LawRegulationIdentify>(new Action<Law_LawRegulationIdentify>(this.attach_Law_LawRegulationIdentify), new Action<Law_LawRegulationIdentify>(this.detach_Law_LawRegulationIdentify));
 			this._License_BreakGround = new EntitySet<License_BreakGround>(new Action<License_BreakGround>(this.attach_License_BreakGround), new Action<License_BreakGround>(this.detach_License_BreakGround));
 			this._License_EquipmentSafetyList = new EntitySet<License_EquipmentSafetyList>(new Action<License_EquipmentSafetyList>(this.attach_License_EquipmentSafetyList), new Action<License_EquipmentSafetyList>(this.detach_License_EquipmentSafetyList));
@@ -32046,6 +32074,32 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Inspect_Inspection_Base_Project", Storage="_Inspect_Inspection", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
+		public EntitySet<Inspect_Inspection> Inspect_Inspection
+		{
+			get
+			{
+				return this._Inspect_Inspection;
+			}
+			set
+			{
+				this._Inspect_Inspection.Assign(value);
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Inspect_InspectionItem_Base_Project", Storage="_Inspect_InspectionItem", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
+		public EntitySet<Inspect_InspectionItem> Inspect_InspectionItem
+		{
+			get
+			{
+				return this._Inspect_InspectionItem;
+			}
+			set
+			{
+				this._Inspect_InspectionItem.Assign(value);
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Law_LawRegulationIdentify_Base_Project", Storage="_Law_LawRegulationIdentify", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
 		public EntitySet<Law_LawRegulationIdentify> Law_LawRegulationIdentify
 		{
@@ -35814,6 +35868,30 @@ namespace Model
 			entity.Base_Project = null;
 		}
 		
+		private void attach_Inspect_Inspection(Inspect_Inspection entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Project = this;
+		}
+		
+		private void detach_Inspect_Inspection(Inspect_Inspection entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Project = null;
+		}
+		
+		private void attach_Inspect_InspectionItem(Inspect_InspectionItem entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Project = this;
+		}
+		
+		private void detach_Inspect_InspectionItem(Inspect_InspectionItem entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Project = null;
+		}
+		
 		private void attach_Law_LawRegulationIdentify(Law_LawRegulationIdentify entity)
 		{
 			this.SendPropertyChanging();
@@ -191355,6 +191433,10 @@ namespace Model
 		
 		private string _ControlId;
 		
+		private string _RectifyId;
+		
+		private string _RectifyName;
+		
 		private EntityRef<Base_Unit> _Base_Unit;
 		
 		private EntityRef<HSSE_Hazard_HazardRegisterTypes> _HSSE_Hazard_HazardRegisterTypes;
@@ -191451,6 +191533,10 @@ namespace Model
     partial void OnRisk_LevelChanged();
     partial void OnControlIdChanging(string value);
     partial void OnControlIdChanged();
+    partial void OnRectifyIdChanging(string value);
+    partial void OnRectifyIdChanged();
+    partial void OnRectifyNameChanging(string value);
+    partial void OnRectifyNameChanged();
     #endregion
 		
 		public HSSE_Hazard_HazardRegister()
@@ -192348,6 +192434,46 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectifyId", DbType="NVarChar(50)")]
+		public string RectifyId
+		{
+			get
+			{
+				return this._RectifyId;
+			}
+			set
+			{
+				if ((this._RectifyId != value))
+				{
+					this.OnRectifyIdChanging(value);
+					this.SendPropertyChanging();
+					this._RectifyId = value;
+					this.SendPropertyChanged("RectifyId");
+					this.OnRectifyIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectifyName", DbType="VarChar(255)")]
+		public string RectifyName
+		{
+			get
+			{
+				return this._RectifyName;
+			}
+			set
+			{
+				if ((this._RectifyName != value))
+				{
+					this.OnRectifyNameChanging(value);
+					this.SendPropertyChanging();
+					this._RectifyName = value;
+					this.SendPropertyChanged("RectifyName");
+					this.OnRectifyNameChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HSSE_Hazard_HazardRegister_Base_Unit", Storage="_Base_Unit", ThisKey="ResponsibleUnit", OtherKey="UnitId", IsForeignKey=true)]
 		public Base_Unit Base_Unit
 		{
@@ -228653,6 +228779,881 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Inspect_Inspection")]
+	public partial class Inspect_Inspection : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _InspectionId;
+		
+		private string _InspectionCode;
+		
+		private string _ProjectId;
+		
+		private string _PersonResponsible;
+		
+		private System.Nullable<System.DateTime> _InspectTime;
+		
+		private string _Description;
+		
+		private string _States;
+		
+		private string _InspectMan;
+		
+		private string _InspectType;
+		
+		private string _InspectItemSetId;
+		
+		private string _ProjectStates;
+		
+		private string _CreateMan;
+		
+		private System.Nullable<System.DateTime> _CreateTime;
+		
+		private EntityRef<Base_Project> _Base_Project;
+		
+		private EntitySet<Inspect_InspectionItem> _Inspect_InspectionItem;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnInspectionIdChanging(string value);
+    partial void OnInspectionIdChanged();
+    partial void OnInspectionCodeChanging(string value);
+    partial void OnInspectionCodeChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
+    partial void OnPersonResponsibleChanging(string value);
+    partial void OnPersonResponsibleChanged();
+    partial void OnInspectTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnInspectTimeChanged();
+    partial void OnDescriptionChanging(string value);
+    partial void OnDescriptionChanged();
+    partial void OnStatesChanging(string value);
+    partial void OnStatesChanged();
+    partial void OnInspectManChanging(string value);
+    partial void OnInspectManChanged();
+    partial void OnInspectTypeChanging(string value);
+    partial void OnInspectTypeChanged();
+    partial void OnInspectItemSetIdChanging(string value);
+    partial void OnInspectItemSetIdChanged();
+    partial void OnProjectStatesChanging(string value);
+    partial void OnProjectStatesChanged();
+    partial void OnCreateManChanging(string value);
+    partial void OnCreateManChanged();
+    partial void OnCreateTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnCreateTimeChanged();
+    #endregion
+		
+		public Inspect_Inspection()
+		{
+			this._Base_Project = default(EntityRef<Base_Project>);
+			this._Inspect_InspectionItem = new EntitySet<Inspect_InspectionItem>(new Action<Inspect_InspectionItem>(this.attach_Inspect_InspectionItem), new Action<Inspect_InspectionItem>(this.detach_Inspect_InspectionItem));
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string InspectionId
+		{
+			get
+			{
+				return this._InspectionId;
+			}
+			set
+			{
+				if ((this._InspectionId != value))
+				{
+					this.OnInspectionIdChanging(value);
+					this.SendPropertyChanging();
+					this._InspectionId = value;
+					this.SendPropertyChanged("InspectionId");
+					this.OnInspectionIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionCode", DbType="NVarChar(50)")]
+		public string InspectionCode
+		{
+			get
+			{
+				return this._InspectionCode;
+			}
+			set
+			{
+				if ((this._InspectionCode != value))
+				{
+					this.OnInspectionCodeChanging(value);
+					this.SendPropertyChanging();
+					this._InspectionCode = value;
+					this.SendPropertyChanged("InspectionCode");
+					this.OnInspectionCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					if (this._Base_Project.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnProjectIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectId = value;
+					this.SendPropertyChanged("ProjectId");
+					this.OnProjectIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonResponsible", DbType="NVarChar(50)")]
+		public string PersonResponsible
+		{
+			get
+			{
+				return this._PersonResponsible;
+			}
+			set
+			{
+				if ((this._PersonResponsible != value))
+				{
+					this.OnPersonResponsibleChanging(value);
+					this.SendPropertyChanging();
+					this._PersonResponsible = value;
+					this.SendPropertyChanged("PersonResponsible");
+					this.OnPersonResponsibleChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> InspectTime
+		{
+			get
+			{
+				return this._InspectTime;
+			}
+			set
+			{
+				if ((this._InspectTime != value))
+				{
+					this.OnInspectTimeChanging(value);
+					this.SendPropertyChanging();
+					this._InspectTime = value;
+					this.SendPropertyChanged("InspectTime");
+					this.OnInspectTimeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Description", DbType="NVarChar(2000)")]
+		public string Description
+		{
+			get
+			{
+				return this._Description;
+			}
+			set
+			{
+				if ((this._Description != value))
+				{
+					this.OnDescriptionChanging(value);
+					this.SendPropertyChanging();
+					this._Description = value;
+					this.SendPropertyChanged("Description");
+					this.OnDescriptionChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_States", DbType="Char(1)")]
+		public string States
+		{
+			get
+			{
+				return this._States;
+			}
+			set
+			{
+				if ((this._States != value))
+				{
+					this.OnStatesChanging(value);
+					this.SendPropertyChanging();
+					this._States = value;
+					this.SendPropertyChanged("States");
+					this.OnStatesChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectMan", DbType="NVarChar(50)")]
+		public string InspectMan
+		{
+			get
+			{
+				return this._InspectMan;
+			}
+			set
+			{
+				if ((this._InspectMan != value))
+				{
+					this.OnInspectManChanging(value);
+					this.SendPropertyChanging();
+					this._InspectMan = value;
+					this.SendPropertyChanged("InspectMan");
+					this.OnInspectManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectType", DbType="Char(1)")]
+		public string InspectType
+		{
+			get
+			{
+				return this._InspectType;
+			}
+			set
+			{
+				if ((this._InspectType != value))
+				{
+					this.OnInspectTypeChanging(value);
+					this.SendPropertyChanging();
+					this._InspectType = value;
+					this.SendPropertyChanged("InspectType");
+					this.OnInspectTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectItemSetId", DbType="NVarChar(50)")]
+		public string InspectItemSetId
+		{
+			get
+			{
+				return this._InspectItemSetId;
+			}
+			set
+			{
+				if ((this._InspectItemSetId != value))
+				{
+					this.OnInspectItemSetIdChanging(value);
+					this.SendPropertyChanging();
+					this._InspectItemSetId = value;
+					this.SendPropertyChanged("InspectItemSetId");
+					this.OnInspectItemSetIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectStates", DbType="Char(1)")]
+		public string ProjectStates
+		{
+			get
+			{
+				return this._ProjectStates;
+			}
+			set
+			{
+				if ((this._ProjectStates != value))
+				{
+					this.OnProjectStatesChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectStates = value;
+					this.SendPropertyChanged("ProjectStates");
+					this.OnProjectStatesChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateMan", DbType="NVarChar(50)")]
+		public string CreateMan
+		{
+			get
+			{
+				return this._CreateMan;
+			}
+			set
+			{
+				if ((this._CreateMan != value))
+				{
+					this.OnCreateManChanging(value);
+					this.SendPropertyChanging();
+					this._CreateMan = value;
+					this.SendPropertyChanged("CreateMan");
+					this.OnCreateManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CreateTime
+		{
+			get
+			{
+				return this._CreateTime;
+			}
+			set
+			{
+				if ((this._CreateTime != value))
+				{
+					this.OnCreateTimeChanging(value);
+					this.SendPropertyChanging();
+					this._CreateTime = value;
+					this.SendPropertyChanged("CreateTime");
+					this.OnCreateTimeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Inspect_Inspection_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
+		public Base_Project Base_Project
+		{
+			get
+			{
+				return this._Base_Project.Entity;
+			}
+			set
+			{
+				Base_Project previousValue = this._Base_Project.Entity;
+				if (((previousValue != value) 
+							|| (this._Base_Project.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._Base_Project.Entity = null;
+						previousValue.Inspect_Inspection.Remove(this);
+					}
+					this._Base_Project.Entity = value;
+					if ((value != null))
+					{
+						value.Inspect_Inspection.Add(this);
+						this._ProjectId = value.ProjectId;
+					}
+					else
+					{
+						this._ProjectId = default(string);
+					}
+					this.SendPropertyChanged("Base_Project");
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Inspect_InspectionItem_Inspect_Inspection", Storage="_Inspect_InspectionItem", ThisKey="InspectionId", OtherKey="InspectionId", DeleteRule="NO ACTION")]
+		public EntitySet<Inspect_InspectionItem> Inspect_InspectionItem
+		{
+			get
+			{
+				return this._Inspect_InspectionItem;
+			}
+			set
+			{
+				this._Inspect_InspectionItem.Assign(value);
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+		
+		private void attach_Inspect_InspectionItem(Inspect_InspectionItem entity)
+		{
+			this.SendPropertyChanging();
+			entity.Inspect_Inspection = this;
+		}
+		
+		private void detach_Inspect_InspectionItem(Inspect_InspectionItem entity)
+		{
+			this.SendPropertyChanging();
+			entity.Inspect_Inspection = null;
+		}
+	}
+	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Inspect_InspectionItem")]
+	public partial class Inspect_InspectionItem : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _InspectionItemId;
+		
+		private string _InspectionId;
+		
+		private string _InspectionItemCode;
+		
+		private string _ProjectId;
+		
+		private string _InspectionDescribe;
+		
+		private string _PhotoUrl;
+		
+		private string _VideoUrl;
+		
+		private string _EvaluateResults;
+		
+		private System.Nullable<System.DateTime> _TimeLimited;
+		
+		private string _RectificationDescription;
+		
+		private string _RectificationResults;
+		
+		private string _States;
+		
+		private string _CompileMan;
+		
+		private System.Nullable<System.DateTime> _CompileTime;
+		
+		private EntityRef<Base_Project> _Base_Project;
+		
+		private EntityRef<Inspect_Inspection> _Inspect_Inspection;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnInspectionItemIdChanging(string value);
+    partial void OnInspectionItemIdChanged();
+    partial void OnInspectionIdChanging(string value);
+    partial void OnInspectionIdChanged();
+    partial void OnInspectionItemCodeChanging(string value);
+    partial void OnInspectionItemCodeChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
+    partial void OnInspectionDescribeChanging(string value);
+    partial void OnInspectionDescribeChanged();
+    partial void OnPhotoUrlChanging(string value);
+    partial void OnPhotoUrlChanged();
+    partial void OnVideoUrlChanging(string value);
+    partial void OnVideoUrlChanged();
+    partial void OnEvaluateResultsChanging(string value);
+    partial void OnEvaluateResultsChanged();
+    partial void OnTimeLimitedChanging(System.Nullable<System.DateTime> value);
+    partial void OnTimeLimitedChanged();
+    partial void OnRectificationDescriptionChanging(string value);
+    partial void OnRectificationDescriptionChanged();
+    partial void OnRectificationResultsChanging(string value);
+    partial void OnRectificationResultsChanged();
+    partial void OnStatesChanging(string value);
+    partial void OnStatesChanged();
+    partial void OnCompileManChanging(string value);
+    partial void OnCompileManChanged();
+    partial void OnCompileTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompileTimeChanged();
+    #endregion
+		
+		public Inspect_InspectionItem()
+		{
+			this._Base_Project = default(EntityRef<Base_Project>);
+			this._Inspect_Inspection = default(EntityRef<Inspect_Inspection>);
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionItemId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string InspectionItemId
+		{
+			get
+			{
+				return this._InspectionItemId;
+			}
+			set
+			{
+				if ((this._InspectionItemId != value))
+				{
+					this.OnInspectionItemIdChanging(value);
+					this.SendPropertyChanging();
+					this._InspectionItemId = value;
+					this.SendPropertyChanged("InspectionItemId");
+					this.OnInspectionItemIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		public string InspectionId
+		{
+			get
+			{
+				return this._InspectionId;
+			}
+			set
+			{
+				if ((this._InspectionId != value))
+				{
+					if (this._Inspect_Inspection.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnInspectionIdChanging(value);
+					this.SendPropertyChanging();
+					this._InspectionId = value;
+					this.SendPropertyChanged("InspectionId");
+					this.OnInspectionIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionItemCode", DbType="NVarChar(50)")]
+		public string InspectionItemCode
+		{
+			get
+			{
+				return this._InspectionItemCode;
+			}
+			set
+			{
+				if ((this._InspectionItemCode != value))
+				{
+					this.OnInspectionItemCodeChanging(value);
+					this.SendPropertyChanging();
+					this._InspectionItemCode = value;
+					this.SendPropertyChanged("InspectionItemCode");
+					this.OnInspectionItemCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					if (this._Base_Project.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnProjectIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectId = value;
+					this.SendPropertyChanged("ProjectId");
+					this.OnProjectIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionDescribe", DbType="NVarChar(1000)")]
+		public string InspectionDescribe
+		{
+			get
+			{
+				return this._InspectionDescribe;
+			}
+			set
+			{
+				if ((this._InspectionDescribe != value))
+				{
+					this.OnInspectionDescribeChanging(value);
+					this.SendPropertyChanging();
+					this._InspectionDescribe = value;
+					this.SendPropertyChanged("InspectionDescribe");
+					this.OnInspectionDescribeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PhotoUrl", DbType="NVarChar(1000)")]
+		public string PhotoUrl
+		{
+			get
+			{
+				return this._PhotoUrl;
+			}
+			set
+			{
+				if ((this._PhotoUrl != value))
+				{
+					this.OnPhotoUrlChanging(value);
+					this.SendPropertyChanging();
+					this._PhotoUrl = value;
+					this.SendPropertyChanged("PhotoUrl");
+					this.OnPhotoUrlChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_VideoUrl", DbType="NVarChar(1000)")]
+		public string VideoUrl
+		{
+			get
+			{
+				return this._VideoUrl;
+			}
+			set
+			{
+				if ((this._VideoUrl != value))
+				{
+					this.OnVideoUrlChanging(value);
+					this.SendPropertyChanging();
+					this._VideoUrl = value;
+					this.SendPropertyChanged("VideoUrl");
+					this.OnVideoUrlChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EvaluateResults", DbType="NVarChar(20)")]
+		public string EvaluateResults
+		{
+			get
+			{
+				return this._EvaluateResults;
+			}
+			set
+			{
+				if ((this._EvaluateResults != value))
+				{
+					this.OnEvaluateResultsChanging(value);
+					this.SendPropertyChanging();
+					this._EvaluateResults = value;
+					this.SendPropertyChanged("EvaluateResults");
+					this.OnEvaluateResultsChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TimeLimited", DbType="DateTime")]
+		public System.Nullable<System.DateTime> TimeLimited
+		{
+			get
+			{
+				return this._TimeLimited;
+			}
+			set
+			{
+				if ((this._TimeLimited != value))
+				{
+					this.OnTimeLimitedChanging(value);
+					this.SendPropertyChanging();
+					this._TimeLimited = value;
+					this.SendPropertyChanged("TimeLimited");
+					this.OnTimeLimitedChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectificationDescription", DbType="NVarChar(1000)")]
+		public string RectificationDescription
+		{
+			get
+			{
+				return this._RectificationDescription;
+			}
+			set
+			{
+				if ((this._RectificationDescription != value))
+				{
+					this.OnRectificationDescriptionChanging(value);
+					this.SendPropertyChanging();
+					this._RectificationDescription = value;
+					this.SendPropertyChanged("RectificationDescription");
+					this.OnRectificationDescriptionChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectificationResults", DbType="NVarChar(20)")]
+		public string RectificationResults
+		{
+			get
+			{
+				return this._RectificationResults;
+			}
+			set
+			{
+				if ((this._RectificationResults != value))
+				{
+					this.OnRectificationResultsChanging(value);
+					this.SendPropertyChanging();
+					this._RectificationResults = value;
+					this.SendPropertyChanged("RectificationResults");
+					this.OnRectificationResultsChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_States", DbType="NVarChar(100)")]
+		public string States
+		{
+			get
+			{
+				return this._States;
+			}
+			set
+			{
+				if ((this._States != value))
+				{
+					this.OnStatesChanging(value);
+					this.SendPropertyChanging();
+					this._States = value;
+					this.SendPropertyChanged("States");
+					this.OnStatesChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")]
+		public string CompileMan
+		{
+			get
+			{
+				return this._CompileMan;
+			}
+			set
+			{
+				if ((this._CompileMan != value))
+				{
+					this.OnCompileManChanging(value);
+					this.SendPropertyChanging();
+					this._CompileMan = value;
+					this.SendPropertyChanged("CompileMan");
+					this.OnCompileManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CompileTime
+		{
+			get
+			{
+				return this._CompileTime;
+			}
+			set
+			{
+				if ((this._CompileTime != value))
+				{
+					this.OnCompileTimeChanging(value);
+					this.SendPropertyChanging();
+					this._CompileTime = value;
+					this.SendPropertyChanged("CompileTime");
+					this.OnCompileTimeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Inspect_InspectionItem_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
+		public Base_Project Base_Project
+		{
+			get
+			{
+				return this._Base_Project.Entity;
+			}
+			set
+			{
+				Base_Project previousValue = this._Base_Project.Entity;
+				if (((previousValue != value) 
+							|| (this._Base_Project.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._Base_Project.Entity = null;
+						previousValue.Inspect_InspectionItem.Remove(this);
+					}
+					this._Base_Project.Entity = value;
+					if ((value != null))
+					{
+						value.Inspect_InspectionItem.Add(this);
+						this._ProjectId = value.ProjectId;
+					}
+					else
+					{
+						this._ProjectId = default(string);
+					}
+					this.SendPropertyChanged("Base_Project");
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Inspect_InspectionItem_Inspect_Inspection", Storage="_Inspect_Inspection", ThisKey="InspectionId", OtherKey="InspectionId", IsForeignKey=true)]
+		public Inspect_Inspection Inspect_Inspection
+		{
+			get
+			{
+				return this._Inspect_Inspection.Entity;
+			}
+			set
+			{
+				Inspect_Inspection previousValue = this._Inspect_Inspection.Entity;
+				if (((previousValue != value) 
+							|| (this._Inspect_Inspection.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._Inspect_Inspection.Entity = null;
+						previousValue.Inspect_InspectionItem.Remove(this);
+					}
+					this._Inspect_Inspection.Entity = value;
+					if ((value != null))
+					{
+						value.Inspect_InspectionItem.Add(this);
+						this._InspectionId = value.InspectionId;
+					}
+					else
+					{
+						this._InspectionId = default(string);
+					}
+					this.SendPropertyChanged("Inspect_Inspection");
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.InterFaceLog")]
 	public partial class InterFaceLog : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -426868,6 +427869,10 @@ namespace Model
 		
 		private string _RegisterTypesName;
 		
+		private string _RectifyId;
+		
+		private string _RectifyName;
+		
 		private string _DIC_ID;
 		
 		private string _CCManIds;
@@ -427664,6 +428669,38 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectifyId", DbType="NVarChar(50)")]
+		public string RectifyId
+		{
+			get
+			{
+				return this._RectifyId;
+			}
+			set
+			{
+				if ((this._RectifyId != value))
+				{
+					this._RectifyId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectifyName", DbType="VarChar(255)")]
+		public string RectifyName
+		{
+			get
+			{
+				return this._RectifyName;
+			}
+			set
+			{
+				if ((this._RectifyName != value))
+				{
+					this._RectifyName = value;
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DIC_ID", DbType="VarChar(60)")]
 		public string DIC_ID
 		{
diff --git a/SGGL/WebAPI/Controllers/DatabaseHelper.cs b/SGGL/WebAPI/Controllers/DatabaseHelper.cs
new file mode 100644
index 0000000..f437b5b
--- /dev/null
+++ b/SGGL/WebAPI/Controllers/DatabaseHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Data.SqlClient;
+
+namespace WebAPI.Helpers
+{
+    public class DatabaseHelper : IDisposable
+    {
+        private SqlConnection _sqlConnection;
+        private bool _disposed = false;
+
+        public DatabaseHelper(string connectionString)
+        {
+            _sqlConnection = new SqlConnection(connectionString);
+            _sqlConnection.Open();
+        }
+
+        public SqlConnection GetConnection()
+        {
+            return _sqlConnection;
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!_disposed)
+            {
+                if (disposing)
+                {
+                    // 释放托管资源
+                    if (_sqlConnection != null)
+                    {
+                        _sqlConnection.Close();
+                        _sqlConnection.Dispose();
+                        _sqlConnection = null;
+                    }
+                }
+                // 释放非托管资源
+                _disposed = true;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/WebAPI/Controllers/HSSE/AwardStandardsController.cs b/SGGL/WebAPI/Controllers/HSSE/AwardStandardsController.cs
index d72e85b..9baf670 100644
--- a/SGGL/WebAPI/Controllers/HSSE/AwardStandardsController.cs
+++ b/SGGL/WebAPI/Controllers/HSSE/AwardStandardsController.cs
@@ -40,7 +40,9 @@ namespace WebAPI.Controllers.HSSE
             var responeData = new Model.ResponeData();
             try
             {
-                responeData.data = AwardStandardsService.GetAwardStandardsListById(AwardStandardsId);
+                var data = AwardStandardsService.GetAwardStandardsListById(AwardStandardsId);
+                data.AttachUrl = BLL.AttachFileService.getFileUrl(data.AwardStandardsId);
+                responeData.data = data;
             }
             catch (Exception ex)
             {
diff --git a/SGGL/WebAPI/Controllers/HSSE/ConstructionStandardsController.cs b/SGGL/WebAPI/Controllers/HSSE/ConstructionStandardsController.cs
index df49c1b..8ae4998 100644
--- a/SGGL/WebAPI/Controllers/HSSE/ConstructionStandardsController.cs
+++ b/SGGL/WebAPI/Controllers/HSSE/ConstructionStandardsController.cs
@@ -40,7 +40,9 @@ namespace WebAPI.Controllers.HSSE
             var responeData = new Model.ResponeData();
             try
             {
-                responeData.data = ConstructionStandardsService.GetConstructionStandardsListById(ConstructionStandardsId);
+                var data = ConstructionStandardsService.GetConstructionStandardsListById(ConstructionStandardsId);
+                data.AttachUrl = BLL.AttachFileService.getFileUrl(data.ConstructionStandardsId);
+                responeData.data = data;
             }
             catch (Exception ex)
             {
diff --git a/SGGL/WebAPI/Controllers/HSSE/ProtectionStandardsController.cs b/SGGL/WebAPI/Controllers/HSSE/ProtectionStandardsController.cs
index 3b6029e..ff03bcc 100644
--- a/SGGL/WebAPI/Controllers/HSSE/ProtectionStandardsController.cs
+++ b/SGGL/WebAPI/Controllers/HSSE/ProtectionStandardsController.cs
@@ -39,7 +39,9 @@ namespace WebAPI.Controllers.HSSE
             var responeData = new Model.ResponeData();
             try
             {
-                responeData.data = ProtectionStandardsService.GetProtectionStandardsListById(ProtectionStandardsId);
+                var data = ProtectionStandardsService.GetProtectionStandardsListById(ProtectionStandardsId);
+                data.AttachUrl = BLL.AttachFileService.getFileUrl(data.ProtectionStandardsId);
+                responeData.data = data;
             }
             catch (Exception ex)
             {
diff --git a/SGGL/WebAPI/Controllers/HSSE/SafetyInspectionController.cs b/SGGL/WebAPI/Controllers/HSSE/SafetyInspectionController.cs
new file mode 100644
index 0000000..0f0d137
--- /dev/null
+++ b/SGGL/WebAPI/Controllers/HSSE/SafetyInspectionController.cs
@@ -0,0 +1,264 @@
+using BLL;
+using System;
+using System.Linq;
+using System.Web.Http;
+using BLL.OfficeCheck.Inspect;
+using Model;
+using static BLL.OfficeCheck.Inspect.Inspect_InspectionService;
+using System.Collections.Generic;
+
+namespace WebAPI.Controllers.HSSE
+{
+    public class SafetyInspectionController : ApiController
+    {
+        //新增
+        /// <summary>
+        /// 编辑 保存
+        /// </summary>
+        /// <param name="trainingPlan">安全专检</param>
+        [HttpPost]
+        public Model.ResponeData Save([FromBody] Model.Inspect_Inspection Inspection)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                if (string.IsNullOrEmpty(Inspection.InspectionId))
+                {
+                    Inspection.InspectionId = Guid.NewGuid().ToString();
+                    Inspection.CreateTime = DateTime.Now;
+                    Inspect_InspectionService.AddInspection(Inspection);
+                }
+                else
+                {
+                    Inspect_InspectionService.UpdateInspection(Inspection);
+                }
+
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        
+        //查询
+        public Model.ResponeData getList(string ProjectId,string States,string PersonResponsible, int PageNumber, int PageSize)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                
+                responeData.data = Inspect_InspectionService.GetInspectionList(ProjectId,States,PersonResponsible,PageNumber,PageSize);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        
+        //专检明细
+        public Model.ResponeData getInspectionById(string InspectionId)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var getDataLists = (from x in Funs.DB.Inspect_Inspection
+                                                    join user in Funs.DB.Sys_User on x.InspectMan equals user.UserId into userJoin1
+                                                    from subUser1 in userJoin1.DefaultIfEmpty()
+                                                    join user in Funs.DB.Sys_User on x.CreateMan equals user.UserId into userJoin2
+                                                    from subUser2 in userJoin2.DefaultIfEmpty()
+                                                    join user in Funs.DB.Sys_User on x.PersonResponsible equals user.UserId into userJoin3
+                                                    from subUser3 in userJoin3.DefaultIfEmpty()
+                                                    join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into project
+                                                    from pro in project.DefaultIfEmpty()
+                                                    where x.InspectionId == InspectionId
+                                    select new InspectionDto
+                                                    {
+                                                        InspectionId = x.InspectionId,
+                                                        InspectionCode = x.InspectionCode,
+                                                        ProjectId = x.ProjectId,
+                                                        ProjectName = pro.ProjectName,
+                                                        PersonResponsible = x.PersonResponsible,
+                                                        PersonResponsibleName = subUser3.UserName,
+                                                        InspectTime = x.InspectTime,
+                                                        Description = x.Description,
+                                                        States = x.States,
+                                                        InspectMan = subUser1.UserName,
+                                                        InspectManId = x.InspectMan,
+                                                        InspectType = x.InspectType,
+                                                        InspectItemSetId = x.InspectItemSetId,
+                                                        CreateMan = subUser2.UserName,
+                                                        CreateTime = x.CreateTime,
+                                                    }).FirstOrDefault();
+
+                responeData.data = getDataLists;
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+
+        //项目负责人下拉
+        public Model.ResponeData getPersonResponsibleList(string ProjectId)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+                {
+                    var users = (from x in db.Sys_User
+                                 where x.IsPost == true && x.UserId != Const.hfnbdId && x.UserId != Const.sedinId
+                                 orderby x.UserName
+                                 select new UserDto
+                                 {
+                                     UserId = x.UserId,
+                                     UserName = x.UserName,
+                                 }).ToList();
+                    if (!string.IsNullOrEmpty(ProjectId))
+                    {
+                        users = (from x in users
+                                 join y in db.Project_ProjectUser on x.UserId equals y.UserId
+                                 where y.ProjectId == ProjectId
+                                 orderby x.UserName
+                                 select new UserDto
+                                 {
+                                     UserId = x.UserId,
+                                     UserName = x.UserName,
+                                 }).ToList();
+                    }
+
+                    responeData.data = users;
+                }
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+
+        public class UserDto
+        {
+            public string UserId
+            {
+                get;
+                set;
+            }
+            public string UserName
+            {
+                get;
+                set;
+            }
+        }
+
+
+            //专检明细
+            public Model.ResponeData getInspectItemsByInspectionId(string InspectionId, int PageNumber, int PageSize)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = Inspect_InspectionService.GetInspectionItemList(InspectionId,PageNumber,PageSize);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+
+
+        //编辑 新增明细
+        [HttpPost]
+        public Model.ResponeData SaveInspectionItem([FromBody] List<Model.Inspect_InspectionItem> InspectionItems)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                foreach (var InspectionItem in InspectionItems)
+                {
+                    if (string.IsNullOrEmpty(InspectionItem.InspectionItemId))
+                    {
+                        InspectionItem.InspectionItemId = Guid.NewGuid().ToString();
+                        InspectionItem.CompileTime = DateTime.Now;
+                        Inspect_InspectionService.AddInspectionItem(InspectionItem);
+                    }
+                    else
+                    {
+                        Inspect_InspectionService.UpdateInspectionItem(InspectionItem);
+                    }
+                }
+
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+
+
+        //专检子表明细
+
+        public Model.ResponeData getInspectItemsById(string InspectionItemId)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+
+                var getDataLists = (from x in Funs.DB.Inspect_InspectionItem
+                                    join user in Funs.DB.Sys_User on x.CompileMan equals user.UserId into userJoin1
+                                    from subUser1 in userJoin1.DefaultIfEmpty()
+                                    join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into project
+                                    from pro in project.DefaultIfEmpty()
+                                    where x.InspectionItemId == InspectionItemId
+                                    select new InspectionItemDto
+                                    {
+                                        InspectionItemId = x.InspectionItemId,
+                                        InspectionId = x.InspectionId,
+                                        InspectionItemCode = x.InspectionItemCode,
+                                        ProjectId = x.ProjectId,
+                                        ProjectName = pro.ProjectName,
+                                        InspectionDescribe = x.InspectionDescribe,
+                                        PhotoUrl = x.PhotoUrl,
+                                        VideoUrl = x.VideoUrl,
+                                        EvaluateResults = x.EvaluateResults,
+                                        TimeLimited = x.TimeLimited,
+                                        RectificationDescription = x.RectificationDescription,
+                                        RectificationResults = x.RectificationResults,
+                                        States = x.States,
+                                        CompileMan = subUser1.UserName,
+                                        CompileTime = x.CompileTime,
+                                    }).FirstOrDefault();
+
+
+
+                responeData.data = getDataLists;
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/SGGL/WebAPI/Controllers/HSSE/SafetyResponsibilitiesController.cs b/SGGL/WebAPI/Controllers/HSSE/SafetyResponsibilitiesController.cs
index 3154c8b..8aa582b 100644
--- a/SGGL/WebAPI/Controllers/HSSE/SafetyResponsibilitiesController.cs
+++ b/SGGL/WebAPI/Controllers/HSSE/SafetyResponsibilitiesController.cs
@@ -40,7 +40,9 @@ namespace WebAPI.Controllers.HSSE
             var responeData = new Model.ResponeData();
             try
             {
-                responeData.data = SafetyResponsibilitiesService.GetSafetyResponsibilitiesListById(SafetyResponsibilitiesId);
+                var data = SafetyResponsibilitiesService.GetSafetyResponsibilitiesListById(SafetyResponsibilitiesId);
+                data.AttachUrl = BLL.AttachFileService.getFileUrl(data.SafetyResponsibilitiesId);
+                responeData.data = data;
             }
             catch (Exception ex)
             {
diff --git a/SGGL/WebAPI/Controllers/MaterialEntranceAndExitController.cs b/SGGL/WebAPI/Controllers/MaterialEntranceAndExitController.cs
new file mode 100644
index 0000000..3253014
--- /dev/null
+++ b/SGGL/WebAPI/Controllers/MaterialEntranceAndExitController.cs
@@ -0,0 +1,1283 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Diagnostics;
+using System.Runtime.Remoting.Messaging;
+using System.Web.Http;
+using WebAPI.Helpers;
+
+namespace WebAPI.Controllers
+{
+    
+    public class MaterialEntranceAndExitController : ApiController
+    {
+        //private string _connectionString = "Server=LAPTOP-J0FS0EFI;Database=pmms03;User Id=sa;Password=123456;";
+        private string _connectionString = "Server=47.104.102.122,14333;Database=pmms03;User Id=sa;Password=p@ssw0rd;";
+
+
+        //扫二维码接口获取材料明细
+        public Model.ResponeData GetMaterialsBySystemCode(string ProjectId,string SystemCode)
+        {
+            var responeData = new Model.ResponeData();
+            // 创建Material对象并赋值
+            Material material = new Material();
+            try
+            {
+                using (var dbHelper = new DatabaseHelper(_connectionString))
+                {
+                    using (SqlConnection sqlConnection = dbHelper.GetConnection())
+                    {
+                        string sql = "SELECT TOP 1 * FROM [dbo].[CL_B_Material] where 1=1";
+                        using (SqlCommand sqlCommand = new SqlCommand(sql, sqlConnection))
+                        {
+
+                            if (!string.IsNullOrEmpty(ProjectId))
+                            {
+                                // 如果ProjectId有值，则添加WHERE子句
+                                sqlCommand.CommandText += " and  ProjectId = @ProjectId";
+                                sqlCommand.Parameters.AddWithValue("@ProjectId", ProjectId);
+                            }
+
+                            if (!string.IsNullOrEmpty(SystemCode))
+                            {
+                                // 如果ProjectId有值，则添加WHERE子句
+                                sqlCommand.CommandText += " and SystemCode = @SystemCode";
+                                sqlCommand.Parameters.AddWithValue("@SystemCode", SystemCode);
+                            }
+
+                            using (SqlDataReader sqlDataReader = sqlCommand.ExecuteReader())
+                            {
+                                while (sqlDataReader.Read())
+                                {
+                                        if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("MaterialID")))
+                                    {
+                                        material.MaterialID = sqlDataReader.GetString(sqlDataReader.GetOrdinal("MaterialID"));
+                                    }
+                                    if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("ProjectId")))
+                                    {
+                                        material.ProjectId = sqlDataReader.GetString(sqlDataReader.GetOrdinal("ProjectId"));
+                                    }
+                                    if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("SystemCode")))
+                                    {
+                                        material.SystemCode = sqlDataReader.GetString(sqlDataReader.GetOrdinal("SystemCode"));
+                                    }
+                                    if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("TechnicalConditions")))
+                                    {
+                                        material.TechnicalConditions = sqlDataReader.GetString(sqlDataReader.GetOrdinal("TechnicalConditions"));
+                                    }
+                                    if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("Unit")))
+                                    {
+                                        material.Unit = sqlDataReader.GetString(sqlDataReader.GetOrdinal("Unit"));
+                                    }
+
+                                    // 检查并获取MaterialName字段的值
+                                    if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("MaterialName")))
+                                    {
+                                        material.MaterialName = sqlDataReader.GetString(sqlDataReader.GetOrdinal("MaterialName"));
+                                    }
+
+                                    // 检查并获取Specificationtype字段的值
+                                    if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("Specificationtype")))
+                                    {
+                                        material.Specificationtype = sqlDataReader.GetString(sqlDataReader.GetOrdinal("Specificationtype"));
+                                    }
+
+                                    // 检查并获取StandardSpecification字段的值
+                                    if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("StandardSpecification")))
+                                    {
+                                        material.StandardSpecification = sqlDataReader.GetString(sqlDataReader.GetOrdinal("StandardSpecification"));
+                                    }
+
+                                    // 检查并获取MaterialQuality字段的值
+                                    if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("MaterialQuality")))
+                                    {
+                                        material.MaterialQuality = sqlDataReader.GetString(sqlDataReader.GetOrdinal("MaterialQuality"));
+                                    }
+
+                                    // 检查并获取SpecialNote字段的值
+                                    if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("SpecialNote")))
+                                    {
+                                        material.SpecialNote = sqlDataReader.GetString(sqlDataReader.GetOrdinal("SpecialNote"));
+                                    }
+
+                                    // 检查并获取FirstpartyCode字段的值
+                                    if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("FirstpartyCode")))
+                                    {
+                                        material.FirstpartyCode = sqlDataReader.GetString(sqlDataReader.GetOrdinal("FirstpartyCode"));
+                                    }
+
+                                    // 检查并获取TheoryWeight字段的值
+                                    if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("TheoryWeight")))
+                                    {
+                                        material.TheoryWeight = sqlDataReader.GetDecimal(sqlDataReader.GetOrdinal("TheoryWeight"));
+                                    }
+
+                                    // 检查并获取SCName字段的值
+                                    if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("SCName")))
+                                    {
+                                        material.SCName = sqlDataReader.GetString(sqlDataReader.GetOrdinal("SCName"));
+                                    }
+
+                                    // 检查并获取IsCheck字段的值
+                                    if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("IsCheck")))
+                                    {
+                                        material.IsCheck = sqlDataReader.GetString(sqlDataReader.GetOrdinal("IsCheck"))[0]; // 假设IsCheck是char(1)类型，取第一个字符
+                                    }
+
+                                    // 检查并获取NDTName字段的值
+                                    if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("NDTName")))
+                                    {
+                                        material.NDTName = sqlDataReader.GetString(sqlDataReader.GetOrdinal("NDTName"));
+                                    }
+
+                                    // 检查并获取NDTRName字段的值
+                                    if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("NDTRName")))
+                                    {
+                                        material.NDTRName = sqlDataReader.GetString(sqlDataReader.GetOrdinal("NDTRName"));
+                                    }
+
+                                    // 检查并获取RecordTableOptions字段的值
+                                    if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("RecordTableOptions")))
+                                    {
+                                        material.RecordTableOptions = sqlDataReader.GetString(sqlDataReader.GetOrdinal("RecordTableOptions"));
+                                    }
+
+                                    // 检查并获取ListType字段的值
+                                    if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("ListType")))
+                                    {
+                                        material.ListType = sqlDataReader.GetString(sqlDataReader.GetOrdinal("ListType"));
+                                    }
+
+                                    // 检查并获取TypeName字段的值
+                                    if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("TypeName")))
+                                    {
+                                        material.TypeName = sqlDataReader.GetString(sqlDataReader.GetOrdinal("TypeName"));
+                                    }
+
+                                    // 检查并获取SumTypeName字段的值
+                                    if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("SumTypeName")))
+                                    {
+                                        material.SumTypeName = sqlDataReader.GetString(sqlDataReader.GetOrdinal("SumTypeName"));
+                                    }
+
+                                    // 检查并获取Spec字段的值
+                                    if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("Spec")))
+                                    {
+                                        material.Spec = sqlDataReader.GetString(sqlDataReader.GetOrdinal("Spec"));
+                                    }
+
+                                    // 检查并获取ISupload字段的值
+                                    if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("ISupload")))
+                                    {
+                                        material.ISupload = sqlDataReader.GetString(sqlDataReader.GetOrdinal("ISupload"))[0]; // 假设ISupload是char(1)类型，取第一个字符
+                                    }
+
+                                }
+                            }
+                        }
+                    }
+                }
+                responeData.data = material;
+            }
+            catch (Exception ex) {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        //新增入库主表
+        [HttpPost]
+        public Model.ResponeData AddMaterialStorageM([FromBody] MaterialStorageM materialStorage) {
+            var responeData = new Model.ResponeData();
+            try {
+                using (var dbHelper = new DatabaseHelper(_connectionString))
+                {
+                    using (SqlConnection sqlConnection = dbHelper.GetConnection())
+                    {
+                        string sql = @"
+                    INSERT INTO [dbo].[Cl_W_MaterialStorageM] (
+                        [ProjectId],
+                        [StorageSheetMID],
+                        [StorageSheetCode],
+                        [UserId],
+                        [UserTime],
+                        [Approval],
+                        [OutInMark],
+                        [IsOk],
+                        [acceptman],
+                        [accepttime],
+                        [APid],
+                        [UPid],
+                        [bj_weight],
+                        [bj_sp],
+                        [bj_pm],
+                        [bj_im],
+                        [bj_wt],
+                        [bj_ys],
+                        [bj_sb],
+                        [bj_cl],
+                        [bj_fy],
+                        [bj_zllr],
+                        [Specialityid],
+                        [InstallationId],
+                        [ISupload],
+                        [bj_uir],
+                        [YYPID]
+                    )
+                    VALUES (
+                        @ProjectId,
+                        @StorageSheetMID,
+                        @StorageSheetCode,
+                        @UserId,
+                        @UserTime,
+                        @Approval,
+                        @OutInMark,
+                        @IsOk,
+                        @acceptman,
+                        @accepttime,
+                        @APid,
+                        @UPid,
+                        @bj_weight,
+                        @bj_sp,
+                        @bj_pm,
+                        @bj_im,
+                        @bj_wt,
+                        @bj_ys,
+                        @bj_sb,
+                        @bj_cl,
+                        @bj_fy,
+                        @bj_zllr,
+                        @Specialityid,
+                        @InstallationId,
+                        @ISupload,
+                        @bj_uir,
+                        @YYPID
+                    )";
+
+                        using (SqlCommand sqlCommand = new SqlCommand(sql, sqlConnection))
+                        {
+                            // 添加参数并赋值
+                            sqlCommand.Parameters.AddWithValue("@ProjectId", materialStorage.ProjectId ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@StorageSheetMID", materialStorage.StorageSheetMID);
+                            sqlCommand.Parameters.AddWithValue("@StorageSheetCode", materialStorage.StorageSheetCode ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@UserId", materialStorage.UserId ?? (object)DBNull.Value);
+
+                            if (materialStorage.UserTime.HasValue)
+                            {
+                                sqlCommand.Parameters.AddWithValue("@UserTime", materialStorage.UserTime.Value);
+                            }
+                            else
+                            {
+                                sqlCommand.Parameters.AddWithValue("@UserTime", DateTime.Now);
+                            }
+
+                            sqlCommand.Parameters.AddWithValue("@Approval", materialStorage.Approval ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@OutInMark", materialStorage.OutInMark ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@IsOk", "1");
+                            sqlCommand.Parameters.AddWithValue("@acceptman", materialStorage.acceptman ?? (object)DBNull.Value);
+
+                            if (materialStorage.accepttime.HasValue)
+                            {
+                                sqlCommand.Parameters.AddWithValue("@accepttime", materialStorage.accepttime.Value);
+                            }
+                            else
+                            {
+                                sqlCommand.Parameters.AddWithValue("@accepttime", DBNull.Value);
+                            }
+
+                            sqlCommand.Parameters.AddWithValue("@APid", materialStorage.APid ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@UPid", materialStorage.UPid ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@bj_weight", materialStorage.bj_weight ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@bj_sp", materialStorage.bj_sp ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@bj_pm", materialStorage.bj_pm ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@bj_im", materialStorage.bj_im ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@bj_wt", materialStorage.bj_wt ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@bj_ys", materialStorage.bj_ys ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@bj_sb", materialStorage.bj_sb ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@bj_cl", materialStorage.bj_cl ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@bj_fy", materialStorage.bj_fy ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@bj_zllr", materialStorage.bj_zllr ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@Specialityid", materialStorage.Specialityid ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@InstallationId", materialStorage.InstallationId ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@ISupload", materialStorage.ISupload ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@bj_uir", materialStorage.bj_uir ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@YYPID", materialStorage.YYPID ?? (object)DBNull.Value);
+
+                            // 执行插入操作
+                            sqlCommand.ExecuteNonQuery();
+                        }
+                        }
+                }
+
+                responeData.code = 1;
+                responeData.message = "MaterialStorageM added successfully.";
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            
+            return responeData;
+        }
+
+        //新增入库明细表
+        [HttpPost]
+        public Model.ResponeData AddMaterialStorageS([FromBody] MaterialStorageS materialStorageS)
+        {
+            var responeData = new Model.ResponeData();
+
+            try
+            {
+                using (var dbHelper = new DatabaseHelper(_connectionString))
+                {
+                    using (SqlConnection sqlConnection = dbHelper.GetConnection())
+                    {
+
+                        string sql = @"
+                    INSERT INTO [dbo].[Cl_W_MaterialStorageS] (
+                        [ProjectId],
+                        [StorageSheetMID],
+                        [StorageSheetSID],
+                        [MaterialID],
+                        [Soft],
+                        [StorehouseName],
+                        [StorageQuantity],
+                        [Manufacturer],
+                        [TheoryWeight],
+                        [ActualWeight],
+                        [OutStockProof],
+                        [OutStockPrice],
+                        [SupplyChannel],
+                        [NeedMeters],
+                        [TheoryWeightT],
+                        [ActualMeters],
+                        [ActualWeight2],
+                        [WDRemarks],
+                        [CertificatesFactoryNo],
+                        [FurnaceBatchNo],
+                        [Warranty],
+                        [RecordTableOptions],
+                        [RecordTableExport],
+                        [ListType],
+                        [IsCheck],
+                        [ExportEntrustmentForm],
+                        [ReexaminationReportNo],
+                        [EmergencyReleaseNo],
+                        [AcceptanceResult],
+                        [CertificateNo],
+                        [TypeName],
+                        [SumTypeName],
+                        [SP_MaterialQualityNO],
+                        [SP_Thickness1],
+                        [SP_Thickness2],
+                        [SP_Thickness3],
+                        [SP_Thickness4],
+                        [SP_PipeDiameterIn],
+                        [SP_PipeDiameterOut],
+                        [SP_Length],
+                        [SP_Remarks],
+                        [PM_ContractNo],
+                        [PM_PipeDiameterOut],
+                        [PM_PipeDiameterIn],
+                        [PM_Thickness],
+                        [PM_Other],
+                        [PM_Appearance],
+                        [IM_SizeDeviation],
+                        [IM_OtherDeviation],
+                        [IM_Appearance],
+                        [IM_OtherCheck],
+                        [CheckMan],
+                        [CheckDate],
+                        [LiableMan],
+                        [Liabledate],
+                        [ME_NDTName],
+                        [ME_NDTStandard],
+                        [ME_NDTRName],
+                        [ME_QualifiedRequirement],
+                        [ME_CheckThingNO],
+                        [ME_HeatStatus],
+                        [ME_EntrustUnit],
+                        [ME_EntrustMan],
+                        [ME_EntrustDate],
+                        [ME_TestingUnit],
+                        [ME_TestingMan],
+                        [ME_TestingDate],
+                        [Isa_Unit],
+                        [Isa_soft],
+                        [Isa_Accept],
+                        [Isa_Mutilation],
+                        [Isa_DeliveryMan],
+                        [Isa_CheckMan],
+                        [Isa_Remarks],
+                        [Isa_RecordMan],
+                        [Isa_RecordDate],
+                        [PStCode],
+                        [SystemCode],
+                        [Wmaterialname],
+                        [Wspecificationtype],
+                        [Wstandardspecification],
+                        [WMaterialQuality],
+                        [Isa_hege],
+                        [W_lydw],
+                        [ISupload],
+                        [uir_tag],
+                        [uir_contractno],
+                        [uir_boxnum],
+                        [uir_boxcode],
+                        [uir_boxsheet],
+                        [shue],
+                        [bhsje]
+                    )
+                    VALUES (
+                        @ProjectId,
+                        @StorageSheetMID,
+                        @StorageSheetSID,
+                        @MaterialID,
+                        @Soft,
+                        @StorehouseName,
+                        @StorageQuantity,
+                        @Manufacturer,
+                        @TheoryWeight,
+                        @ActualWeight,
+                        @OutStockProof,
+                        @OutStockPrice,
+                        @SupplyChannel,
+                        @NeedMeters,
+                        @TheoryWeightT,
+                        @ActualMeters,
+                        @ActualWeight2,
+                        @WDRemarks,
+                        @CertificatesFactoryNo,
+                        @FurnaceBatchNo,
+                        @Warranty,
+                        @RecordTableOptions,
+                        @RecordTableExport,
+                        @ListType,
+                        @IsCheck,
+                        @ExportEntrustmentForm,
+                        @ReexaminationReportNo,
+                        @EmergencyReleaseNo,
+                        @AcceptanceResult,
+                        @CertificateNo,
+                        @TypeName,
+                        @SumTypeName,
+                        @SP_MaterialQualityNO,
+                        @SP_Thickness1,
+                        @SP_Thickness2,
+                        @SP_Thickness3,
+                        @SP_Thickness4,
+                        @SP_PipeDiameterIn,
+                        @SP_PipeDiameterOut,
+                        @SP_Length,
+                        @SP_Remarks,
+                        @PM_ContractNo,
+                        @PM_PipeDiameterOut,
+                        @PM_PipeDiameterIn,
+                        @PM_Thickness,
+                        @PM_Other,
+                        @PM_Appearance,
+                        @IM_SizeDeviation,
+                        @IM_OtherDeviation,
+                        @IM_Appearance,
+                        @IM_OtherCheck,
+                        @CheckMan,
+                        @CheckDate,
+                        @LiableMan,
+                        @Liabledate,
+                        @ME_NDTName,
+                        @ME_NDTStandard,
+                        @ME_NDTRName,
+                        @ME_QualifiedRequirement,
+                        @ME_CheckThingNO,
+                        @ME_HeatStatus,
+                        @ME_EntrustUnit,
+                        @ME_EntrustMan,
+                        @ME_EntrustDate,
+                        @ME_TestingUnit,
+                        @ME_TestingMan,
+                        @ME_TestingDate,
+                        @Isa_Unit,
+                        @Isa_soft,
+                        @Isa_Accept,
+                        @Isa_Mutilation,
+                        @Isa_DeliveryMan,
+                        @Isa_CheckMan,
+                        @Isa_Remarks,
+                        @Isa_RecordMan,
+                        @Isa_RecordDate,
+                        @PStCode,
+                        @SystemCode,
+                        @Wmaterialname,
+                        @Wspecificationtype,
+                        @Wstandardspecification,
+                        @WMaterialQuality,
+                        @Isa_hege,
+                        @W_lydw,
+                        @ISupload,
+                        @uir_tag,
+                        @uir_contractno,
+                        @uir_boxnum,
+                        @uir_boxcode,
+                        @uir_boxsheet,
+                        @shue,
+                        @bhsje
+                    )";
+
+                        using (SqlCommand sqlCommand = new SqlCommand(sql, sqlConnection))
+                        {
+                            // 添加参数并赋值（示例，实际需根据materialStorageS对象属性来赋值）
+                            sqlCommand.Parameters.AddWithValue("@ProjectId", materialStorageS.ProjectId ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@StorageSheetMID", materialStorageS.StorageSheetMID ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@StorageSheetSID", Guid.NewGuid().ToString());
+                            sqlCommand.Parameters.AddWithValue("@MaterialID", materialStorageS.MaterialID ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@Soft", materialStorageS.Soft ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@StorehouseName", materialStorageS.StorehouseName ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@StorageQuantity", materialStorageS.StorageQuantity ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@Manufacturer", materialStorageS.Manufacturer ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@TheoryWeight", materialStorageS.TheoryWeight ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@ActualWeight", materialStorageS.ActualWeight ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@OutStockProof", materialStorageS.OutStockProof ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@OutStockPrice", materialStorageS.OutStockPrice ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@SupplyChannel", materialStorageS.SupplyChannel ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@NeedMeters", materialStorageS.NeedMeters ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@TheoryWeightT", materialStorageS.TheoryWeightT ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@ActualMeters", materialStorageS.ActualMeters ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@ActualWeight2", materialStorageS.ActualWeight2 ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@WDRemarks", materialStorageS.WDRemarks ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@CertificatesFactoryNo", materialStorageS.CertificatesFactoryNo ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@FurnaceBatchNo", materialStorageS.FurnaceBatchNo ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@Warranty", materialStorageS.Warranty ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@RecordTableOptions", materialStorageS.RecordTableOptions ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@RecordTableExport", materialStorageS.RecordTableExport ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@ListType", materialStorageS.ListType ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@IsCheck", materialStorageS.IsCheck ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@ExportEntrustmentForm", materialStorageS.ExportEntrustmentForm ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@ReexaminationReportNo", materialStorageS.ReexaminationReportNo ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@EmergencyReleaseNo", materialStorageS.EmergencyReleaseNo ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@AcceptanceResult", materialStorageS.AcceptanceResult ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@CertificateNo", materialStorageS.CertificateNo ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@TypeName", materialStorageS.TypeName ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@SumTypeName", materialStorageS.SumTypeName ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@SP_MaterialQualityNO", materialStorageS.SP_MaterialQualityNO ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@SP_Thickness1", materialStorageS.SP_Thickness1 ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@SP_Thickness2", materialStorageS.SP_Thickness2 ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@SP_Thickness3", materialStorageS.SP_Thickness3 ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@SP_Thickness4", materialStorageS.SP_Thickness4 ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@SP_PipeDiameterIn", materialStorageS.SP_PipeDiameterIn ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@SP_PipeDiameterOut", materialStorageS.SP_PipeDiameterOut ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@SP_Length", materialStorageS.SP_Length ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@SP_Remarks", materialStorageS.SP_Remarks ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@PM_ContractNo", materialStorageS.PM_ContractNo ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@PM_PipeDiameterOut", materialStorageS.PM_PipeDiameterOut ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@PM_PipeDiameterIn", materialStorageS.PM_PipeDiameterIn ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@PM_Thickness", materialStorageS.PM_Thickness ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@PM_Other", materialStorageS.PM_Other ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@PM_Appearance", materialStorageS.PM_Appearance ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@IM_SizeDeviation", materialStorageS.IM_SizeDeviation ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@IM_OtherDeviation", materialStorageS.IM_OtherDeviation ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@IM_Appearance", materialStorageS.IM_Appearance ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@IM_OtherCheck", materialStorageS.IM_OtherCheck ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@CheckMan", materialStorageS.CheckMan ?? (object)DBNull.Value);
+
+                            // 对于可空日期字段，需要进行空值检查
+                            if (materialStorageS.CheckDate.HasValue)
+                            {
+                                sqlCommand.Parameters.AddWithValue("@CheckDate", materialStorageS.CheckDate.Value);
+                            }
+                            else
+                            {
+                                sqlCommand.Parameters.AddWithValue("@CheckDate", DateTime.Now);
+                            }
+
+                            // 类似地处理其他可空日期字段...
+
+                            sqlCommand.Parameters.AddWithValue("@LiableMan", materialStorageS.LiableMan ?? (object)DBNull.Value);
+
+                            if (materialStorageS.Liabledate.HasValue)
+                            {
+                                sqlCommand.Parameters.AddWithValue("@Liabledate", materialStorageS.Liabledate.Value);
+                            }
+                            else
+                            {
+                                sqlCommand.Parameters.AddWithValue("@Liabledate", DBNull.Value);
+                            }
+
+                            sqlCommand.Parameters.AddWithValue("@ME_NDTName", materialStorageS.ME_NDTName ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@ME_NDTStandard", materialStorageS.ME_NDTStandard ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@ME_NDTRName", materialStorageS.ME_NDTRName ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@ME_QualifiedRequirement", materialStorageS.ME_QualifiedRequirement ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@ME_CheckThingNO", materialStorageS.ME_CheckThingNO ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@ME_HeatStatus", materialStorageS.ME_HeatStatus ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@ME_EntrustUnit", materialStorageS.ME_EntrustUnit ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@ME_EntrustMan", materialStorageS.ME_EntrustMan ?? (object)DBNull.Value);
+
+                            // 对于可空日期字段，需要进行空值检查
+                            if (materialStorageS.ME_EntrustDate.HasValue)
+                            {
+                                sqlCommand.Parameters.AddWithValue("@ME_EntrustDate", materialStorageS.ME_EntrustDate.Value);
+                            }
+                            else
+                            {
+                                sqlCommand.Parameters.AddWithValue("@ME_EntrustDate", DBNull.Value);
+                            }
+
+                            sqlCommand.Parameters.AddWithValue("@ME_TestingUnit", materialStorageS.ME_TestingUnit ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@ME_TestingMan", materialStorageS.ME_TestingMan ?? (object)DBNull.Value);
+
+                            if (materialStorageS.ME_TestingDate.HasValue)
+                            {
+                                sqlCommand.Parameters.AddWithValue("@ME_TestingDate", materialStorageS.ME_TestingDate.Value);
+                            }
+                            else
+                            {
+                                sqlCommand.Parameters.AddWithValue("@ME_TestingDate", DBNull.Value);
+                            }
+
+                            sqlCommand.Parameters.AddWithValue("@Isa_Unit", materialStorageS.Isa_Unit ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@Isa_soft", materialStorageS.Isa_soft ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@Isa_Accept", materialStorageS.Isa_Accept ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@Isa_Mutilation", materialStorageS.Isa_Mutilation ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@Isa_DeliveryMan", materialStorageS.Isa_DeliveryMan ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@Isa_CheckMan", materialStorageS.Isa_CheckMan ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@Isa_Remarks", materialStorageS.Isa_Remarks ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@Isa_RecordMan", materialStorageS.Isa_RecordMan ?? (object)DBNull.Value);
+
+                            if (materialStorageS.Isa_RecordDate.HasValue)
+                            {
+                                sqlCommand.Parameters.AddWithValue("@Isa_RecordDate", materialStorageS.Isa_RecordDate.Value);
+                            }
+                            else
+                            {
+                                sqlCommand.Parameters.AddWithValue("@Isa_RecordDate", DBNull.Value);
+                            }
+
+                            sqlCommand.Parameters.AddWithValue("@PStCode", materialStorageS.PStCode ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@SystemCode", materialStorageS.SystemCode ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@Wmaterialname", materialStorageS.Wmaterialname ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@Wspecificationtype", materialStorageS.Wspecificationtype ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@Wstandardspecification", materialStorageS.Wstandardspecification ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@WMaterialQuality", materialStorageS.WMaterialQuality ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@Isa_hege", materialStorageS.Isa_hege ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@W_lydw", materialStorageS.W_lydw ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@ISupload", materialStorageS.ISupload ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@uir_tag", materialStorageS.uir_tag ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@uir_contractno", materialStorageS.uir_contractno ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@uir_boxnum", materialStorageS.uir_boxnum ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@uir_boxcode", materialStorageS.uir_boxcode ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@uir_boxsheet", materialStorageS.uir_boxsheet ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@shue", materialStorageS.shue ?? (object)DBNull.Value);
+                            sqlCommand.Parameters.AddWithValue("@bhsje", materialStorageS.bhsje ?? (object)DBNull.Value);
+
+                            // last_modified 字段通常是自动生成的，这里赋值为 NULL
+                            //sqlCommand.Parameters.AddWithValue("@last_modified", DBNull.Value);
+
+                            // 执行插入操作
+                            sqlCommand.ExecuteNonQuery();
+                        }
+                        }
+                }
+                responeData.code = 1;
+                responeData.message = "MaterialStorageS added successfully.";
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+
+        }
+
+        //新增出库主表
+        [HttpPost]
+        public Model.ResponeData AddMaterialOutM([FromBody] MaterialOutM materialOutM)
+        {
+            var responeData = new Model.ResponeData();
+
+            try
+            {
+                using (var dbHelper = new DatabaseHelper(_connectionString))
+                {
+                    using (SqlConnection sqlConnection = dbHelper.GetConnection())
+                    {
+                        string sql = @"
+                INSERT INTO [dbo].[Cl_W_MaterialOutM] (
+                    [ProjectId],
+                    [PlanSheetMID],
+                    [UnitId],
+                    [OutSheetMID],
+                    [OutSheetCode],
+                    [RecordMan],
+                    [UserTime],
+                    [ApprovalMan],
+                    [ApprovalTime],
+                    [OkMan],
+                    [OkTime],
+                    [IsOk],
+                    [LC_ApprovalMan],
+                    [LC_OkMan],
+                    [StorageSheetMID],
+                    [ISupload],
+                    [UAid],
+                    [PC_GUID],
+                    [InstallationId],
+                    [Remarks],
+                    [YYPID]
+                )
+                VALUES (
+                    @ProjectId,
+                    @PlanSheetMID,
+                    @UnitId,
+                    @OutSheetMID,
+                    @OutSheetCode,
+                    @RecordMan,
+                    @UserTime,
+                    @ApprovalMan,
+                    @ApprovalTime,
+                    @OkMan,
+                    @OkTime,
+                    @IsOk,
+                    @LC_ApprovalMan,
+                    @LC_OkMan,
+                    @StorageSheetMID,
+                    @ISupload,
+                    @UAid,
+                    @PC_GUID,
+                    @InstallationId,
+                    @Remarks,
+                    @YYPID
+                )";
+                        using (SqlCommand command = new SqlCommand(sql, sqlConnection))
+                        {
+                            // 添加参数并赋值
+                            command.Parameters.AddWithValue("@ProjectId", materialOutM.ProjectId ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@PlanSheetMID", materialOutM.PlanSheetMID ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@UnitId", materialOutM.UnitId ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@OutSheetMID", materialOutM.OutSheetMID);
+                            command.Parameters.AddWithValue("@OutSheetCode", materialOutM.OutSheetCode ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@RecordMan", materialOutM.RecordMan ?? (object)DBNull.Value);
+
+                            if (materialOutM.UserTime.HasValue)
+                            {
+                                command.Parameters.AddWithValue("@UserTime", materialOutM.UserTime.Value);
+                            }
+                            else
+                            {
+                                command.Parameters.AddWithValue("@UserTime", DateTime.Now);
+                            }
+
+                            command.Parameters.AddWithValue("@ApprovalMan", materialOutM.ApprovalMan ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@ApprovalTime", materialOutM.ApprovalTime ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@OkMan", materialOutM.OkMan ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@OkTime", materialOutM.OkTime ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@IsOk", "1");
+                            command.Parameters.AddWithValue("@LC_ApprovalMan", materialOutM.LC_ApprovalMan ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@LC_OkMan", materialOutM.LC_OkMan ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@StorageSheetMID", materialOutM.StorageSheetMID ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@ISupload", materialOutM.ISupload ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@UAid", materialOutM.UAid ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@PC_GUID", materialOutM.PC_GUID ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@InstallationId", materialOutM.InstallationId ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@Remarks", materialOutM.Remarks ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@YYPID", materialOutM.YYPID ?? (object)DBNull.Value);
+
+                            // 执行插入操作
+                            command.ExecuteNonQuery();
+                        }
+
+                    }
+                }
+                responeData.code = 1;
+                responeData.message = "MaterialOutM added successfully.";
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            
+            return responeData;
+        }
+
+
+        //新增出库明细表
+        [HttpPost]
+        public Model.ResponeData AddMaterialOutS([FromBody] MaterialOutS materialOutS)
+        {
+            var responeData = new Model.ResponeData();
+
+            try
+            {
+                using (var dbHelper = new DatabaseHelper(_connectionString))
+                {
+                    using (SqlConnection sqlConnection = dbHelper.GetConnection())
+                    {
+                        string sql = @"
+                INSERT INTO [dbo].[Cl_W_MaterialOutS] (
+                    [ProjectId],
+                    [OutSheetMID],
+                    [OutSheetSID],
+                    [MaterialID],
+                    [Soft],
+                    [PlannedQuantity],
+                    [StoreQuantity],
+                    [OutQuantity],
+                    [OutQuantityY],
+                    [StorePQuantity],
+                    [CertificatesFactoryNo],
+                    [FurnaceBatchNo],
+                    [CertificateSelfNo],
+                    [Weight],
+                    [Price],
+                    [OutQuantityP],
+                    [OutQuantityO],
+                    [StorehouseName],
+                    [StorageSheetSID],
+                    [FirstpartyCode],
+                    [ISupload],
+                    [InstallationId],
+                    [shue],
+                    [bhsje]
+                )
+                VALUES (
+                    @ProjectId,
+                    @OutSheetMID,
+                    @OutSheetSID,
+                    @MaterialID,
+                    @Soft,
+                    @PlannedQuantity,
+                    @StoreQuantity,
+                    @OutQuantity,
+                    @OutQuantityY,
+                    @StorePQuantity,
+                    @CertificatesFactoryNo,
+                    @FurnaceBatchNo,
+                    @CertificateSelfNo,
+                    @Weight,
+                    @Price,
+                    @OutQuantityP,
+                    @OutQuantityO,
+                    @StorehouseName,
+                    @StorageSheetSID,
+                    @FirstpartyCode,
+                    @ISupload,
+                    @InstallationId,
+                    @shue,
+                    @bhsje
+                )";
+                        using (SqlCommand command = new SqlCommand(sql, sqlConnection))
+                        {
+                            // 添加参数并赋值
+                            command.Parameters.AddWithValue("@ProjectId", materialOutS.ProjectId ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@OutSheetMID", materialOutS.OutSheetMID ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@OutSheetSID", Guid.NewGuid().ToString());
+                            command.Parameters.AddWithValue("@MaterialID", materialOutS.MaterialID ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@Soft", materialOutS.Soft ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@PlannedQuantity", materialOutS.PlannedQuantity ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@StoreQuantity", materialOutS.StoreQuantity ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@OutQuantity", materialOutS.OutQuantity ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@OutQuantityY", materialOutS.OutQuantityY ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@StorePQuantity", materialOutS.StorePQuantity ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@CertificatesFactoryNo", materialOutS.CertificatesFactoryNo ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@FurnaceBatchNo", materialOutS.FurnaceBatchNo ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@CertificateSelfNo", materialOutS.CertificateSelfNo ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@Weight", materialOutS.Weight ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@Price", materialOutS.Price ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@OutQuantityP", materialOutS.OutQuantityP ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@OutQuantityO", materialOutS.OutQuantityO ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@StorehouseName", materialOutS.StorehouseName ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@StorageSheetSID", materialOutS.StorageSheetSID ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@FirstpartyCode", materialOutS.FirstpartyCode ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@ISupload", materialOutS.ISupload ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@InstallationId", materialOutS.InstallationId ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@shue", materialOutS.shue ?? (object)DBNull.Value);
+                            command.Parameters.AddWithValue("@bhsje", materialOutS.bhsje ?? (object)DBNull.Value);
+
+
+                            // 执行插入操作
+                            command.ExecuteNonQuery();
+                        }
+
+                    }
+                }
+                responeData.code = 1;
+                responeData.message = "MaterialOutS added successfully.";
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            
+            return responeData;
+        }
+
+        //获取单位unit列表
+        public Model.ResponeData GetUnitList() {
+            var responeData = new Model.ResponeData();
+            List<Unit> units = new List<Unit>();
+            try
+            {
+                using (var dbHelper = new DatabaseHelper(_connectionString))
+                {
+                    using (SqlConnection sqlConnection = dbHelper.GetConnection())
+                    {
+                        string sql = "SELECT  UnitId,UnitCode,UnitName,ShortUnitName FROM [dbo].[Base_Unit]";
+                        using (SqlCommand sqlCommand = new SqlCommand(sql, sqlConnection))
+                        {
+                            using (SqlDataReader sqlDataReader = sqlCommand.ExecuteReader())
+                            {
+                                while (sqlDataReader.Read())
+                                {
+                                    Unit unit = new Unit();
+
+                                    if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("UnitId")))
+                                    {
+                                        unit.UnitId = sqlDataReader.GetString(sqlDataReader.GetOrdinal("UnitId"));
+                                    }
+                                    if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("UnitCode")))
+                                    {
+                                        unit.UnitCode = sqlDataReader.GetString(sqlDataReader.GetOrdinal("UnitCode"));
+                                    }
+                                    if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("UnitName")))
+                                    {
+                                        unit.UnitName = sqlDataReader.GetString(sqlDataReader.GetOrdinal("UnitName"));
+                                    }
+                                    if (!sqlDataReader.IsDBNull(sqlDataReader.GetOrdinal("ShortUnitName")))
+                                    {
+                                        unit.ShortUnitName = sqlDataReader.GetString(sqlDataReader.GetOrdinal("ShortUnitName"));
+                                    }
+                                    units.Add(unit);
+                                }
+                            }
+                        }
+                    }
+                }
+                responeData.data = units;
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+
+        }
+
+
+    }
+
+    // 定义一个材料类来表示查询结果
+    public class Material
+    {
+            // MaterialID为char(36)类型，且不可为空
+            public string MaterialID { get; set; }
+
+            // ProjectId为nvarchar(50)类型，可为空
+            public string ProjectId { get; set; }
+
+            // SystemCode为nvarchar(50)类型，可为空
+            public string SystemCode { get; set; }
+
+            // TechnicalConditions为nvarchar(1000)类型，可为空
+            public string TechnicalConditions { get; set; }
+
+            // Unit为nvarchar(50)类型，可为空
+            public string Unit { get; set; }
+
+            // MaterialName为nvarchar(500)类型，可为空
+            public string MaterialName { get; set; }
+
+            // Specificationtype为nvarchar(500)类型，可为空
+            public string Specificationtype { get; set; }
+
+            // StandardSpecification为nvarchar(500)类型，可为空
+            public string StandardSpecification { get; set; }
+
+            // MaterialQuality为nvarchar(500)类型，可为空
+            public string MaterialQuality { get; set; }
+
+            // SpecialNote为nvarchar(50)类型，可为空
+            public string SpecialNote { get; set; }
+
+            // FirstpartyCode为nvarchar(20)类型，可为空
+            public string FirstpartyCode { get; set; }
+
+            // TheoryWeight为decimal(10,4)类型，可为空
+            public decimal? TheoryWeight { get; set; }
+
+            // SCName为nvarchar(20)类型，可为空
+            public string SCName { get; set; }
+
+            // IsCheck为char(1)类型，可为空。考虑到可能存储的是'Y'/'N'或'1'/'0'等，建议使用字符类型。
+            public char? IsCheck { get; set; }
+
+            // NDTName为nvarchar(20)类型，可为空
+            public string NDTName { get; set; }
+
+            // NDTRName为nvarchar(20)类型，可为空
+            public string NDTRName { get; set; }
+
+            // RecordTableOptions为nvarchar(100)类型，可为空
+            public string RecordTableOptions { get; set; }
+
+            // ListType为nvarchar(20)类型，可为空
+            public string ListType { get; set; }
+
+            // TypeName为nvarchar(20)类型，可为空
+            public string TypeName { get; set; }
+
+            // SumTypeName为nvarchar(20)类型，可为空
+            public string SumTypeName { get; set; }
+
+            // Spec为nvarchar(50)类型，可为空
+            public string Spec { get; set; }
+
+        // last_modified为timestamp类型，通常不需要在C#对象中显式表示
+         //public byte[] last_modified { get; set; } // 如需处理并发，请考虑其他方式，如ETag等
+
+        // ISupload为char(1)类型，可为空。字段名中的"IS"应改为小写的"is"以符合C#命名规范，但为保持一致性，这里保留原样。
+        public char? ISupload { get; set; }
+    }
+
+    //入库主表
+    public class MaterialStorageM
+    {
+        public string ProjectId { get; set; }
+        public string StorageSheetMID { get; set; }
+        public string StorageSheetCode { get; set; }
+        public string UserId { get; set; }
+        public DateTime? UserTime { get; set; }
+        public char? Approval { get; set; }
+        public char? OutInMark { get; set; }
+        public char? IsOk { get; set; }
+        public string acceptman { get; set; }
+        public DateTime? accepttime { get; set; }
+        public string APid { get; set; }
+        public string UPid { get; set; }
+        public char? bj_weight { get; set; }
+        public char? bj_sp { get; set; }
+        public char? bj_pm { get; set; }
+        public char? bj_im { get; set; }
+        public char? bj_wt { get; set; }
+        public char? bj_ys { get; set; }
+        public char? bj_sb { get; set; }
+        public char? bj_cl { get; set; }
+        public char? bj_fy { get; set; }
+        public char? bj_zllr { get; set; }
+        public string Specialityid { get; set; }
+        public string InstallationId { get; set; }
+        public byte[] last_modified { get; set; } // timestamp类型通常对应byte[]
+        public char? ISupload { get; set; }
+        public char? bj_uir { get; set; }
+        public string YYPID { get; set; }
+    }
+
+    //入库明细表
+    public class MaterialStorageS
+    {
+        // 基本信息字段
+        public string ProjectId { get; set; }
+        public string StorageSheetMID { get; set; }
+        public string StorageSheetSID { get; set; }
+        public string MaterialID { get; set; }
+        public int? Soft { get; set; }
+        public string StorehouseName { get; set; }
+        public decimal? StorageQuantity { get; set; }
+        public string Manufacturer { get; set; }
+
+        // 重量与尺寸相关字段
+        public decimal? TheoryWeight { get; set; }
+        public decimal? ActualWeight { get; set; }
+        public decimal? TheoryWeightT { get; set; }
+        public decimal? ActualWeight2 { get; set; }
+        public decimal? NeedMeters { get; set; }
+        public decimal? ActualMeters { get; set; }
+
+        // 出库与价格相关字段
+        public string OutStockProof { get; set; }
+        public decimal? OutStockPrice { get; set; }
+        public string SupplyChannel { get; set; }
+
+        // 质量与检测相关字段
+        public string CertificatesFactoryNo { get; set; }
+        public string FurnaceBatchNo { get; set; }
+        public decimal? Warranty { get; set; }
+        public string RecordTableOptions { get; set; }
+        public string RecordTableExport { get; set; }
+        public string ListType { get; set; }
+        public char? IsCheck { get; set; }
+        public string ExportEntrustmentForm { get; set; }
+        public string ReexaminationReportNo { get; set; }
+        public string EmergencyReleaseNo { get; set; }
+        public string AcceptanceResult { get; set; }
+        public string CertificateNo { get; set; }
+
+        // 管道与材料特性字段
+        public string TypeName { get; set; }
+        public string SumTypeName { get; set; }
+        public string SP_MaterialQualityNO { get; set; }
+        public string SP_Thickness1 { get; set; }
+        public string SP_Thickness2 { get; set; }
+        public string SP_Thickness3 { get; set; }
+        public string SP_Thickness4 { get; set; }
+        public string SP_PipeDiameterIn { get; set; }
+        public string SP_PipeDiameterOut { get; set; }
+        public string SP_Length { get; set; }
+
+        // 其他特性与备注字段
+        public string WDRemarks { get; set; }
+        public string SP_Remarks { get; set; }
+
+        // 采购与合同相关字段
+        public string PM_ContractNo { get; set; }
+        public string PM_PipeDiameterOut { get; set; }
+        public string PM_PipeDiameterIn { get; set; }
+        public string PM_Thickness { get; set; }
+        public string PM_Other { get; set; }
+        public string PM_Appearance { get; set; }
+
+        // 检测与测量字段
+        public string IM_SizeDeviation { get; set; }
+        public string IM_OtherDeviation { get; set; }
+        public string IM_Appearance { get; set; }
+        public string IM_OtherCheck { get; set; }
+
+        // 人员与日期字段
+        public string CheckMan { get; set; }
+        public DateTime? CheckDate { get; set; }
+        public string LiableMan { get; set; }
+        public DateTime? Liabledate { get; set; }
+
+        // 无损检测相关字段
+        public string ME_NDTName { get; set; }
+        public string ME_NDTStandard { get; set; }
+        public string ME_NDTRName { get; set; }
+        public string ME_QualifiedRequirement { get; set; }
+        public string ME_CheckThingNO { get; set; }
+        public string ME_HeatStatus { get; set; }
+        public string ME_EntrustUnit { get; set; }
+        public string ME_EntrustMan { get; set; }
+        public DateTime? ME_EntrustDate { get; set; }
+        public string ME_TestingUnit { get; set; }
+        public string ME_TestingMan { get; set; }
+        public DateTime? ME_TestingDate { get; set; }
+
+        // 其他杂项字段
+        public string Isa_Unit { get; set; }
+        public string Isa_soft { get; set; }
+        public string Isa_Accept { get; set; }
+        public string Isa_Mutilation { get; set; }
+        public string Isa_DeliveryMan { get; set; }
+        public string Isa_CheckMan { get; set; }
+        public string Isa_Remarks { get; set; }
+        public string Isa_RecordMan { get; set; }
+        public DateTime? Isa_RecordDate { get; set; }
+        public string Isa_hege { get; set; }
+
+        // 系统与编码字段
+        public string PStCode { get; set; }
+        public string SystemCode { get; set; }
+        public string Wmaterialname { get; set; }
+        public string Wspecificationtype { get; set; }
+        public string Wstandardspecification { get; set; }
+        public string WMaterialQuality { get; set; }
+
+        // 供应商与单位字段
+        public string W_lydw { get; set; }
+
+        // 上传与标识字段
+        public char? ISupload { get; set; }
+        public string uir_tag { get; set; }
+        public string uir_contractno { get; set; }
+        public string uir_boxnum { get; set; }
+        public string uir_boxcode { get; set; }
+        public string uir_boxsheet { get; set; }
+
+        // 数量与金额字段
+        public decimal? shue { get; set; }
+        public decimal? bhsje { get; set; }
+
+        // 时间戳字段（通常不需要在实体类中显式包含）
+        // public byte[] last_modified { get; set; }
+    }
+
+    //出库主表
+    public class MaterialOutM
+    {
+        public string ProjectId { get; set; }
+        public string PlanSheetMID { get; set; }
+        public string UnitId { get; set; }
+        public string OutSheetMID { get; set; }
+        public string OutSheetCode { get; set; }
+        public string RecordMan { get; set; }
+        public DateTime? UserTime { get; set; }
+        public string ApprovalMan { get; set; }
+        public DateTime? ApprovalTime { get; set; }
+        public string OkMan { get; set; }
+        public DateTime? OkTime { get; set; }
+        public char? IsOk { get; set; }
+        public string LC_ApprovalMan { get; set; }
+        public string LC_OkMan { get; set; }
+        public string StorageSheetMID { get; set; }
+        public byte[] last_modified { get; set; } // timestamp 类型通常对应 byte[]
+        public char? ISupload { get; set; }
+        public string UAid { get; set; }
+        public string PC_GUID { get; set; }
+        public string InstallationId { get; set; }
+        public string Remarks { get; set; }
+        public string YYPID { get; set; }
+
+        // 导航属性（如果有外键关联的话，这里可以添加对应的导航属性）
+        // public BaseProject Project { get; set; }
+        // public BaseUnit Unit { get; set; }
+    }
+
+
+    //出库明细表
+    public class MaterialOutS
+    {
+        public string ProjectId { get; set; }
+        public string OutSheetMID { get; set; }
+        public string OutSheetSID { get; set; }
+        public string MaterialID { get; set; }
+        public int? Soft { get; set; }
+        public decimal? PlannedQuantity { get; set; }
+        public decimal? StoreQuantity { get; set; }
+        public decimal? OutQuantity { get; set; }
+        public decimal? OutQuantityY { get; set; }
+        public decimal? StorePQuantity { get; set; }
+        public string CertificatesFactoryNo { get; set; }
+        public string FurnaceBatchNo { get; set; }
+        public string CertificateSelfNo { get; set; }
+        public decimal? Weight { get; set; }
+        public decimal? Price { get; set; }
+        public decimal? OutQuantityP { get; set; }
+        public decimal? OutQuantityO { get; set; }
+        public string StorehouseName { get; set; }
+        public string StorageSheetSID { get; set; }
+        public string FirstpartyCode { get; set; }
+        public byte[] last_modified { get; set; } // timestamp 类型通常对应 byte[]
+        public char? ISupload { get; set; }
+        public string InstallationId { get; set; }
+        public decimal? shue { get; set; }
+        public decimal? bhsje { get; set; }
+
+        // 导航属性（如果有外键关联的话，这里可以添加对应的导航属性）
+        // public CL_B_Material Material { get; set; }
+        // public Cl_W_MaterialOutM MaterialOutM { get; set; }
+    }
+
+    //单位表
+    public class Unit {
+        public string UnitId { get; set; }
+        public string UnitCode { get; set; }
+        public string UnitName { get; set; }
+        public string ShortUnitName { get; set; }
+    }
+
+}
\ No newline at end of file
diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj
index 5095af3..0479a3d 100644
--- a/SGGL/WebAPI/WebAPI.csproj
+++ b/SGGL/WebAPI/WebAPI.csproj
@@ -154,6 +154,7 @@
     <Compile Include="Controllers\CQMS\InspectionManagementController.cs" />
     <Compile Include="Controllers\CQMS\WBSController.cs" />
     <Compile Include="Controllers\CQMS\QuantityManagementController.cs" />
+    <Compile Include="Controllers\DatabaseHelper.cs" />
     <Compile Include="Controllers\DataSync\CNCECServerController.cs" />
     <Compile Include="Controllers\DataSync\EnvironmentalController.cs" />
     <Compile Include="Controllers\DoorProject\DoorServiceController.cs" />
@@ -171,8 +172,10 @@
     <Compile Include="Controllers\HSSE\MaterialController.cs" />
     <Compile Include="Controllers\HSSE\ProtectionStandardsController.cs" />
     <Compile Include="Controllers\HSSE\RectifyController.cs" />
+    <Compile Include="Controllers\HSSE\SafetyInspectionController.cs" />
     <Compile Include="Controllers\HSSE\SafetyResponsibilitiesController.cs" />
     <Compile Include="Controllers\HSSE\TrainTestRecordController.cs" />
+    <Compile Include="Controllers\MaterialEntranceAndExitController.cs" />
     <Compile Include="Controllers\Person\PersonCheckController.cs" />
     <Compile Include="Controllers\CQMS\CheckEquipmentController.cs" />
     <Compile Include="Controllers\CQMS\CheckListController.cs" />