diff --git a/CreateModel2017local.bat b/CreateModel2017local.bat
index 730ed1b..075fd70 100644
--- a/CreateModel2017local.bat
+++ b/CreateModel2017local.bat
@@ -25,9 +25,9 @@ REM --------------
 
 @echo 设置.net控制台环境
 @echo.
-@call "%VS150%"
+@call "%VS2022%"
 
-SqlMetal /views  /server:.  /user:sa /password:1111 /database:SGGLDB_TCC /code:%Model_ROOT%\Model.cs /namespace:Model
+SqlMetal /views  /server:DESKTOP-B3C9LJ1  /user:sa /password:303303 /database:SGGLDB_HBAZ /code:%Model_ROOT%\Model.cs /namespace:Model
 
 @ECHO 完成
 pause
diff --git a/SGGL/BLL/API/HSSE/APIHazardRegisterService.cs b/SGGL/BLL/API/HSSE/APIHazardRegisterService.cs
index 64a621e..c0e9536 100644
--- a/SGGL/BLL/API/HSSE/APIHazardRegisterService.cs
+++ b/SGGL/BLL/API/HSSE/APIHazardRegisterService.cs
@@ -159,7 +159,7 @@ namespace BLL
                 var hazardRegisters = (from x in db.HSSE_Hazard_HazardRegister
                                        where x.CheckTime.Value.Year == mdate.Year
                                        && x.CheckTime.Value.Month == mdate.Month
-                                       && x.CheckTime.Value.Day == mdate.Day
+                                       && x.CheckTime.Value.Day == mdate.Day 
                                        select new Model.HazardRegisterItem
                                        {
                                            HazardRegisterId = x.HazardRegisterId,
diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.designer.cs b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.designer.cs
index b9a3789..05c5f9b 100644
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.designer.cs
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.designer.cs
@@ -13,13 +13,13 @@ namespace Resources {
     
     
     /// <summary>
-    ///   寮虹被鍨嬭祫婧愮被锛岀敤浜庢煡鎵炬湰鍦板寲瀛楃涓茬瓑銆�
+    ///   涓�涓己绫诲瀷鐨勮祫婧愮被锛岀敤浜庢煡鎵炬湰鍦板寲鐨勫瓧绗︿覆绛夈��
     /// </summary>
     // 姝ょ被鏄敱 StronglyTypedResourceBuilder
     // 绫婚�氳繃绫讳技浜� ResGen 鎴� Visual Studio 鐨勫伐鍏疯嚜鍔ㄧ敓鎴愮殑銆�
-    // 鑻ヨ娣诲姞鎴栧垹闄ゆ垚鍛橈紝璇风紪杈� .ResX 鏂囦欢锛岀劧鍚庨噸鏂拌繍琛� ResGen
+    // 鑻ヨ娣诲姞鎴栫Щ闄ゆ垚鍛橈紝璇风紪杈� .ResX 鏂囦欢锛岀劧鍚庨噸鏂拌繍琛� ResGen
     // (浠� /str 浣滀负鍛戒护閫夐」)锛屾垨閲嶆柊鐢熸垚 Visual Studio 椤圭洰銆�
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Web.Application.StronglyTypedResourceProxyBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Web.Application.StronglyTypedResourceProxyBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Lan {
@@ -33,7 +33,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   杩斿洖姝ょ被浣跨敤鐨勭紦瀛� ResourceManager 瀹炰緥銆�
+        ///   杩斿洖姝ょ被浣跨敤鐨勭紦瀛樼殑 ResourceManager 瀹炰緥銆�
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Resources.ResourceManager ResourceManager {
@@ -47,8 +47,8 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   瑕嗙洊褰撳墠绾跨▼鐨� CurrentUICulture 灞炴��
-        ///   浣跨敤姝ゅ己绫诲瀷鐨勮祫婧愮被鐨勮祫婧愭煡鎵俱��
+        ///   閲嶅啓褰撳墠绾跨▼鐨� CurrentUICulture 灞炴�э紝瀵�
+        ///   浣跨敤姝ゅ己绫诲瀷璧勬簮绫荤殑鎵�鏈夎祫婧愭煡鎵炬墽琛岄噸鍐欍��
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Globalization.CultureInfo Culture {
@@ -61,7 +61,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 澶ф暟鎹腑蹇� 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 澶ф暟鎹腑蹇� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string BigDataCenter {
             get {
@@ -70,7 +70,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 璇佷功棰勮 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 璇佷功棰勮 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string CertificateWarning {
             get {
@@ -79,7 +79,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 涓浗 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 涓浗 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string China {
             get {
@@ -88,7 +88,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 涓枃 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 涓枃 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string Chinese {
             get {
@@ -97,7 +97,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鍦熷缓鍩虹浜ゅ畨 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鍦熷缓鍩虹浜ゅ畨 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string CivilInfrastructure {
             get {
@@ -106,7 +106,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 宸插畬鎴� 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 宸插畬鎴� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string completed {
             get {
@@ -115,7 +115,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鍙傚缓浜烘暟 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鍙傚缓浜烘暟 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string ConPersonCount {
             get {
@@ -124,7 +124,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鏂藉伐鍗曚綅 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鏂藉伐鍗曚綅 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string ConstructionUnit {
             get {
@@ -133,7 +133,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鍚堝悓鍒版湡鏃堕棿 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鍚堝悓鍒版湡鏃堕棿 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string ContractExpirationTime {
             get {
@@ -142,7 +142,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 褰撳墠鐜板満浜烘暟 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 褰撳墠鐜板満浜烘暟 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string CurrentPersonnel {
             get {
@@ -151,7 +151,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 闅愭偅鎬绘暟 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 闅愭偅鎬绘暟 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string DangersCount {
             get {
@@ -160,7 +160,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鍛樺伐绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鍛樺伐绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string EmployeeManage {
             get {
@@ -169,7 +169,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鑻辨枃 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鑻辨枃 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string English {
             get {
@@ -178,7 +178,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鐜板満鍔ㄦ�� 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鐜板満鍔ㄦ�� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string FieldDynamics {
             get {
@@ -187,7 +187,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 棣栧彴璁惧鍒拌揣 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 棣栧彴璁惧鍒拌揣 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string FirstEquipmentArrived {
             get {
@@ -196,7 +196,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鐒婃帴涓�娆″悎鏍肩巼 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鐒婃帴涓�娆″悎鏍肩巼 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string FistPassRateWelding {
             get {
@@ -205,7 +205,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鍏ㄥ睆 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鍏ㄥ睆 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string FullScreen {
             get {
@@ -214,7 +214,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鎬绘壙鍖呭晢鏂藉伐璁″垝 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鎬绘壙鍖呭晢鏂藉伐璁″垝 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string GeneralConPlan {
             get {
@@ -223,7 +223,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 涓�鑸闄� 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 涓�鑸闄� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string GeneralRisk {
             get {
@@ -232,7 +232,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 杈冨ぇ椋庨櫓 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 杈冨ぇ椋庨櫓 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string GreaterRisk {
             get {
@@ -241,7 +241,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鎬婚儴妫�鏌� 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鎬婚儴妫�鏌� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string HeadquartersInspection {
             get {
@@ -250,7 +250,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 棣栭〉 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 棣栭〉 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string HomePage {
             get {
@@ -259,7 +259,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 瀹夊叏绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 瀹夊叏绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string HSEManage {
             get {
@@ -268,7 +268,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 婀垮害 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 婀垮害 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string humidness {
             get {
@@ -277,7 +277,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 缁煎悎绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 缁煎悎绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string IntegratedManage {
             get {
@@ -286,7 +286,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鍦ㄦ柦鍗卞ぇ宸ョ▼鏁� 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鍦ㄦ柦鍗卞ぇ宸ョ▼鏁� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string LargeRisk {
             get {
@@ -295,7 +295,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 绾� 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 绾� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string Level {
             get {
@@ -304,7 +304,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鐜板満瑙嗛 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鐜板満瑙嗛 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string LiveVideo {
             get {
@@ -313,7 +313,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鐜板満鐩稿唽 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鐜板満鐩稿唽 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string Live_photo_album {
             get {
@@ -322,7 +322,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 浣庨闄� 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 浣庨闄� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string LowRisk {
             get {
@@ -331,7 +331,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 閲嶅ぇ椋庨櫓 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 閲嶅ぇ椋庨櫓 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string MajorRisk {
             get {
@@ -340,7 +340,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 绠＄悊浜哄憳鎬绘暟 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 绠＄悊浜哄憳鎬绘暟 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string managersCount {
             get {
@@ -349,7 +349,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鏈�澶у寲 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鏈�澶у寲 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string maximize {
             get {
@@ -358,7 +358,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鏈烘绔ｅ伐 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鏈烘绔ｅ伐 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string MechanicalCompletion {
             get {
@@ -367,7 +367,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鏈烘棰勮 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鏈烘棰勮 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string MechanicalWarning {
             get {
@@ -376,7 +376,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 娑堟伅 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 娑堟伅 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string message {
             get {
@@ -385,7 +385,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鏇村 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鏇村 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string more {
             get {
@@ -394,7 +394,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鎮ㄦ病鏈夋妯″潡鎿嶄綔鏉冮檺锛岃鑱旂郴绠＄悊鍛樻巿鏉冿紒 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鎮ㄦ病鏈夋妯″潡鎿嶄綔鏉冮檺锛岃鑱旂郴绠＄悊鍛樻巿鏉冿紒 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string NoAuthorize {
             get {
@@ -403,7 +403,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鍣煶 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鍣煶 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string noise {
             get {
@@ -412,7 +412,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鎮ㄦ病鏈夋潈闄愯繘鍏ラ」鐩鐞嗘ā鍧楋紒 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鎮ㄦ病鏈夋潈闄愯繘鍏ラ」鐩鐞嗘ā鍧楋紒 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string NoPermission {
             get {
@@ -421,7 +421,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 閫氱煡绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 閫氱煡绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string NoticeManage {
             get {
@@ -430,7 +430,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鐜板満鑰冨嫟 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鐜板満鑰冨嫟 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string OnSiteAttendance {
             get {
@@ -439,7 +439,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鍦ㄦ柊鏍囩椤典腑鎵撳紑 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鍦ㄦ柊鏍囩椤典腑鎵撳紑 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string OpensNewTab {
             get {
@@ -448,7 +448,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鍚堟牸鐜� 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鍚堟牸鐜� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string PassRate {
             get {
@@ -457,7 +457,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 妗╁熀鏂藉伐 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 妗╁熀鏂藉伐 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string Pilefoundationconstruction {
             get {
@@ -466,7 +466,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 绠￠亾瀹夎寮�濮� 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 绠￠亾瀹夎寮�濮� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string PipeInstallationStarts {
             get {
@@ -475,7 +475,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鍙樼數鎵�鍙楃數 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鍙樼數鎵�鍙楃數 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string PowerReceived {
             get {
@@ -484,7 +484,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 闂鎬绘暟 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 闂鎬绘暟 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string ProblemTotal {
             get {
@@ -493,7 +493,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 椤圭洰鍦板潃 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 椤圭洰鍦板潃 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string ProjectAddress {
             get {
@@ -502,7 +502,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 椤圭洰娓呭崟 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 椤圭洰娓呭崟 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string ProjectList {
             get {
@@ -511,7 +511,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 椤圭洰鍚嶇О 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 椤圭洰鍚嶇О 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string ProjectName {
             get {
@@ -520,7 +520,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 椤圭洰杩涘害璁″垝 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 椤圭洰杩涘害璁″垝 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string ProjectSchedule {
             get {
@@ -529,7 +529,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 椤圭洰缁熻 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 椤圭洰缁熻 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string ProjectStatistics {
             get {
@@ -538,7 +538,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鍦ㄥ缓椤圭洰 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鍦ㄥ缓椤圭洰 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string ProjectUnderConstruction {
             get {
@@ -547,7 +547,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 璐ㄩ噺绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 璐ㄩ噺绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string QualityManage {
             get {
@@ -556,7 +556,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 璐ㄩ噺缁熻 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 璐ㄩ噺缁熻 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string QualityStatistics {
             get {
@@ -565,7 +565,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 璐ㄩ噺棰勮 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 璐ㄩ噺棰勮 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string QualityWarning {
             get {
@@ -574,7 +574,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 璐ㄩ噺闂缁熻 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 璐ㄩ噺闂缁熻 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string Quality_problem_statistics {
             get {
@@ -583,7 +583,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 璧勮川棰勮 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 璧勮川棰勮 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string Quawarning {
             get {
@@ -592,7 +592,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 閫�鍑� 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 閫�鍑� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string quit {
             get {
@@ -601,7 +601,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 瀹炴椂瑙嗛 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 瀹炴椂瑙嗛 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string RealTimeVideo {
             get {
@@ -610,7 +610,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鏁存敼鐜� 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鏁存敼鐜� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string RectificationRate {
             get {
@@ -619,7 +619,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鍒锋柊 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鍒锋柊 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string Refresh {
             get {
@@ -628,7 +628,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鍒锋柊鏈〉 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鍒锋柊鏈〉 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string RefreshPage {
             get {
@@ -637,7 +637,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 璺濈宸ュ墿浣� 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 璺濈宸ュ墿浣� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string RemainingTimeCompletion {
             get {
@@ -646,7 +646,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 椋庨櫓绠℃帶 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 椋庨櫓绠℃帶 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string RiskControl {
             get {
@@ -655,7 +655,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 瀹夊叏浜哄伐鏃� 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 瀹夊叏浜哄伐鏃� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string SafeLaborHours {
             get {
@@ -664,7 +664,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 瀹夊叏闂缁熻 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 瀹夊叏闂缁熻 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string SafeProStat {
             get {
@@ -673,7 +673,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 绱瀹夊叏浜哄伐鏃� 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 绱瀹夊叏浜哄伐鏃� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string SafetyLaborHours {
             get {
@@ -682,7 +682,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 瀹夊叏缁熻 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 瀹夊叏缁熻 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string SafetyStatistics {
             get {
@@ -691,7 +691,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 宸ョ▼绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 宸ョ▼绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string ScheduleManage {
             get {
@@ -700,7 +700,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 閫夋嫨璇█ 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 閫夋嫨璇█ 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string SelectLanguage {
             get {
@@ -709,7 +709,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鍔冲姟鏁版嵁 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鍔冲姟鏁版嵁 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string ServiceData {
             get {
@@ -718,7 +718,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 璁剧疆 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 璁剧疆 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string Settings {
             get {
@@ -727,7 +727,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 娉ㄩ攢 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 娉ㄩ攢 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string SignOUT {
             get {
@@ -736,7 +736,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 寮�宸ユ椂闂� 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 寮�宸ユ椂闂� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string Start_time {
             get {
@@ -745,7 +745,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鍒嗗寘绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鍒嗗寘绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string SubManagement {
             get {
@@ -754,7 +754,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鐩戠悊鍗曚綅 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鐩戠悊鍗曚綅 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string SupervisionUnit {
             get {
@@ -763,7 +763,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鍒囨崲棣栭〉 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鍒囨崲棣栭〉 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string SwitchHomePage {
             get {
@@ -772,7 +772,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 绯荤粺鑿滃崟 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 绯荤粺鑿滃崟 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string SystemMenu {
             get {
@@ -781,7 +781,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鏅烘収鏂藉伐绠＄悊淇℃伅绯荤粺 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鏅烘収鏂藉伐绠＄悊淇℃伅绯荤粺 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string SystemName {
             get {
@@ -790,7 +790,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 娓╁害 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 娓╁害 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string temperature {
             get {
@@ -799,7 +799,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 绔ｅ伐鏃堕棿 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 绔ｅ伐鏃堕棿 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string TimeCompletion {
             get {
@@ -808,7 +808,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 寰呭姙浜嬮」 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 寰呭姙浜嬮」 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string TodoList {
             get {
@@ -817,7 +817,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鍚堝悓鎬诲伐鏈� 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鍚堝悓鎬诲伐鏈� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string TotalContractDuration {
             get {
@@ -826,7 +826,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鏈畬鎴� 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鏈畬鎴� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string uncompleted {
             get {
@@ -835,7 +835,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鐢ㄦ埛 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鐢ㄦ埛 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string user {
             get {
@@ -844,7 +844,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 瑙嗛鐩戞帶 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 瑙嗛鐩戞帶 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string VideoSurveillance {
             get {
@@ -853,7 +853,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 鐒婃帴绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 鐒婃帴绠＄悊 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string WeldingManage {
             get {
@@ -862,7 +862,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 椋庨�� 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 椋庨�� 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string WindSpeed {
             get {
@@ -871,7 +871,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  鏌ユ壘绫讳技 浣滀笟浜哄憳鎬绘暟 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 浣滀笟浜哄憳鎬绘暟 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string WorkPersonnel {
             get {
diff --git a/SGGL/FineUIPro.Web/AttachFile/OnlineEditing.aspx.cs b/SGGL/FineUIPro.Web/AttachFile/OnlineEditing.aspx.cs
index 9632e4c..5ea35d1 100644
--- a/SGGL/FineUIPro.Web/AttachFile/OnlineEditing.aspx.cs
+++ b/SGGL/FineUIPro.Web/AttachFile/OnlineEditing.aspx.cs
@@ -1,10 +1,10 @@
-锘縰sing System;
+锘縰sing BLL;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
-using BLL;
 
 namespace FineUIPro.Web.AttachFile
 {
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index d77efb0..559d1d4 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -7346,3 +7346,80 @@ IP鍦板潃:::1
 
 鍑洪敊鏃堕棿:05/09/2025 15:05:47
 
+
+閿欒淇℃伅寮�濮�=====>
+閿欒绫诲瀷:NullReferenceException
+閿欒淇℃伅:鏈皢瀵硅薄寮曠敤璁剧疆鍒板璞＄殑瀹炰緥銆�
+閿欒鍫嗘爤:
+   鍦� ASP.attachfile_onlineediting_aspx.__Render__control3(HtmlTextWriter __w, Control parameterContainer) 浣嶇疆 e:\鍏徃椤圭洰\娌冲寳瀹夎\SGGL_HBAZ\SGGL\FineUIPro.Web\AttachFile\OnlineEditing.aspx:琛屽彿 105
+   鍦� System.Web.UI.Control.RenderChildrenInternal(HtmlTextWriter writer, ICollection children)
+   鍦� System.Web.UI.HtmlControls.HtmlHead.RenderChildren(HtmlTextWriter writer)
+   鍦� System.Web.UI.HtmlControls.HtmlContainerControl.Render(HtmlTextWriter writer)
+   鍦� System.Web.UI.Control.RenderControlInternal(HtmlTextWriter writer, ControlAdapter adapter)
+   鍦� System.Web.UI.Control.RenderControl(HtmlTextWriter writer, ControlAdapter adapter)
+   鍦� System.Web.UI.Control.RenderControl(HtmlTextWriter writer)
+   鍦� System.Web.UI.Control.RenderChildrenInternal(HtmlTextWriter writer, ICollection children)
+   鍦� System.Web.UI.Control.RenderChildren(HtmlTextWriter writer)
+   鍦� System.Web.UI.Page.Render(HtmlTextWriter writer)
+   鍦� System.Web.UI.Control.RenderControlInternal(HtmlTextWriter writer, ControlAdapter adapter)
+   鍦� System.Web.UI.Control.RenderControl(HtmlTextWriter writer, ControlAdapter adapter)
+   鍦� System.Web.UI.Control.RenderControl(HtmlTextWriter writer)
+   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+鍑洪敊鏃堕棿:05/14/2025 17:37:21
+鍑洪敊鏂囦欢:http://localhost:4528/AttachFile/OnlineEditing.aspx
+IP鍦板潃:::1
+
+鍑洪敊鏃堕棿:05/14/2025 17:37:21
+
+
+
+閿欒淇℃伅寮�濮�=====>
+閿欒绫诲瀷:NullReferenceException
+閿欒淇℃伅:鏈皢瀵硅薄寮曠敤璁剧疆鍒板璞＄殑瀹炰緥銆�
+閿欒鍫嗘爤:
+   鍦� FineUIPro.Web.HSSE.Meeting.ClassMeeting.Page_Load(Object sender, EventArgs e) 浣嶇疆 E:\COMPANYPROJECT\娌冲寳瀹夎\SGGL_HBAZ\SGGL\FineUIPro.Web\HSSE\Meeting\ClassMeeting.aspx.cs:琛屽彿 40
+   鍦� System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   鍦� System.Web.UI.Control.OnLoad(EventArgs e)
+   鍦� System.Web.UI.Control.LoadRecursive()
+   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+鍑洪敊鏃堕棿:06/04/2025 09:55:34
+鍑洪敊鏂囦欢:http://localhost:4528/HSSE/Meeting/ClassMeeting.aspx
+IP鍦板潃:::1
+
+鍑洪敊鏃堕棿:06/04/2025 09:55:34
+
+
+
+閿欒淇℃伅寮�濮�=====>
+閿欒绫诲瀷:NullReferenceException
+閿欒淇℃伅:鏈皢瀵硅薄寮曠敤璁剧疆鍒板璞＄殑瀹炰緥銆�
+閿欒鍫嗘爤:
+   鍦� FineUIPro.Web.HSSE.Meeting.ClassMeeting.Page_Load(Object sender, EventArgs e) 浣嶇疆 E:\COMPANYPROJECT\娌冲寳瀹夎\SGGL_HBAZ\SGGL\FineUIPro.Web\HSSE\Meeting\ClassMeeting.aspx.cs:琛屽彿 40
+   鍦� System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   鍦� System.Web.UI.Control.OnLoad(EventArgs e)
+   鍦� System.Web.UI.Control.LoadRecursive()
+   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+鍑洪敊鏃堕棿:06/04/2025 10:21:52
+鍑洪敊鏂囦欢:http://localhost:4528/HSSE/Meeting/ClassMeeting.aspx
+IP鍦板潃:::1
+
+鍑洪敊鏃堕棿:06/04/2025 10:21:52
+
+
+
+閿欒淇℃伅寮�濮�=====>
+閿欒绫诲瀷:NullReferenceException
+閿欒淇℃伅:鏈皢瀵硅薄寮曠敤璁剧疆鍒板璞＄殑瀹炰緥銆�
+閿欒鍫嗘爤:
+   鍦� FineUIPro.Web.HSSE.Meeting.ClassMeeting.Page_Load(Object sender, EventArgs e) 浣嶇疆 E:\COMPANYPROJECT\娌冲寳瀹夎\SGGL_HBAZ\SGGL\FineUIPro.Web\HSSE\Meeting\ClassMeeting.aspx.cs:琛屽彿 40
+   鍦� System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   鍦� System.Web.UI.Control.OnLoad(EventArgs e)
+   鍦� System.Web.UI.Control.LoadRecursive()
+   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+鍑洪敊鏃堕棿:06/05/2025 14:16:02
+鍑洪敊鏂囦欢:http://localhost:4528/HSSE/Meeting/ClassMeeting.aspx
+IP鍦板潃:::1
+
+鍑洪敊鏃堕棿:06/05/2025 14:16:02
+
+
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 3b68797..46eb2dd 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -12,7 +12,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FineUIPro.Web</RootNamespace>
     <AssemblyName>FineUIPro.Web</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <SccProjectName>
     </SccProjectName>
@@ -19738,7 +19738,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.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.
   <Target Name="BeforeBuild">
diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeeting.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeeting.aspx.cs
index eca5ab2..9d86d8d 100644
--- a/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeeting.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeeting.aspx.cs
@@ -89,12 +89,12 @@ namespace FineUIPro.Web.HSSE.Meeting
             }
             if (!string.IsNullOrEmpty(txtStartTime.Text.Trim()))
             {
-                strSql += " AND ClassMeeting.CompileDate >= @StartTime";
+                strSql += " AND ClassMeeting.ClassMeetingDate >= @StartTime";
                 listStr.Add(new SqlParameter("@StartTime", string.Format("{0} {1}", this.txtStartTime.Text.Trim(), "00:00:00")));
             }
             if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
             {
-                strSql += " AND ClassMeeting.CompileDate <= @EndTime   ORDER BY TeamGroupId ASC";
+                strSql += " AND ClassMeeting.ClassMeetingDate <= @EndTime   ORDER BY TeamGroupId ASC";
                 listStr.Add(new SqlParameter("@EndTime", string.Format("{0} {1}", this.txtEndTime.Text.Trim(), "23:59:59")));
             }
             SqlParameter[] parameter = listStr.ToArray();
@@ -216,7 +216,7 @@ namespace FineUIPro.Web.HSSE.Meeting
             DateTime end = DateTime.Parse(string.Format("{0} 23:59:59", this.txtEndTime.Text.Trim()));
             try
             {
-                str = Funs.DB.Meeting_ClassMeeting.Where(x => x.TeamGroupId == groupId && x.CompileDate >= start && x.CompileDate <= end && x.ProjectId == this.CurrUser.LoginProjectId).Sum(p => p.AttentPersonNum).ToString();
+                str = Funs.DB.Meeting_ClassMeeting.Where(x => x.TeamGroupId == groupId && x.ClassMeetingDate >= start && x.ClassMeetingDate <= end && x.ProjectId == this.CurrUser.LoginProjectId).Sum(p => p.AttentPersonNum).ToString();
             }
             catch (Exception ex)
             {
diff --git a/SGGL/FineUIPro.Web/common/main3.aspx b/SGGL/FineUIPro.Web/common/main3.aspx
index 0d087c7..50779c1 100644
--- a/SGGL/FineUIPro.Web/common/main3.aspx
+++ b/SGGL/FineUIPro.Web/common/main3.aspx
@@ -17,7 +17,8 @@
     input[type="date"] {
         background-color: rgba(0,0,0,0);
         color: #ffffff;
-        font-size: .175rem;
+                    font-size: 0.2rem;
+            font-weight: 700;
     }
 
     img {
@@ -179,7 +180,7 @@
             <div class="t-aqtj">
                 <div id="aqtj" style="height: 100%; width: 100%;"></div>
             </div>
-            <div class="t-side-tit">
+           <%-- <div class="t-side-tit">
                 <asp:Literal runat="server" Text="<%$ Resources:Lan,LiveVideo%>" />
             </div>
             <div class="t-xcsp video_content" style="position: relative;">
@@ -197,7 +198,7 @@
 
                     </div>
                 </div>
-            </div>
+            </div>--%>
         </div>
         <div class="t-center">
             <%--     <div class="t-xm flex-row flex-center">
@@ -483,6 +484,11 @@
                 grid: {
                     top: 30,
                 },
+                tooltip: {
+                    textStyle: {
+                        fontSize: 20
+                    }
+                },
                 xAxis: {
                     type: 'category',
                     data: tit,
diff --git a/SGGL/FineUIPro.Web/common/main3.aspx.cs b/SGGL/FineUIPro.Web/common/main3.aspx.cs
index 3e34905..ba77c56 100644
--- a/SGGL/FineUIPro.Web/common/main3.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/main3.aspx.cs
@@ -86,12 +86,14 @@ namespace FineUIPro.Web.common
         {
             DateTime startd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", startdate, "00:00:00"));
             DateTime endd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", enddate, "23:59:59"));
-            int m_count = Funs.DB.Project_ProjectUser.Count();
-            int job_count = (from x in Funs.DB.Meeting_ClassMeeting
+
+            var m_count = Funs.DB.Project_ProjectUser.Count();
+            var job_count = (from x in Funs.DB.Meeting_ClassMeeting
                              where x.ClassMeetingDate >= startd && x.ClassMeetingDate <= endd
                              select new Model.MeetingItem
                              {
-                                 AttentPersonNum = x.AttentPersonNum ?? 0,
+                                 ProjectId = x.ProjectId,
+                                 AttentPersonNum = x.AttentPersonNum ?? 0
 
                              }).ToList().Sum(s => s.AttentPersonNum);
 
diff --git a/SGGL/FineUIPro.Web/common/mainProject.aspx b/SGGL/FineUIPro.Web/common/mainProject.aspx
index 39e2894..348ae73 100644
--- a/SGGL/FineUIPro.Web/common/mainProject.aspx
+++ b/SGGL/FineUIPro.Web/common/mainProject.aspx
@@ -12,7 +12,7 @@
 
     <link href="../res/indexv2/assets/css/swiper.min.css" rel="stylesheet" />
     <link rel="stylesheet" href="../res/css/base.css">
-    <link rel="stylesheet" href="../res/css/projectIndex.css?v3">
+    <link rel="stylesheet" href="../res/css/projectIndex.css?v5">
     <script src="../res/lib/flex.js"></script>
     <style type="text/css">
         .sd-body2 .sd-section .sd-section7-inner .sd-labor-echart .sd-labor-echart-box {
@@ -22,7 +22,8 @@
         input[type="date"] {
             background-color: rgba(0,0,0,0);
             color: #ffffff;
-            font-size: .175rem;
+            font-size: 0.2rem;
+            font-weight: 700;
         }
 
             input[type="date"]::-webkit-calendar-picker-indicator {
@@ -257,7 +258,7 @@
                         <video src="#"></video>
                     </div>
                 </div>--%>
-                <div class="side-tit image-full tit1">
+      <%--          <div class="side-tit image-full tit1">
                     <asp:Literal runat="server" Text="<%$ Resources:Lan,VideoSurveillance%>" />
                 </div>
                 <div class="vid-box sd-section-content video_content" style="height: 3.75rem;">
@@ -275,7 +276,7 @@
 
                         </div>
                     </div>
-                </div>
+                </div>--%>
             </div>
             <div class="center">
                 <div class="pro-d">
@@ -305,7 +306,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="ht-box flex-row flex-between">
+               <%-- <div class="ht-box flex-row flex-between">
                     <div class="ht-item flex-column flex-center flex-item-start">
                         <div class="ht-item-lab">
                             <asp:Literal runat="server" Text="<%$ Resources:Lan,TotalContractDuration%>" />
@@ -428,7 +429,7 @@
                         <div class="cs-item-lab">PM10</div>
                         <div class="cs-item-val"><span runat="server" id="divHJ6">0</span></div>
                     </div>
-                </div>
+                </div>--%>
             </div>
             <div class="side side-right">
                 <div class="side-tit image-full">
@@ -715,6 +716,11 @@
                 grid: {
                     top: 30,
                 },
+                tooltip: {
+                    textStyle: {
+                        fontSize: 20
+                    }
+                },
                 xAxis: {
                     type: 'category',
                     data: tit,
diff --git a/SGGL/FineUIPro.Web/common/mainProject.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject.aspx.cs
index 6f6e815..3d1dd67 100644
--- a/SGGL/FineUIPro.Web/common/mainProject.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainProject.aspx.cs
@@ -86,20 +86,15 @@ namespace FineUIPro.Web.common
         {
             DateTime startd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", startdate, "00:00:00"));
             DateTime endd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", enddate, "23:59:59"));
-            var meet = (from x in Funs.DB.Meeting_ClassMeeting
-                        where x.ProjectId == ProjectId && x.ClassMeetingDate >= startd && x.ClassMeetingDate <= endd
-                        select new Model.MeetingItem
-                        {
-                            AttentPersonNum = x.AttentPersonNum ?? 0,
-                            ManagePersonNum = x.ManagePersonNum ?? 0,
-                        }).ToList();
-            var m_count = 0;
-            var job_count = 0;
-            if (meet.Count() > 0)
-            {
-               m_count = meet.Where(m => m.ManagePersonNum != null).Max(m => m.ManagePersonNum);
-               job_count = meet.Sum(s => s.AttentPersonNum);
-            }
+
+            var m_count = Funs.DB.Project_ProjectUser.Where(x => x.ProjectId == ProjectId).Count();
+            var job_count = (from x in Funs.DB.Meeting_ClassMeeting
+                             where x.ProjectId == ProjectId && x.ClassMeetingDate >= startd && x.ClassMeetingDate <= endd
+                             select new Model.MeetingItem
+                             {
+                                 AttentPersonNum = x.AttentPersonNum ?? 0,
+                                 ManagePersonNum = x.ManagePersonNum ?? 0,
+                             }).ToList().Sum(s => s.AttentPersonNum);
           
 
             return new {
@@ -217,23 +212,23 @@ namespace FineUIPro.Web.common
             {
                 try
                 {
-                    divHJ1.InnerHtml = environment.Tem.Value.ToString("#.##");
-                    divHJ2.InnerHtml = environment.Noise.Value.ToString("#.##");
-                    divHJ3.InnerHtml = environment.Hum.Value.ToString("#.##");
-                    divHJ4.InnerHtml = environment.Pm25.Value.ToString("#.##");
-                    divHJ5.InnerHtml = environment.Ws.Value.ToString("#.##");
-                    divHJ6.InnerHtml = environment.Pm10.Value.ToString("#.##");
+                    //divHJ1.InnerHtml = environment.Tem.Value.ToString("#.##");
+                    //divHJ2.InnerHtml = environment.Noise.Value.ToString("#.##");
+                    //divHJ3.InnerHtml = environment.Hum.Value.ToString("#.##");
+                    //divHJ4.InnerHtml = environment.Pm25.Value.ToString("#.##");
+                    //divHJ5.InnerHtml = environment.Ws.Value.ToString("#.##");
+                    //divHJ6.InnerHtml = environment.Pm10.Value.ToString("#.##");
                 }
                 catch (Exception ex) { }
             }
             else
             {
-                divHJ1.InnerHtml = "0";
-                divHJ2.InnerHtml = "0";
-                divHJ3.InnerHtml = "0";
-                divHJ4.InnerHtml = "0";
-                divHJ5.InnerHtml = "0";
-                divHJ6.InnerHtml = "0";
+                //divHJ1.InnerHtml = "0";
+                //divHJ2.InnerHtml = "0";
+                //divHJ3.InnerHtml = "0";
+                //divHJ4.InnerHtml = "0";
+                //divHJ5.InnerHtml = "0";
+                //divHJ6.InnerHtml = "0";
             }
         }
         #endregion
@@ -413,18 +408,18 @@ namespace FineUIPro.Web.common
                 //this.divProjectMoney.InnerHtml = divProjectMoneyTitle = project.ProjectMoney.ToString();
                 if (project.EndDate.HasValue)
                 {
-                    this.divEndDate.InnerHtml = string.Format("{0:yyyy-MM-dd}", project.EndDate);
+                    //this.divEndDate.InnerHtml = string.Format("{0:yyyy-MM-dd}", project.EndDate);
                     int endDays = (project.EndDate.Value - DateTime.Now).Days;
                     if (endDays >= 0)
                     {
-                        this.divRemainingDays.InnerHtml = endDays.ToString();
+                        //this.divRemainingDays.InnerHtml = endDays.ToString();
                     }
                     if (project.StartDate.HasValue)
                     {
                         int pdays = (project.EndDate.Value - project.StartDate.Value).Days;
                         if (pdays >= 0)
                         {
-                            this.divProjectDays.InnerHtml = pdays.ToString();
+                            //this.divProjectDays.InnerHtml = pdays.ToString();
                         }
                     }
                 }
@@ -656,119 +651,119 @@ namespace FineUIPro.Web.common
             {
                 var Pmodel = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == ProjectId);
                 //寮�宸ユ棩鏈�
-                if (Pmodel.StartDate != null)
-                {
-                    scheDate0.InnerText = string.Format("{0:yyyy-MM-dd}", Pmodel.StartDate);
-                    if (!isBoolDates(Pmodel.StartDate))
-                    {
-                        scheline0.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red";
-                        scheDate0.Style.Add("color", "#FF7474");
-                        scheName0.Style.Add("color", "#FF7474");
-                    }
-                }
-                else
-                {
-                    scheDate0.InnerText = "";
-                }
+                //if (Pmodel.StartDate != null)
+                //{
+                //    scheDate0.InnerText = string.Format("{0:yyyy-MM-dd}", Pmodel.StartDate);
+                //    if (!isBoolDates(Pmodel.StartDate))
+                //    {
+                //        scheline0.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red";
+                //        scheDate0.Style.Add("color", "#FF7474");
+                //        scheName0.Style.Add("color", "#FF7474");
+                //    }
+                //}
+                //else
+                //{
+                //    scheDate0.InnerText = "";
+                //}
 
                 //绔ｅ伐鏃ユ湡
-                if (Pmodel.EndDate != null)
-                {
-                    scheDate7.InnerText = string.Format("{0:yyyy-MM-dd}", Pmodel.EndDate);
-                    if (!isBoolDates(Pmodel.EndDate))
-                    {
-                        scheline7.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red";
-                        scheDate7.Style.Add("color", "#FF7474");
-                        scheName7.Style.Add("color", "#FF7474");
-                    }
-                }
-                else
-                {
-                    scheDate7.InnerText = "";
-                }
+                //if (Pmodel.EndDate != null)
+                //{
+                //    scheDate7.InnerText = string.Format("{0:yyyy-MM-dd}", Pmodel.EndDate);
+                //    if (!isBoolDates(Pmodel.EndDate))
+                //    {
+                //        scheline7.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red";
+                //        scheDate7.Style.Add("color", "#FF7474");
+                //        scheName7.Style.Add("color", "#FF7474");
+                //    }
+                //}
+                //else
+                //{
+                //    scheDate7.InnerText = "";
+                //}
 
-                if (scheduleList.Count > 0)
-                {
-                    //鑺傜偣1
-                    if (scheduleList.FirstOrDefault(x => x.SortId == 1) != null)
-                    {
-                        scheName1.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 1).ScheduleName;
-                        var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 1).ScheduleDate;
-                        scheDate1.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate);
+                //if (scheduleList.Count > 0)
+                //{
+                //    //鑺傜偣1
+                //    //if (scheduleList.FirstOrDefault(x => x.SortId == 1) != null)
+                //    //{
+                //    //    scheName1.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 1).ScheduleName;
+                //    //    var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 1).ScheduleDate;
+                //    //    scheDate1.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate);
 
-                        if (!isBoolDates(NowDate))
-                        {
-                            scheline1.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red";
-                            scheDate1.Style.Add("color", "#FF7474");
-                            scheName1.Style.Add("color", "#FF7474");
-                        }
-                    }
-                    //鑺傜偣2
-                    if (scheduleList.FirstOrDefault(x => x.SortId == 2) != null)
-                    {
-                        scheName2.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 2).ScheduleName;
-                        var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 2).ScheduleDate;
-                        scheDate2.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate);
+                //    //    if (!isBoolDates(NowDate))
+                //    //    {
+                //    //        scheline1.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red";
+                //    //        scheDate1.Style.Add("color", "#FF7474");
+                //    //        scheName1.Style.Add("color", "#FF7474");
+                //    //    }
+                //    //}
+                //    //鑺傜偣2
+                //    //if (scheduleList.FirstOrDefault(x => x.SortId == 2) != null)
+                //    //{
+                //    //    scheName2.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 2).ScheduleName;
+                //    //    var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 2).ScheduleDate;
+                //    //    scheDate2.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate);
 
-                        if (!isBoolDates(NowDate))
-                        {
-                            scheline2.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red";
-                            scheDate2.Style.Add("color", "#FF7474");
-                            scheName2.Style.Add("color", "#FF7474");
-                        }
-                    }
-                    //鑺傜偣3
-                    if (scheduleList.FirstOrDefault(x => x.SortId == 3) != null)
-                    {
-                        scheName3.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 3).ScheduleName;
-                        var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 3).ScheduleDate;
-                        scheDate3.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate);
-                        if (!isBoolDates(NowDate))
-                        {
-                            scheline3.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red";
-                            scheDate3.Style.Add("color", "#FF7474");
-                            scheName3.Style.Add("color", "#FF7474");
-                        }
-                    }
-                    //鑺傜偣4
-                    if (scheduleList.FirstOrDefault(x => x.SortId == 4) != null)
-                    {
-                        scheName4.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 4).ScheduleName;
-                        var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 4).ScheduleDate;
-                        scheDate4.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate);
-                        if (!isBoolDates(NowDate))
-                        {
-                            scheline4.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red";
-                            scheDate4.Style.Add("color", "#FF7474");
-                            scheName4.Style.Add("color", "#FF7474");
-                        }
-                    }
-                    //鑺傜偣5
-                    if (scheduleList.FirstOrDefault(x => x.SortId == 5) != null)
-                    {
-                        scheName5.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 5).ScheduleName;
-                        var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 5).ScheduleDate;
-                        scheDate5.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate);
-                        if (!isBoolDates(NowDate))
-                        {
-                            scheline5.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red";
-                            scheDate5.Style.Add("color", "#FF7474");
-                            scheName5.Style.Add("color", "#FF7474");
-                        }
-                    }//鑺傜偣6
-                    if (scheduleList.FirstOrDefault(x => x.SortId == 6) != null)
-                    {
-                        scheName6.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 6).ScheduleName;
-                        var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 6).ScheduleDate;
-                        scheDate6.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate);
-                        if (!isBoolDates(NowDate))
-                        {
-                            scheline6.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red";
-                            scheDate6.Style.Add("color", "#FF7474");
-                            scheName6.Style.Add("color", "#FF7474");
-                        }
-                    }
-                }
+                //    //    if (!isBoolDates(NowDate))
+                //    //    {
+                //    //        scheline2.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red";
+                //    //        scheDate2.Style.Add("color", "#FF7474");
+                //    //        scheName2.Style.Add("color", "#FF7474");
+                //    //    }
+                //    //}
+                //    //鑺傜偣3
+                //    if (scheduleList.FirstOrDefault(x => x.SortId == 3) != null)
+                //    {
+                //        scheName3.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 3).ScheduleName;
+                //        var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 3).ScheduleDate;
+                //        scheDate3.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate);
+                //        if (!isBoolDates(NowDate))
+                //        {
+                //            scheline3.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red";
+                //            scheDate3.Style.Add("color", "#FF7474");
+                //            scheName3.Style.Add("color", "#FF7474");
+                //        }
+                //    }
+                //    //鑺傜偣4
+                //    if (scheduleList.FirstOrDefault(x => x.SortId == 4) != null)
+                //    {
+                //        scheName4.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 4).ScheduleName;
+                //        var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 4).ScheduleDate;
+                //        scheDate4.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate);
+                //        if (!isBoolDates(NowDate))
+                //        {
+                //            scheline4.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red";
+                //            scheDate4.Style.Add("color", "#FF7474");
+                //            scheName4.Style.Add("color", "#FF7474");
+                //        }
+                //    }
+                //    //鑺傜偣5
+                //    if (scheduleList.FirstOrDefault(x => x.SortId == 5) != null)
+                //    {
+                //        scheName5.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 5).ScheduleName;
+                //        var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 5).ScheduleDate;
+                //        scheDate5.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate);
+                //        if (!isBoolDates(NowDate))
+                //        {
+                //            scheline5.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red";
+                //            scheDate5.Style.Add("color", "#FF7474");
+                //            scheName5.Style.Add("color", "#FF7474");
+                //        }
+                //    }//鑺傜偣6
+                //    if (scheduleList.FirstOrDefault(x => x.SortId == 6) != null)
+                //    {
+                //        scheName6.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 6).ScheduleName;
+                //        var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 6).ScheduleDate;
+                //        scheDate6.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate);
+                //        if (!isBoolDates(NowDate))
+                //        {
+                //            scheline6.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red";
+                //            scheDate6.Style.Add("color", "#FF7474");
+                //            scheName6.Style.Add("color", "#FF7474");
+                //        }
+                //    }
+                //}
             }
 
         }
diff --git a/SGGL/FineUIPro.Web/common/mainProject.aspx.designer.cs b/SGGL/FineUIPro.Web/common/mainProject.aspx.designer.cs
index 5c12744..09f8f84 100644
--- a/SGGL/FineUIPro.Web/common/mainProject.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/common/mainProject.aspx.designer.cs
@@ -59,303 +59,6 @@ namespace FineUIPro.Web.common
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lbRemark;
 
-        /// <summary>
-        /// divProjectDays 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divProjectDays;
-
-        /// <summary>
-        /// divEndDate 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divEndDate;
-
-        /// <summary>
-        /// divRemainingDays 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divRemainingDays;
-
-        /// <summary>
-        /// scheline0 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheline0;
-
-        /// <summary>
-        /// scheName0 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheName0;
-
-        /// <summary>
-        /// scheDate0 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheDate0;
-
-        /// <summary>
-        /// scheline1 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheline1;
-
-        /// <summary>
-        /// scheName1 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheName1;
-
-        /// <summary>
-        /// scheDate1 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheDate1;
-
-        /// <summary>
-        /// scheline2 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheline2;
-
-        /// <summary>
-        /// scheName2 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheName2;
-
-        /// <summary>
-        /// scheDate2 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheDate2;
-
-        /// <summary>
-        /// scheline3 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheline3;
-
-        /// <summary>
-        /// scheName3 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheName3;
-
-        /// <summary>
-        /// scheDate3 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheDate3;
-
-        /// <summary>
-        /// scheline4 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheline4;
-
-        /// <summary>
-        /// scheName4 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheName4;
-
-        /// <summary>
-        /// scheDate4 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheDate4;
-
-        /// <summary>
-        /// scheline5 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheline5;
-
-        /// <summary>
-        /// scheName5 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheName5;
-
-        /// <summary>
-        /// scheDate5 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheDate5;
-
-        /// <summary>
-        /// scheline6 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheline6;
-
-        /// <summary>
-        /// scheName6 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheName6;
-
-        /// <summary>
-        /// scheDate6 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheDate6;
-
-        /// <summary>
-        /// scheline7 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheline7;
-
-        /// <summary>
-        /// scheName7 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheName7;
-
-        /// <summary>
-        /// scheDate7 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheDate7;
-
-        /// <summary>
-        /// divHJ1 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHJ1;
-
-        /// <summary>
-        /// divHJ2 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHJ2;
-
-        /// <summary>
-        /// divHJ3 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHJ3;
-
-        /// <summary>
-        /// divHJ4 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHJ4;
-
-        /// <summary>
-        /// divHJ5 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHJ5;
-
-        /// <summary>
-        /// divHJ6 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHJ6;
-
         /// <summary>
         /// divCQMSAllNum 鎺т欢銆�
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/index.aspx b/SGGL/FineUIPro.Web/index.aspx
index fa716be..546297d 100644
--- a/SGGL/FineUIPro.Web/index.aspx
+++ b/SGGL/FineUIPro.Web/index.aspx
@@ -19,7 +19,6 @@
     <link href="~/res/indexv2/assets/css/video-7.15.0.min.css" rel="stylesheet" />
     <link href="~/res/indexv2/assets/css/index8.css" rel="stylesheet" />
     <link href="~/res/css/mainindex.css?v2" rel="stylesheet" />
-    >
     <style type="text/css">
         html {
             min-height: auto;
@@ -185,7 +184,7 @@
                                     </div>
                                     
                                 </div>
-                                <div class="t-head-log flex-row flex-center" onclick="onHomeClick()" style="cursor: pointer;">
+                                <div class="t-head-log flex-row flex-center" onclick="onHomeClick()" style="cursor: pointer;font-size: .5rem;">
                                     <asp:Literal runat="server" Text="<%$ Resources:Lan,SystemName%>" /></div>
                                 <div class="t-head-navs flex-row flex-item-end flex-end">
                                     <div class="t-head-nav">
@@ -219,23 +218,23 @@
                             </div>
                             <div class="t-head-sets flex-row flex-center">
                                 <div class="t-head-set news" hidden="hidden">
-                                    <f:Button runat="server" Text="<%$ Resources:Lan,SwitchHomePage %>" Hidden="true" CssStyle="color: #ffffff;" OnClick="btnChangeHomePage_Click" OnClientClick="parent.removeActiveTab();"
+                                    <f:Button runat="server" Text="<%$ Resources:Lan,SwitchHomePage %>" Hidden="true" CssStyle="color: #ffffff;font-size:.25rem;" OnClick="btnChangeHomePage_Click" OnClientClick="parent.removeActiveTab();"
                                         EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnToDoItem">
                                     </f:Button>
                                 </div>
                                 <div class="t-head-set user">
-                                    <f:Button runat="server" Text="<%$ Resources:Lan,user %>" CssStyle="color: #ffffff;" OnClick="btnPersonal_Click" OnClientClick="parent.removeActiveTab();"
+                                    <f:Button runat="server" Text="<%$ Resources:Lan,user %>" CssStyle="color: #ffffff;font-size:.25rem;" OnClick="btnPersonal_Click" OnClientClick="parent.removeActiveTab();"
                                         EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnPersonal">
                                     </f:Button>
                                 </div>
                                 <div class="t-head-set set">
-                                    <f:Button runat="server" Text="<%$ Resources:Lan,Settings %>" CssStyle="color: #ffffff;" OnClientClick="parent.removeActiveTab();" OnClick="btnSysSet_Click"
+                                    <f:Button runat="server" Text="<%$ Resources:Lan,Settings %>" CssStyle="color: #ffffff;font-size:.25rem;" OnClientClick="parent.removeActiveTab();" OnClick="btnSysSet_Click"
                                         EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="Button7">
                                     </f:Button>
                                 </div>
-                                <div class="t-head-set exit"><a href="javascript:void(0);" onclick="onToolSignOutClick()" style="color: #ffffff;">
+                                <div class="t-head-set exit"><a href="javascript:void(0);" onclick="onToolSignOutClick()" style="color: #ffffff;font-size:.25rem;">
                                     <asp:Literal runat="server" Text="<%$ Resources:Lan,quit%>" /></a></div>
-                                <div class="t-head-set full">
+                                <div class="t-head-set full" style="font-size:.25rem;">
                                     <asp:Literal runat="server" Text="<%$ Resources:Lan,FullScreen%>" /></div>
                                 <div class="top-li-item">
                                     <f:Button runat="server" CssClass="bgbtntop" Text="鍒锋柊" ToolTip="鍒锋柊鑿滃崟" IconFont="Retweet" OnClick="btnRetweet_Click"
diff --git a/SGGL/FineUIPro.Web/indexProject.aspx b/SGGL/FineUIPro.Web/indexProject.aspx
index 157d625..a292973 100644
--- a/SGGL/FineUIPro.Web/indexProject.aspx
+++ b/SGGL/FineUIPro.Web/indexProject.aspx
@@ -69,6 +69,7 @@
             background-color: transparent !important;
             padding: 0 !important;
             line-height: 1;
+            font-size: .3rem;
         }
 
         .activeClick {
@@ -132,7 +133,9 @@
             left: 0;
             top: 0;
         }*/
-
+        #index-project .bgbtn2{
+            font-size: .25rem;
+        }
         .f-tabstrip-align-left .f-tab-header.f-first {
             background-color: #dfe4f1;
             /* color: #fff;*/
@@ -305,7 +308,7 @@
                             </div>
                             <div class="logo flex-row flex-center">
                                 <h1>
-                                    <f:Button runat="server" CssClass="bgbtn2" EnablePostBack="true" CssStyle="color: #ffffff;" Text="<%$ Resources:Lan,SystemName %>" OnClick="btnHome_Click"
+                                    <f:Button runat="server" EnablePostBack="true" CssStyle="color: #ffffff;font-size: .5rem;" Text="<%$ Resources:Lan,SystemName %>" OnClick="btnHome_Click"
                                         EnableDefaultState="true" EnableDefaultCorner="false" ID="btnHome">
                                     </f:Button>
                                 </h1>
@@ -348,7 +351,7 @@
                         </div>
                         <div class="nav-bars flex-row flex-center">
                             <div class="project-select flex-row flex-start">
-                                <f:DropDownList runat="server" MarginBottom="0" ID="drpProject" OnSelectedIndexChanged="drpProject_SelectedIndexChanged"
+                                <f:DropDownList runat="server" MarginBottom="0" CssClass="bgbtn2" ID="drpProject" OnSelectedIndexChanged="drpProject_SelectedIndexChanged"
                                     AutoPostBack="true" EnableEdit="true">
                                 </f:DropDownList>
                             </div>
@@ -372,10 +375,10 @@
                                     EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnSysSet" OnClientClick="parent.removeActiveTab();">
                                 </f:Button>
                             </div>
-                            <div class="nav-bar exit"><a href="javascript:void(0);" style="color: #ffffff;" onclick="onToolSignOutClick()">
+                            <div class="nav-bar exit"><a href="javascript:void(0);" style="color: #ffffff;font-size:.25rem;"  onclick="onToolSignOutClick()">
                                 <asp:Literal runat="server" Text="<%$ Resources:Lan,quit%>" /></a></div>
                             <div class="nav-bar full">
-                                <div class="t-btn1  icon-quanping_o ab" style="cursor: pointer"><span style="color: #fff">
+                                <div class="t-btn1  icon-quanping_o ab" style="cursor: pointer"><span style="color: #fff; font-size:.25rem;">
                                     <asp:Literal runat="server" Text="<%$ Resources:Lan,FullScreen%>" /></span></div>
                             </div>
                         </div>
diff --git a/SGGL/FineUIPro.Web/res/css/base.css b/SGGL/FineUIPro.Web/res/css/base.css
index 7f8490a..ff2f952 100644
--- a/SGGL/FineUIPro.Web/res/css/base.css
+++ b/SGGL/FineUIPro.Web/res/css/base.css
@@ -169,7 +169,7 @@ body, .wrap, .main {
 
 
 .image-full{
-    background-size: 100%;
+    background-size: 100% 100%;
     background-position: center;
     background-repeat: no-repeat;
 }
diff --git a/SGGL/FineUIPro.Web/res/css/mainindex.css b/SGGL/FineUIPro.Web/res/css/mainindex.css
index 3235a73..b4ccd57 100644
--- a/SGGL/FineUIPro.Web/res/css/mainindex.css
+++ b/SGGL/FineUIPro.Web/res/css/mainindex.css
@@ -122,14 +122,14 @@ body::-webkit-scrollbar{
 }
 .lw-tit>.lw-item{
     width: 1.475rem;
-    height: .825rem;
+    height: 1rem;
     background-color: #254056;
     color: #ffffff;
     padding: .05rem;
 }
     .lw-tit > .lw-item > .lw-item-lab {
-        font-size: .175rem;
-        height: .25rem;
+        font-size: .25rem;
+        height: .5rem;
         color: #A9DDEE;
         border-bottom: 1px solid #00BEFF;
         width: 100%;
@@ -143,11 +143,11 @@ body::-webkit-scrollbar{
 
 
         .lw-tit > .lw-item > .lw-item-val {
-            height: calc(100% - .25rem);
+            height: calc(100% - .5rem);
             display: flex;
             align-items: center;
             justify-content: center;
-            font-size: .3rem;
+            font-size: .35rem;
         }
 .t-side>.t-side-tit{
     height: .45rem;
@@ -159,7 +159,7 @@ body::-webkit-scrollbar{
     background-repeat: no-repeat;
     font-family: Alibaba PuHuiTi 2.0, Alibaba PuHuiTi 20;
     color: #FFFFFF;
-    font-size: .2rem;
+    font-size: .25rem;
     position: relative;
 }
 
diff --git a/SGGL/FineUIPro.Web/res/css/projectIndex.css b/SGGL/FineUIPro.Web/res/css/projectIndex.css
index f94a402..a838c06 100644
--- a/SGGL/FineUIPro.Web/res/css/projectIndex.css
+++ b/SGGL/FineUIPro.Web/res/css/projectIndex.css
@@ -3,13 +3,13 @@
     padding: .25rem;
 }
 
-.side{
-    width: calc((100% - 11.25rem) / 2);
+.side {
+    width: calc((100% - 10rem) / 2);
     height: 100%
 }
 
 .center{
-    width: 11.25rem;
+    width: 10rem;
     height: 100%;
 }
 .c_lang {
@@ -19,11 +19,11 @@
 }
 .side-tit {
     width: 100%;
-    height: .375rem;
-    font-size: .175rem;
+    height: .5rem;
+    font-size: .25rem;
     color: #ffffff;
-    padding-left: .375rem;
-    line-height: .375rem;
+    padding-left: .5rem;
+    line-height: .5rem;
     background-image: url(../images/z01.png);
     position: relative;
 }
@@ -66,9 +66,12 @@
 
 .anq-inner>.anq-inner-b>.anq-inner-b-val{
     margin-top: .125rem;
-    font-size: .25rem;
+    font-size: .4rem;
 }
-.anq-inner>.anq-inner-b>.anq-inner-b-val>span:nth-child(2){
+    .anq-inner > .anq-inner-b > .anq-inner-b-text {
+        font-size: .3rem;
+        }
+        .anq-inner>.anq-inner-b>.anq-inner-b-val>span:nth-child(2){
     margin-left: .05rem;
     font-size: .175rem;
 }
@@ -91,8 +94,8 @@
     padding: .05rem;
 }
     .lw-tit > .lw-item > .lw-item-lab {
-        font-size: .175rem;
-        height: .25rem;
+        font-size: .3rem;
+        height: .4rem;
         color: #A9DDEE;
         border-bottom: 1px solid #00BEFF;
         width: 100%;
@@ -106,7 +109,7 @@
 
 
         .lw-tit > .lw-item > .lw-item-val {
-            height: calc(100% - .25rem);
+            height: calc(100% - .4rem);
             display: flex;
             align-items: center;
             justify-content: center;
@@ -290,13 +293,13 @@
 }
 
 .pro-d{
-    width: 11.25rem;
+    width: 10rem;
     height: 5.75rem;
     padding: .125rem;
     position: relative;
     background-image: url(../images/m02.png);
     background-position: center;
-    background-size: 100%;
+    background-size: 100% 100%;
     background-repeat: no-repeat;
 
 }
diff --git a/SGGL/Model/APIItem/HSSE/MeetingItem.cs b/SGGL/Model/APIItem/HSSE/MeetingItem.cs
index d51ea42..cec8d16 100644
--- a/SGGL/Model/APIItem/HSSE/MeetingItem.cs
+++ b/SGGL/Model/APIItem/HSSE/MeetingItem.cs
@@ -236,5 +236,10 @@ namespace Model
             get;
             set;
         }
+        public string ClassMeetingDate
+        {
+            get;
+            set;
+        }
     }
 }
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 2daeebe..c46d65b 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -10155,6 +10155,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<V_Cl_W_MaterialOutS> V_Cl_W_MaterialOutS
+		{
+			get
+			{
+				return this.GetTable<V_Cl_W_MaterialOutS>();
+			}
+		}
+		
 		public System.Data.Linq.Table<V_JOINTVIEW> V_JOINTVIEW
 		{
 			get
@@ -101203,6 +101211,8 @@ namespace Model
 		
 		private System.Nullable<decimal> _RQuantity;
 		
+		private string _Ghfs;
+		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -101251,6 +101261,8 @@ namespace Model
     partial void OnReturnSheetSIDChanged();
     partial void OnRQuantityChanging(System.Nullable<decimal> value);
     partial void OnRQuantityChanged();
+    partial void OnGhfsChanging(string value);
+    partial void OnGhfsChanged();
     #endregion
 		
 		public Cl_w_comp()
@@ -101698,6 +101710,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="ghfs", Storage="_Ghfs", DbType="NVarChar(10)")]
+		public string Ghfs
+		{
+			get
+			{
+				return this._Ghfs;
+			}
+			set
+			{
+				if ((this._Ghfs != value))
+				{
+					this.OnGhfsChanging(value);
+					this.SendPropertyChanging();
+					this._Ghfs = value;
+					this.SendPropertyChanged("Ghfs");
+					this.OnGhfsChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -104864,6 +104896,8 @@ namespace Model
 		
 		private string _InstallationId;
 		
+		private string _Ghfs;
+		
 		private EntitySet<Cl_W_MaterialReturnS> _Cl_W_MaterialReturnS;
 		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
@@ -104908,6 +104942,8 @@ namespace Model
     partial void OnUAidChanged();
     partial void OnInstallationIdChanging(string value);
     partial void OnInstallationIdChanged();
+    partial void OnGhfsChanging(string value);
+    partial void OnGhfsChanged();
     #endregion
 		
 		public Cl_W_MaterialReturnM()
@@ -105296,6 +105332,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="ghfs", Storage="_Ghfs", DbType="NVarChar(10)", UpdateCheck=UpdateCheck.Never)]
+		public string Ghfs
+		{
+			get
+			{
+				return this._Ghfs;
+			}
+			set
+			{
+				if ((this._Ghfs != value))
+				{
+					this.OnGhfsChanging(value);
+					this.SendPropertyChanging();
+					this._Ghfs = value;
+					this.SendPropertyChanged("Ghfs");
+					this.OnGhfsChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_CL_W_MAT_REFERENCE_CL_W_MAT", Storage="_Cl_W_MaterialReturnS", ThisKey="ReturnSheetMid", OtherKey="ReturnSheetMid", DeleteRule="NO ACTION")]
 		public EntitySet<Cl_W_MaterialReturnS> Cl_W_MaterialReturnS
 		{
@@ -437663,6 +437719,393 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.V_Cl_W_MaterialOutS")]
+	public partial class V_Cl_W_MaterialOutS
+	{
+		
+		private string _UAName;
+		
+		private string _Installationname;
+		
+		private string _OutSheetCode;
+		
+		private string _OutSheetSID;
+		
+		private string _StorageSheetSID;
+		
+		private string _MaterialID;
+		
+		private string _SystemCode;
+		
+		private string _Materialname;
+		
+		private string _Specificationtype;
+		
+		private string _Unit;
+		
+		private System.Nullable<decimal> _OutQuantity;
+		
+		private decimal _ReturnQuantity;
+		
+		private System.Nullable<decimal> _Sjcksl;
+		
+		private System.Nullable<decimal> _Weight;
+		
+		private System.Nullable<decimal> _Price;
+		
+		private string _FirstpartyCode;
+		
+		private string _ProjectId;
+		
+		private string _InstallationId;
+		
+		private string _YYPID;
+		
+		private string _UAid;
+		
+		private System.Nullable<System.DateTime> _UserTime;
+		
+		public V_Cl_W_MaterialOutS()
+		{
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UAName", DbType="NVarChar(100)")]
+		public string UAName
+		{
+			get
+			{
+				return this._UAName;
+			}
+			set
+			{
+				if ((this._UAName != value))
+				{
+					this._UAName = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Installationname", DbType="NVarChar(50)")]
+		public string Installationname
+		{
+			get
+			{
+				return this._Installationname;
+			}
+			set
+			{
+				if ((this._Installationname != value))
+				{
+					this._Installationname = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OutSheetCode", DbType="NVarChar(50)")]
+		public string OutSheetCode
+		{
+			get
+			{
+				return this._OutSheetCode;
+			}
+			set
+			{
+				if ((this._OutSheetCode != value))
+				{
+					this._OutSheetCode = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OutSheetSID", DbType="Char(36) NOT NULL", CanBeNull=false)]
+		public string OutSheetSID
+		{
+			get
+			{
+				return this._OutSheetSID;
+			}
+			set
+			{
+				if ((this._OutSheetSID != value))
+				{
+					this._OutSheetSID = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StorageSheetSID", DbType="Char(36)")]
+		public string StorageSheetSID
+		{
+			get
+			{
+				return this._StorageSheetSID;
+			}
+			set
+			{
+				if ((this._StorageSheetSID != value))
+				{
+					this._StorageSheetSID = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialID", DbType="Char(36)")]
+		public string MaterialID
+		{
+			get
+			{
+				return this._MaterialID;
+			}
+			set
+			{
+				if ((this._MaterialID != value))
+				{
+					this._MaterialID = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SystemCode", DbType="NVarChar(50)")]
+		public string SystemCode
+		{
+			get
+			{
+				return this._SystemCode;
+			}
+			set
+			{
+				if ((this._SystemCode != value))
+				{
+					this._SystemCode = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="materialname", Storage="_Materialname", DbType="NVarChar(500)")]
+		public string Materialname
+		{
+			get
+			{
+				return this._Materialname;
+			}
+			set
+			{
+				if ((this._Materialname != value))
+				{
+					this._Materialname = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="specificationtype", Storage="_Specificationtype", DbType="NVarChar(500)")]
+		public string Specificationtype
+		{
+			get
+			{
+				return this._Specificationtype;
+			}
+			set
+			{
+				if ((this._Specificationtype != value))
+				{
+					this._Specificationtype = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="unit", Storage="_Unit", DbType="NVarChar(50)")]
+		public string Unit
+		{
+			get
+			{
+				return this._Unit;
+			}
+			set
+			{
+				if ((this._Unit != value))
+				{
+					this._Unit = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OutQuantity", DbType="Decimal(15,4)")]
+		public System.Nullable<decimal> OutQuantity
+		{
+			get
+			{
+				return this._OutQuantity;
+			}
+			set
+			{
+				if ((this._OutQuantity != value))
+				{
+					this._OutQuantity = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReturnQuantity", DbType="Decimal(38,4) NOT NULL")]
+		public decimal ReturnQuantity
+		{
+			get
+			{
+				return this._ReturnQuantity;
+			}
+			set
+			{
+				if ((this._ReturnQuantity != value))
+				{
+					this._ReturnQuantity = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="sjcksl", Storage="_Sjcksl", DbType="Decimal(38,4)")]
+		public System.Nullable<decimal> Sjcksl
+		{
+			get
+			{
+				return this._Sjcksl;
+			}
+			set
+			{
+				if ((this._Sjcksl != value))
+				{
+					this._Sjcksl = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Weight", DbType="Decimal(10,4)")]
+		public System.Nullable<decimal> Weight
+		{
+			get
+			{
+				return this._Weight;
+			}
+			set
+			{
+				if ((this._Weight != value))
+				{
+					this._Weight = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Price", DbType="Decimal(10,4)")]
+		public System.Nullable<decimal> Price
+		{
+			get
+			{
+				return this._Price;
+			}
+			set
+			{
+				if ((this._Price != value))
+				{
+					this._Price = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FirstpartyCode", DbType="NVarChar(20)")]
+		public string FirstpartyCode
+		{
+			get
+			{
+				return this._FirstpartyCode;
+			}
+			set
+			{
+				if ((this._FirstpartyCode != value))
+				{
+					this._FirstpartyCode = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					this._ProjectId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationId", DbType="NVarChar(50)")]
+		public string InstallationId
+		{
+			get
+			{
+				return this._InstallationId;
+			}
+			set
+			{
+				if ((this._InstallationId != value))
+				{
+					this._InstallationId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_YYPID", DbType="NVarChar(150)")]
+		public string YYPID
+		{
+			get
+			{
+				return this._YYPID;
+			}
+			set
+			{
+				if ((this._YYPID != value))
+				{
+					this._YYPID = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UAid", DbType="Char(36)")]
+		public string UAid
+		{
+			get
+			{
+				return this._UAid;
+			}
+			set
+			{
+				if ((this._UAid != value))
+				{
+					this._UAid = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UserTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> UserTime
+		{
+			get
+			{
+				return this._UserTime;
+			}
+			set
+			{
+				if ((this._UserTime != value))
+				{
+					this._UserTime = value;
+				}
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.V_JOINTVIEW")]
 	public partial class V_JOINTVIEW
 	{
diff --git a/SGGL/WebAPI/Controllers/HSSE/HazardRegisterController.cs b/SGGL/WebAPI/Controllers/HSSE/HazardRegisterController.cs
index de721df..7db459d 100644
--- a/SGGL/WebAPI/Controllers/HSSE/HazardRegisterController.cs
+++ b/SGGL/WebAPI/Controllers/HSSE/HazardRegisterController.cs
@@ -176,7 +176,17 @@ namespace WebAPI.Controllers
             var responeData = new Model.ResponeData();
             try
             {
-                responeData.data = APIHazardRegisterService.getHazardRegisterByProjectIdStates(projectId, checkDate);
+
+                if(string.IsNullOrEmpty(projectId))
+                {
+                    projectId = ""; // 鏄庣‘浣跨敤榛樿鍊�
+                    responeData.data = APIHazardRegisterService.getHazardRegisterByProjectIdStates(projectId,checkDate);
+                }
+                else
+                {
+                    responeData.data = APIHazardRegisterService.getHazardRegisterByProjectIdStates(projectId, checkDate);
+                }
+                
             }
             catch (Exception ex)
             {
diff --git a/SGGL/WebAPI/Controllers/MaterialEntranceAndExitController.cs b/SGGL/WebAPI/Controllers/MaterialEntranceAndExitController.cs
deleted file mode 100644
index 3253014..0000000
--- a/SGGL/WebAPI/Controllers/MaterialEntranceAndExitController.cs
+++ /dev/null
@@ -1,1283 +0,0 @@
-锘縰sing 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鏈夊�硷紝鍒欐坊鍔燱HERE瀛愬彞
-                                sqlCommand.CommandText += " and  ProjectId = @ProjectId";
-                                sqlCommand.Parameters.AddWithValue("@ProjectId", ProjectId);
-                            }
-
-                            if (!string.IsNullOrEmpty(SystemCode))
-                            {
-                                // 濡傛灉ProjectId鏈夊�硷紝鍒欐坊鍔燱HERE瀛愬彞
-                                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鏄痗har(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鏄痗har(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涓篶har(36)绫诲瀷锛屼笖涓嶅彲涓虹┖
-            public string MaterialID { get; set; }
-
-            // ProjectId涓簄varchar(50)绫诲瀷锛屽彲涓虹┖
-            public string ProjectId { get; set; }
-
-            // SystemCode涓簄varchar(50)绫诲瀷锛屽彲涓虹┖
-            public string SystemCode { get; set; }
-
-            // TechnicalConditions涓簄varchar(1000)绫诲瀷锛屽彲涓虹┖
-            public string TechnicalConditions { get; set; }
-
-            // Unit涓簄varchar(50)绫诲瀷锛屽彲涓虹┖
-            public string Unit { get; set; }
-
-            // MaterialName涓簄varchar(500)绫诲瀷锛屽彲涓虹┖
-            public string MaterialName { get; set; }
-
-            // Specificationtype涓簄varchar(500)绫诲瀷锛屽彲涓虹┖
-            public string Specificationtype { get; set; }
-
-            // StandardSpecification涓簄varchar(500)绫诲瀷锛屽彲涓虹┖
-            public string StandardSpecification { get; set; }
-
-            // MaterialQuality涓簄varchar(500)绫诲瀷锛屽彲涓虹┖
-            public string MaterialQuality { get; set; }
-
-            // SpecialNote涓簄varchar(50)绫诲瀷锛屽彲涓虹┖
-            public string SpecialNote { get; set; }
-
-            // FirstpartyCode涓簄varchar(20)绫诲瀷锛屽彲涓虹┖
-            public string FirstpartyCode { get; set; }
-
-            // TheoryWeight涓篸ecimal(10,4)绫诲瀷锛屽彲涓虹┖
-            public decimal? TheoryWeight { get; set; }
-
-            // SCName涓簄varchar(20)绫诲瀷锛屽彲涓虹┖
-            public string SCName { get; set; }
-
-            // IsCheck涓篶har(1)绫诲瀷锛屽彲涓虹┖銆傝�冭檻鍒板彲鑳藉瓨鍌ㄧ殑鏄�'Y'/'N'鎴�'1'/'0'绛夛紝寤鸿浣跨敤瀛楃绫诲瀷銆�
-            public char? IsCheck { get; set; }
-
-            // NDTName涓簄varchar(20)绫诲瀷锛屽彲涓虹┖
-            public string NDTName { get; set; }
-
-            // NDTRName涓簄varchar(20)绫诲瀷锛屽彲涓虹┖
-            public string NDTRName { get; set; }
-
-            // RecordTableOptions涓簄varchar(100)绫诲瀷锛屽彲涓虹┖
-            public string RecordTableOptions { get; set; }
-
-            // ListType涓簄varchar(20)绫诲瀷锛屽彲涓虹┖
-            public string ListType { get; set; }
-
-            // TypeName涓簄varchar(20)绫诲瀷锛屽彲涓虹┖
-            public string TypeName { get; set; }
-
-            // SumTypeName涓簄varchar(20)绫诲瀷锛屽彲涓虹┖
-            public string SumTypeName { get; set; }
-
-            // Spec涓簄varchar(50)绫诲瀷锛屽彲涓虹┖
-            public string Spec { get; set; }
-
-        // last_modified涓簍imestamp绫诲瀷锛岄�氬父涓嶉渶瑕佸湪C#瀵硅薄涓樉寮忚〃绀�
-         //public byte[] last_modified { get; set; } // 濡傞渶澶勭悊骞跺彂锛岃鑰冭檻鍏朵粬鏂瑰紡锛屽ETag绛�
-
-        // ISupload涓篶har(1)绫诲瀷锛屽彲涓虹┖銆傚瓧娈靛悕涓殑"IS"搴旀敼涓哄皬鍐欑殑"is"浠ョ鍚圕#鍛藉悕瑙勮寖锛屼絾涓轰繚鎸佷竴鑷存�э紝杩欓噷淇濈暀鍘熸牱銆�
-        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/Controllers/MaterialsBasicsController.cs b/SGGL/WebAPI/Controllers/MaterialsBasicsController.cs
new file mode 100644
index 0000000..dd0f90f
--- /dev/null
+++ b/SGGL/WebAPI/Controllers/MaterialsBasicsController.cs
@@ -0,0 +1,230 @@
+锘縰sing Aspose.Words;
+using BLL;
+using Microsoft.Office.Interop.Excel;
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Net.NetworkInformation;
+using System.Web.Http;
+using static WebAPI.Controllers.HSSE.ImageRecognitionController;
+
+
+namespace WebAPI.Controllers
+{
+    /*
+     * 鐗╄祫绠＄悊鐨勪竴浜涘熀纭�淇℃伅
+     * **/
+    public class MaterialsBasicsController : ApiController
+    {
+        #region 鑾峰彇鍗曚綅鍒楄〃
+        public Model.ResponeData GetUnitList(string projectId, string keyWord = "" )
+        {
+            Model.ResponeData responeData = new Model.ResponeData();
+            try
+            {
+                if (string.IsNullOrEmpty(keyWord))
+                {
+                    keyWord = ""; // 鏄庣‘浣跨敤榛樿鍊�
+                }
+                var list = Funs.DB.Cl_b_unitapp.Where(x => x.ProjectId == projectId && x.UAName.Contains(keyWord)).ToList();
+                responeData.data = list;
+
+
+            }
+            catch (System.Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+        #endregion
+
+        #region 鑾峰彇涓撲笟
+        public Model.ResponeData getInstallationList(string projectId, string keyWord = "")
+        {
+            Model.ResponeData responeData = new Model.ResponeData();
+            try
+            {
+                if (string.IsNullOrEmpty(keyWord))
+                {
+                    keyWord = ""; // 鏄庣‘浣跨敤榛樿鍊�
+                }
+                responeData.data = Funs.DB.Cl_b_Installation.Where(x => x.ProjectId == projectId&&x.InstallationName.Contains(keyWord))
+                    .Select(x => new {
+                    x.InstallationId,
+                    x.InstallationCode,
+                    x.InstallationName,
+                }).ToList();
+            }
+            catch (System.Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+        #endregion
+
+        #region 鐗╄祫宸ュ尯
+        public Model.ResponeData getSpecialityList(string projectId, string keyWord = "")
+        {
+            Model.ResponeData responeData = new Model.ResponeData();
+            try
+            {
+                if (string.IsNullOrEmpty(keyWord))
+                {
+                    keyWord = ""; // 鏄庣‘浣跨敤榛樿鍊�
+                }
+                responeData.data = Funs.DB.CL_B_Speciality.Where(x => x.ProjectId == projectId && x.SpecialityName.Contains(keyWord))
+                    .Select(x => new {
+                        x.Specialityid,
+                        x.SpecialityCode,
+                        x.SpecialityName
+                    }).ToList();
+            }
+            catch (System.Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+        #endregion
+
+        #region 鑾峰彇鏉愭枡鏄庣粏
+        public Model.ResponeData GetMaterialsBySystemCode(string ProjectId, string InstallationId, string ghfs, string area, string code)
+        {
+            Model.ResponeData responeData = new Model.ResponeData();
+            try
+            {
+                string strSql = "SELECT cp.ProjectId,cp.InstallationId,zz.Installationname AS InstallationName,ghfs AS Ghfs,cp.MaterialID,MaterialName,specificationtype AS Specificationtype,MaterialQuality,standardspecification ,unit AS Unit," +
+               "technicalconditions AS TechnicalConditions,SystemCode,rtrim( ltrim( TAreaMaterialMID ) ) AS AreaCode,0.000 AS bcckl,SUM ( Aquantity ) AS Aquantity,SUM ( Pquantity ) AS jh_quantity,SUM ( SQuantity ) AS dj_quantity,SUM ( HQuantity ) AS hj_quantity,SUM ( Pquantity ) - SUM ( OQuantity ) AS ck_quantity,SUM ( RQuantity ) AS tk_quantity,(SELECT SUM( SQuantity ) - SUM ( OQuantity ) + SUM ( RQuantity ) - SUM ( HQuantity ) FROM cl_w_comp WHERE cl_w_comp.MaterialID= cp.MaterialID AND cl_w_comp.InstallationId= cp.InstallationId AND cl_w_comp.ghfs= cp.ghfs ) AS kc_quantity,ROW_NUMBER ( ) OVER ( ORDER BY zz.InstallationCode,SystemCode ASC ) AS RowNum,0 AS xz,0 AS xh FROM cl_w_comp cp LEFT JOIN CL_B_Material mt ON mt.MaterialID= cp.MaterialID LEFT JOIN cl_b_Installation zz ON zz.InstallationId= cp.InstallationId GROUP BY cp.ProjectId,cp.InstallationId,zz.InstallationCode,zz.Installationname,ghfs,cp.MaterialID,MaterialName,specificationtype,MaterialQuality,standardspecification,unit,technicalconditions,SystemCode,TAreaMaterialMID HAVING ";
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                strSql += "cp.ProjectId= @ProjectId AND cp.installationid= @InstallationId AND TAreaMaterialMID = @area AND ghfs = @ghfs AND  SystemCode = @code";
+                listStr.Add(new SqlParameter("@ProjectId", ProjectId));
+                listStr.Add(new SqlParameter("@InstallationId", InstallationId));
+                listStr.Add(new SqlParameter("@ghfs", ghfs));
+                listStr.Add(new SqlParameter("@area", area));
+                listStr.Add(new SqlParameter("@code", code));
+                SqlParameter[] parameter = listStr.ToArray();
+                System.Data.DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+                responeData.data = tb;
+                //responeData.data = (
+                //from bm in Funs.DB.CL_B_Material
+                //where bm.SystemCode == code && bm.ProjectId == ProjectId
+                //select new
+                //{
+                //    ProjectId = bm.ProjectId,                                       // 椤圭洰ID
+                //    InstallationId = Funs.DB.Cl_w_comp.FirstOrDefault(x => x.MaterialID == bm.MaterialID).InstallationId,                             // 涓撲笟ID
+                //    Installationname = Funs.DB.Cl_b_Installation.FirstOrDefault(x => x.InstallationId == Funs.DB.Cl_w_comp.FirstOrDefault(y => y.MaterialID == bm.MaterialID).InstallationId).InstallationName,                         // 涓撲笟鍚嶇О
+                //    ghfs = Funs.DB.Cl_w_comp.FirstOrDefault(x => x.MaterialID == bm.MaterialID).Ghfs,                                                 // 閲囪喘鏂圭被鍒�
+                //    MaterialID = bm.MaterialID,                                     // 鐗╄祫ID
+                //    MaterialName = bm.MaterialName,                                 // 鐗╄祫鍚嶇О
+                //    Specificationtype = bm.Specificationtype,                       // 瑙勬牸
+                //    TechnicalConditions = bm.TechnicalConditions,
+                //    StandardSpecification = bm.StandardSpecification,
+                //    MaterialQuality = bm.MaterialQuality,
+                //    Unit = bm.Unit,                                                 // 鍗曚綅
+                //    SystemCode = bm.SystemCode,                                     // 缂栧彿
+                //    AreaCode = Funs.DB.Cl_w_comp.FirstOrDefault(x => x.MaterialID == bm.MaterialID).TAreaMaterialMID,                                 // 宸ュ尯
+                //    jh_quantity = Funs.DB.Cl_w_comp.Where(c => c.MaterialID == bm.MaterialID).Sum(c => c.Pquantity),                                     // 璁″垝閲�
+                //    ck_quantity = Funs.DB.Cl_w_comp.Where(c => c.MaterialID == bm.MaterialID).Sum(c => c.Pquantity) - Funs.DB.Cl_w_comp.Where(x => x.MaterialID == bm.MaterialID).Sum(c => c.OQuantity),                      // 鏈�澶у厑璁稿嚭搴撻噺
+                //    kc_quantity = Funs.DB.Cl_w_comp.Where(x => x.MaterialID == bm.MaterialID).Sum(c => c.SQuantity) - Funs.DB.Cl_w_comp.Where(x => x.MaterialID == bm.MaterialID).Sum(c => c.OQuantity) + Funs.DB.Cl_w_comp.Where(x => x.MaterialID == bm.MaterialID).Sum(c => c.RQuantity) - Funs.DB.Cl_w_comp.Where(x => x.MaterialID == bm.MaterialID).Sum(c => c.HQuantity)  // 搴撳瓨閲�
+                //}
+                //).FirstOrDefault(x => x.SystemCode == code);
+
+
+            }
+            catch ( System.Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+        #endregion
+
+        #region 鑾峰彇鏉愭枡鍒楄〃
+        public Model.ResponeData GetMaterialsList(string ProjectId, string InstallationId, string ghfs, string area)
+        {
+            Model.ResponeData responeData = new Model.ResponeData();
+            try
+            {
+
+                string strSql = "SELECT cp.ProjectId,cp.InstallationId,zz.Installationname AS InstallationName,ghfs AS Ghfs,cp.MaterialID,MaterialName,specificationtype AS Specificationtype,MaterialQuality,standardspecification ,unit AS Unit," +
+                    "technicalconditions AS TechnicalConditions,SystemCode,";
+                if (!string.IsNullOrWhiteSpace(area))
+                {
+                    strSql += "rtrim( ltrim( TAreaMaterialMID ) ) AS AreaCode,";
+                }
+                strSql += "0.000 AS bcckl,SUM ( Aquantity ) AS Aquantity,SUM ( Pquantity ) AS jh_quantity,SUM ( SQuantity ) AS dj_quantity,SUM ( HQuantity ) AS hj_quantity,SUM ( Pquantity ) - SUM ( OQuantity ) AS ck_quantity,SUM ( RQuantity ) AS tk_quantity,(SELECT SUM( SQuantity ) - SUM ( OQuantity ) + SUM ( RQuantity ) - SUM ( HQuantity ) FROM cl_w_comp WHERE cl_w_comp.MaterialID= cp.MaterialID AND cl_w_comp.InstallationId= cp.InstallationId AND cl_w_comp.ghfs= cp.ghfs ) AS kc_quantity,ROW_NUMBER ( ) OVER ( ORDER BY zz.InstallationCode,SystemCode ASC ) AS RowNum,0 AS xz,0 AS xh FROM cl_w_comp cp LEFT JOIN CL_B_Material mt ON mt.MaterialID= cp.MaterialID LEFT JOIN cl_b_Installation zz ON zz.InstallationId= cp.InstallationId GROUP BY cp.ProjectId,cp.InstallationId,zz.InstallationCode,zz.Installationname,ghfs,cp.MaterialID,MaterialName,specificationtype,MaterialQuality,standardspecification,unit,technicalconditions,SystemCode";
+                if (!string.IsNullOrWhiteSpace(area))
+                {
+                    strSql += ", TAreaMaterialMID";
+                }
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                strSql += " HAVING cp.ProjectId= @ProjectId AND cp.installationid= @InstallationId AND ghfs = @ghfs";
+                listStr.Add(new SqlParameter("@ProjectId", ProjectId));
+                listStr.Add(new SqlParameter("@InstallationId", InstallationId));
+                listStr.Add(new SqlParameter("@ghfs", ghfs));
+                if (!string.IsNullOrWhiteSpace(area))
+                {
+                    strSql += " AND TAreaMaterialMID = @area ";
+                    listStr.Add(new SqlParameter("@area", area));
+                }
+                SqlParameter[] parameter = listStr.ToArray();
+                System.Data.DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+                responeData.data = tb;
+            }
+            catch (System.Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+        #endregion
+
+        #region 淇濆瓨鐗╄祫鏂囦欢
+        [HttpPost]
+        public Model.ResponeData UploadMaterialsFile(Model.Cl_file file)
+        {
+            Model.ResponeData responeData = new Model.ResponeData();
+            try
+            {
+                using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+                {
+                    int count = db.Cl_file.Count();
+                    Model.Cl_file new_file = new Model.Cl_file();
+                    new_file.FID = Guid.NewGuid().ToString();
+                    new_file.Ffl = file.Ffl;
+                    new_file.Fname = file.Fname;
+                    new_file.Fshm = file.Fshm;
+                    new_file.UserTime = DateTime.Now;
+                    new_file.UserID = file.UserID;
+                    new_file.Flj = file.Flj;
+                    new_file.Flx = file.Flx;
+                    new_file.Bz = file.Bz;
+                    new_file.InstallationId = file.InstallationId;
+                    new_file.Unid = file.Unid;
+                    new_file.ProjectId = file.ProjectId;
+                    db.Cl_file.InsertOnSubmit(new_file);
+                    db.SubmitChanges();
+                    responeData.message = new_file.FID;
+                }
+
+            }
+            catch(System.Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/WebAPI/Controllers/MaterialsExitController.cs b/SGGL/WebAPI/Controllers/MaterialsExitController.cs
new file mode 100644
index 0000000..2104dab
--- /dev/null
+++ b/SGGL/WebAPI/Controllers/MaterialsExitController.cs
@@ -0,0 +1,92 @@
+锘縰sing BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Diagnostics;
+using System.Linq;
+using System.Runtime.Remoting.Messaging;
+using System.Web.Http;
+using WebAPI.Helpers;
+
+namespace WebAPI.Controllers
+{
+
+    public class MaterialsExitController : ApiController
+    {
+        #region 娣诲姞鐗╄祫鍏ュ簱涓昏〃
+        [HttpPost]
+        public Model.ResponeData AddMaterialExitM(Model.Cl_W_MaterialStorageM exit)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+                {
+                    var userTime = DateTime.Now;
+                    int count = db.Cl_W_MaterialStorageM.Where(x => x.UserTime.Value.Year == userTime.Year && x.UserTime.Value.Month == userTime.Month && x.UserTime.Value.Day == userTime.Day).ToList().Count();
+
+                    Model.Cl_W_MaterialStorageM exitM = new Model.Cl_W_MaterialStorageM
+                    {
+                        StorageSheetMID = exit.StorageSheetMID,
+                        StorageSheetCode = string.Format("RKD--{0}{1}", DateTime.Now.ToString("yyyyMMdd"), count.ToString("000")),
+                        UserId = exit.UserId,
+                        UserTime = DateTime.Now,
+                        IsOk = "0", // 0-鏈鏍革紝1-宸插鏍�
+                        APid = exit.APid, // 閲囪喘鏂圭被鍒紙鐢蹭箼渚涳級
+                        Specialityid = exit.Specialityid, // 涓撲笟ID
+                        InstallationId = exit.InstallationId
+                    };
+                    exit.UserTime = DateTime.Now;
+                    exit.StorageSheetCode = string.Format("CKD--{0}{1}", DateTime.Now.ToString("yyyyMMdd"), count.ToString("000"));
+                    db.Cl_W_MaterialStorageM.InsertOnSubmit(exitM);
+                    db.SubmitChanges();
+                    responeData.data = exit;
+                }
+            }
+            catch (System.Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+        #endregion
+
+        #region 娣诲姞鐗╄祫鍏ュ簱 瀛�
+        [HttpPost]
+        public Model.ResponeData AddMaterialExitS(Model.Cl_W_MaterialStorageS s)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+                {
+                    Model.Cl_W_MaterialStorageS cws = new Model.Cl_W_MaterialStorageS();
+                    cws.SystemCode = s.SystemCode;
+                    cws.StorageQuantity = s.StorageQuantity; // 鍒拌揣鏁伴噺
+                    cws.TheoryWeight = s.TheoryWeight; // 鍗曚环
+                    cws.ActualWeight = s.ActualWeight; // 閲戦
+                    cws.RecordTableOptions = s.RecordTableOptions; // 澶囨敞璇存槑
+                    cws.Manufacturer = s.Manufacturer; // 鍒堕�犲巶瀹�
+                    cws.ProjectId = s.ProjectId;
+                    cws.StorageSheetMID = s.StorageSheetMID;
+                    cws.StorageSheetSID = Guid.NewGuid().ToString();
+                    cws.MaterialID = s.MaterialID;
+                    db.Cl_W_MaterialStorageS.InsertOnSubmit(cws);
+                    db.SubmitChanges();
+                    responeData.data = "娣诲姞鎴愬姛";
+                }
+            }
+            catch (System.Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+        #endregion
+
+    }
+
+}
\ No newline at end of file
diff --git a/SGGL/WebAPI/Controllers/MaterialsOutController.cs b/SGGL/WebAPI/Controllers/MaterialsOutController.cs
new file mode 100644
index 0000000..06f1e82
--- /dev/null
+++ b/SGGL/WebAPI/Controllers/MaterialsOutController.cs
@@ -0,0 +1,142 @@
+锘縰sing BLL;
+using Model;
+using System;
+using System.Linq;
+using System.Runtime.Remoting.Metadata.W3cXsd2001;
+using System.Web.Http;
+
+
+namespace WebAPI.Controllers
+{
+    /**
+     * 鐗╄祫鍑哄簱
+     */
+    public class MaterialsOutController : ApiController
+    {
+
+
+        #region 娣诲姞鐗╄祫鍑哄簱涓昏〃
+        [HttpPost]
+        public Model.ResponeData AddMaterialOutM(Model.Cl_W_MaterialOutM MaterialOutM)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+                {
+                    var userTime = DateTime.Now;
+                    int count = db.Cl_W_MaterialOutM.Where(x => x.UserTime.Value.Year == userTime.Year&&x.UserTime.Value.Month==userTime.Month&&x.UserTime.Value.Day==userTime.Day).ToList().Count();
+                    Model.Cl_W_MaterialOutM outm = new Model.Cl_W_MaterialOutM();
+                    
+                    outm.OutSheetMID = MaterialOutM.OutSheetMID;
+                    outm.ProjectId = MaterialOutM.ProjectId;
+                    outm.OutSheetCode = string.Format("CKD--{0}{1}", DateTime.Now.ToString("yyyyMMdd"),count.ToString("000"));
+                    outm.UserTime = DateTime.Now;
+                    outm.UnitId = MaterialOutM.UnitId;
+                    outm.UAid = MaterialOutM.UAid;
+                    outm.InstallationId = MaterialOutM.InstallationId;
+                    outm.PlanSheetMID = MaterialOutM.PlanSheetMID; // 宸ュ尯ID
+                    outm.YYPID = MaterialOutM.YYPID;
+                    outm.RecordMan = MaterialOutM.RecordMan;
+                    MaterialOutM.OutSheetCode = string.Format("CKD--{0}{1}", DateTime.Now.ToString("yyyyMMdd"), count.ToString("000"));
+                    db.Cl_W_MaterialOutM.InsertOnSubmit(outm);
+                    db.SubmitChanges();
+                    responeData.data = MaterialOutM;
+                }
+            }
+            catch (System.Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+        #endregion
+
+        #region 娣诲姞鐗╄祫瀛愯〃
+        [HttpPost]
+        public Model.ResponeData AddMaterialOutS(Model.Cl_W_MaterialOutS MaterialOutS)
+        {
+                    var responeData = new Model.ResponeData();
+            try
+            {
+                using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+                {
+                    int count = db.Cl_W_MaterialOutM.Where(x => x.UserTime == DateTime.Now).ToList().Count();
+                    Model.Cl_W_MaterialOutS outs = new Model.Cl_W_MaterialOutS();
+
+                    outs.ProjectId = MaterialOutS.ProjectId;
+                    outs.OutSheetMID = MaterialOutS.OutSheetMID;
+                    outs.OutSheetSID = Guid.NewGuid().ToString();
+                    outs.MaterialID = MaterialOutS.MaterialID;
+                    //outs.Soft = MaterialOutS.Soft ?? DBNull.Value;
+                    outs.PlannedQuantity = MaterialOutS.PlannedQuantity;
+                    outs.StoreQuantity = MaterialOutS.StoreQuantity;
+                    outs.OutQuantity = MaterialOutS.OutQuantity;
+                    outs.OutQuantityY = MaterialOutS.OutQuantityY;
+                    outs.StorePQuantity = MaterialOutS.StorePQuantity;
+                    outs.CertificatesFactoryNo = MaterialOutS.CertificatesFactoryNo;
+                    outs.FurnaceBatchNo = MaterialOutS.FurnaceBatchNo;
+                    outs.CertificateSelfNo = MaterialOutS.CertificateSelfNo;
+                    outs.Weight = MaterialOutS.Weight;
+                    outs.Price = MaterialOutS.Price;
+                    outs.OutQuantityP = MaterialOutS.OutQuantityP;
+                    outs.OutQuantityO = MaterialOutS.OutQuantityO;
+                    outs.StorehouseName = MaterialOutS.StorehouseName;
+                    outs.StorageSheetSID = MaterialOutS.StorageSheetSID;
+                    outs.FirstpartyCode = MaterialOutS.FirstpartyCode;
+                    outs.ISupload = MaterialOutS.ISupload;
+                    outs.InstallationId = MaterialOutS.InstallationId;
+                    outs.Shue = MaterialOutS.Shue;
+                    outs.Bhsje = MaterialOutS.Bhsje;
+     
+                    db.Cl_W_MaterialOutS.InsertOnSubmit(outs);
+                    Model.Cl_W_MaterialOutM clw = db.Cl_W_MaterialOutM.FirstOrDefault(x => x.OutSheetMID == MaterialOutS.OutSheetMID);
+                    if(clw.IsOk != "1")
+                    {
+                        clw.IsOk = "1";
+                    }
+
+                    db.SubmitChanges();
+
+                    Model.Cl_w_comp cl = new Model.Cl_w_comp();
+                    cl.CompID = Guid.NewGuid().ToString();
+                    cl.ProjectId = MaterialOutS.ProjectId;
+                    cl.InstallationId = clw.InstallationId;
+                    cl.Ghfs = clw.YYPID;
+                    cl.TAreaMaterialMID = MaterialOutS.FirstpartyCode;
+                    cl.TAreaMaterialSID = "";
+                    cl.MaterialID = MaterialOutS.MaterialID;
+                    cl.Aquantity = 0;
+                    cl.PlanSheetMID = "";
+                    cl.PlanSheetSID = "";
+                    cl.Pquantity = 0;
+                    cl.StorageSheetMID = "";
+                    cl.StorageSheetSID = "";
+                    cl.SQuantity = 0;
+                    cl.StorageHJSID = "";
+                    cl.StorageHJMID = "";
+                    cl.HQuantity = 0;
+                    cl.OutSheetMID = MaterialOutS.OutSheetMID;
+                    cl.OutSheetSID = outs.OutSheetSID;
+                    cl.OQuantity = MaterialOutS.OutQuantity;
+                    cl.ReturnSheetMid = "";
+                    cl.ReturnSheetSID = "";
+                    cl.RQuantity = 0;
+                  
+                    db.Cl_w_comp.InsertOnSubmit(cl);
+                    db.SubmitChanges();
+                    responeData.data = MaterialOutS.OutSheetSID;
+                }
+            }
+            catch (System.Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+        #endregion
+
+    }
+}
\ No newline at end of file
diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj
index 0479a3d..0ec8596 100644
--- a/SGGL/WebAPI/WebAPI.csproj
+++ b/SGGL/WebAPI/WebAPI.csproj
@@ -86,6 +86,7 @@
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Data.Entity" />
     <Reference Include="System.Data.Linq" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -175,7 +176,9 @@
     <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\MaterialsExitController.cs" />
+    <Compile Include="Controllers\MaterialsBasicsController.cs" />
+    <Compile Include="Controllers\MaterialsOutController.cs" />
     <Compile Include="Controllers\Person\PersonCheckController.cs" />
     <Compile Include="Controllers\CQMS\CheckEquipmentController.cs" />
     <Compile Include="Controllers\CQMS\CheckListController.cs" />
@@ -283,6 +286,8 @@
     <Folder Include="Models\" />
     <Folder Include="Properties\PublishProfiles\" />
     <Folder Include="Views\Login\" />
+    <Folder Include="Views\MaterialsBasics\" />
+    <Folder Include="Views\MaterialsOut\" />
     <Folder Include="Views\Vehicle\" />
   </ItemGroup>
   <ItemGroup>