合并最新

SGGL/BLL/HJGL/CheckManage/CheckItemManageService.cs

@@ -30,7 +30,15 @@ namespace BLL
         {
             return Funs.DB.View_CH_CheckItem.FirstOrDefault(e => e.JOT_ID == jotId);
         }
+        public static Model.View_CH_CheckItem GetNoCheckViewCheckItemByJOTID(string jotId)
+        {
+            return Funs.DB.View_CH_CheckItem.FirstOrDefault(e => e.JOT_ID == jotId && e.CHT_CheckID == null);
+        }
 
+        public static Model.View_CH_CheckItem GetNoCheckViewCheckItemByJOTID(string jotId, string CH_TrustID)
+        {
+            return Funs.DB.View_CH_CheckItem.FirstOrDefault(e => e.JOT_ID == jotId && e.CH_TrustID == CH_TrustID);
+        }
         /// <summary>
         /// 根据焊口ID获取检测明细信息
         /// </summary>
@@ -78,7 +86,10 @@ namespace BLL
             newCheckItem.CHT_FloorWelder2 = checkItem.CHT_FloorWelder2;
             newCheckItem.FilmSpecifications = checkItem.FilmSpecifications;
             newCheckItem.DefectLength = checkItem.DefectLength;
+            newCheckItem.DefectDepth = checkItem.DefectDepth;
+            newCheckItem.DefectHeight = checkItem.DefectHeight;
             newCheckItem.ExtendingRice = checkItem.ExtendingRice;
+            newCheckItem.Defects_Definition = checkItem.Defects_Definition;
 
             Funs.DB.CH_CheckItem.InsertOnSubmit(newCheckItem);
             Funs.DB.SubmitChanges();
@@ -208,6 +219,10 @@ namespace BLL
         {
             return Funs.DB.CH_CheckItem.FirstOrDefault(e => e.JOT_ID == jotId);
         }
+        public static Model.CH_CheckItem GetCheckItemByJotId(string jotId, string checkId)
+        {
+            return Funs.DB.CH_CheckItem.FirstOrDefault(e => e.JOT_ID == jotId && e.CHT_CheckID == checkId);
+        }
 
         /// <summary>
         /// 根据检测id获取明细视图

SGGL/BLL/HJGL/CheckManage/CheckManageService.cs

@@ -9,7 +9,7 @@ namespace BLL
     /// <summary>
     /// 检测主表
     /// </summary>
-   public class CheckManageService
+    public class CheckManageService
     {
         /// <summary>
         /// 根据检测Id获取检测信息
@@ -229,7 +229,5 @@ namespace BLL
         {
             return Funs.DB.CH_Check.FirstOrDefault(e => e.CHT_CheckCode == checkCode);
         }
-
-        
     }
 }