Merge branch 'master' of http://47.104.102.122:3000/lpf/SGGL_SHJ

SGGL/BLL/HJGL/BaseInfo/Base_DetectionTypeService.cs

@@ -100,6 +100,20 @@
             return list;
         }
 
+        /// <summary>
+        /// 按类型获取探伤类型项
+        /// </summary>
+        /// <param name="DetectionTypeType"></param>
+        /// <returns></returns>
+        public static List<Model.Base_DetectionType> GetDetectionTypeListByDetectionTypeType2(string[] strs)
+        {
+            var list = (from x in Funs.DB.Base_DetectionType
+                        where strs.Contains(x.DetectionTypeCode) && !x.DetectionTypeCode.Contains("/")
+                        orderby x.DetectionTypeCode
+                        select x).ToList();
+            return list;
+        }
+
         #region 探伤类型下拉项
         /// <summary>
         /// 探伤类型下拉项

SGGL/BLL/HJGL/PointTrust/Batch_BatchTrustService.cs

@@ -10,9 +10,9 @@ namespace BLL
         /// <summary>
         /// 根据点口批编号生成委托单号，在流水号前追加日期段。
         /// </summary>
-        public static string BuildTrustBatchCode(string pointBatchCode, System.DateTime trustDate)
+        public static string BuildTrustBatchCode(string pointBatchCode, System.DateTime trustDate, string typeStr1, string typeStr2)
         {
-            string trustBatchCode = (pointBatchCode ?? string.Empty).Replace("-DK-", "-WT-");
+            string trustBatchCode = (pointBatchCode ?? string.Empty).Replace("-DK-", "-WT-").Replace(typeStr1, typeStr2);
             return InsertDateBeforeSerial(trustBatchCode, trustDate);
         }
 

SGGL/BLL/HJGL/PointTrust/PointBatchDetailService.cs

@@ -64,6 +64,7 @@ namespace BLL
                 newBatchDetail.IsBuildTrust = batchDetail.IsBuildTrust;
                 newBatchDetail.IsWelderFirst = batchDetail.IsWelderFirst;
                 newBatchDetail.IsPipelineFirst = batchDetail.IsPipelineFirst;
+                newBatchDetail.NDT = batchDetail.NDT;
                 newBatchDetail.Remark = batchDetail.Remark;
 
                 Funs.DB.SubmitChanges();