111

HJGL_ZH/BLL/HJGL/HotHardManage/HJGL_CH_HardTestReportService.cs

@@ -236,6 +236,7 @@ namespace BLL
                 newCH_HardTestReport.STE_ID = cH_Trust.STE_ID;
                 newCH_HardTestReport.TrustName = cH_Trust.TrustName;
                 newCH_HardTestReport.ReportName = cH_Trust.ReportName;
+                newCH_HardTestReport.ExecStandard = cH_Trust.ExecStandard;
 
                 db.SubmitChanges();
             }
@@ -327,6 +328,7 @@ namespace BLL
             newTrustItem.HotProessTrustId = trustItem.HotProessTrustId;
             newTrustItem.Flag = trustItem.Flag;
             newTrustItem.IsShow = trustItem.IsShow;
+            newTrustItem.CheckDate = trustItem.CheckDate;
             db.HJGL_CH_HardTestReportItem.InsertOnSubmit(newTrustItem);
             db.SubmitChanges();
         }
@@ -346,6 +348,7 @@ namespace BLL
                 newItem.Remark = trustItem.Remark;
                 newItem.Flag = trustItem.Flag;
                 newItem.NewFlag = trustItem.NewFlag;
+                newItem.CheckDate = trustItem.CheckDate;
                 db.SubmitChanges();
             }
         }

HJGL_ZH/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs

@@ -1313,6 +1313,24 @@ namespace BLL
             return name;
         }
 
+        public static string ConvertJointCodeString(string jotIdList)
+        {
+            string name = string.Empty;
+            string[] list = jotIdList.Split(',');
+            foreach (var item in list)
+            {
+                if (!string.IsNullOrEmpty(item))
+                {
+                    name += GetJointInfoByJotID(item).JOT_JointNo + ",";
+                }
+            }
+            if (!string.IsNullOrEmpty(name))
+            {
+                name = name.Substring(0, name.LastIndexOf(","));
+            }
+            return name;
+        }
+
         /// <summary>
         /// 根据焊口号、管线ID、项目Id获取焊口信息
         /// </summary>

HJGL_ZH/BLL/WeldMat/Stock/StockInService.cs

@@ -196,6 +196,18 @@ namespace BLL
             }
         }
 
+        public static void WarrantybookSure(string stockInId, bool? isSure, string sureMan)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Weld_StockIn newStockIn = db.Weld_StockIn.FirstOrDefault(e => e.StockInId == stockInId);
+            if (newStockIn != null)
+            {
+                newStockIn.IsSure= isSure;
+                newStockIn.SureMan= sureMan;
+                db.SubmitChanges();
+            }
+        }
+
         /// <summary>
         /// 根据主键删除焊材入库
         /// </summary>