diff --git a/HJGL/.vs/HJGL/config/applicationhost.config b/HJGL/.vs/HJGL/config/applicationhost.config
index e47cfd0..1963de0 100644
--- a/HJGL/.vs/HJGL/config/applicationhost.config
+++ b/HJGL/.vs/HJGL/config/applicationhost.config
@@ -162,7 +162,7 @@
             </site>
             <site name="WebApi" id="2">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="E:\湛江巴斯夫\Basf_TCC7\HJGL\WebApi" />
+                    <virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\WebApi" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:3862:localhost" />
@@ -250,7 +250,7 @@
             </site>
             <site name="FineUIPro.Web(10)" id="13">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="E:\湛江巴斯夫\Basf_TCC7\HJGL\FineUIPro.Web" />
+                    <virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\FineUIPro.Web" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:13960:localhost" />
diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo
index c0ab7c7..6a19268 100644
Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ
diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user
index 0baedd9..8d0cdf2 100644
--- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectView>ProjectFiles</ProjectView>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
diff --git a/HJGL/FineUIPro.Web/Web.config b/HJGL/FineUIPro.Web/Web.config
index 9ecdad1..baa8804 100644
--- a/HJGL/FineUIPro.Web/Web.config
+++ b/HJGL/FineUIPro.Web/Web.config
@@ -9,7 +9,7 @@
     <section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
   </configSections>
   <connectionStrings>
-    <add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=Sh@nghai9;"/>
+    <add name="HJGLDBConnectionString" connectionString="Data Source=.\sql2016;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=1111;"/>
     <!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB;Integrated Security=True"
       providerName="System.Data.SqlClient" />-->
   </connectionStrings>
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx.cs
index b5f0b20..6cb9eb9 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx.cs
@@ -734,15 +734,15 @@ namespace FineUIPro.Web.CheckManage
             var jointInfo = db.Pipeline_WeldJoint.FirstOrDefault(x => x.WeldJointId == pointBatchItem.WeldJointId);
 
             int k_num = 0;
-            string jot = "K1";
-            int indexK = jointInfo.WeldJointCode.LastIndexOf("K");
+            string jot = "EX1";
+            int indexK = jointInfo.WeldJointCode.LastIndexOf("EX");
 
             if (indexK > 0)
             {
                 try
                 {
                     k_num = Convert.ToInt32(jointInfo.WeldJointCode.Substring(indexK + 1, 1)) + 1;
-                    jot = "K" + k_num.ToString();
+                    jot = "EX" + k_num.ToString();
                 }
                 catch { }
             }
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs
index a650b26..f69a03a 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs
@@ -573,19 +573,19 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
                         if (exp != null)
                         {
                             string exportTrustCode = string.Empty;
-                            if (repairRecord.RepairRecordCode.Substring(repairRecord.RepairRecordCode.Length - 4) == "K1R2")
+                            if (repairRecord.RepairRecordCode.Substring(repairRecord.RepairRecordCode.Length - 5) == "EX1R2")
                             {
-                                exportTrustCode = repairRecord.RepairRecordCode.Substring(0, repairRecord.RepairRecordCode.Length - 4) + "K2R2";
+                                exportTrustCode = repairRecord.RepairRecordCode.Substring(0, repairRecord.RepairRecordCode.Length - 4) + "EX2R2";
                             }
                             else
                             {
-                                if (repairRecord.RepairRecordCode.Substring(repairRecord.RepairRecordCode.Length - 4) == "K1R1")
+                                if (repairRecord.RepairRecordCode.Substring(repairRecord.RepairRecordCode.Length - 5) == "EX1R1")
                                 {
-                                    exportTrustCode = repairRecord.RepairRecordCode.Substring(0, repairRecord.RepairRecordCode.Length - 4) + "K2";
+                                    exportTrustCode = repairRecord.RepairRecordCode.Substring(0, repairRecord.RepairRecordCode.Length - 4) + "EX2";
                                 }
                                 else
                                 {
-                                    exportTrustCode = repairRecord.RepairRecordCode.Substring(0, repairRecord.RepairRecordCode.Length - 2) + "K1";
+                                    exportTrustCode = repairRecord.RepairRecordCode.Substring(0, repairRecord.RepairRecordCode.Length - 2) + "EX1";
                                 }
                             }
                             
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairNotice.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairNotice.aspx.cs
index 3af7183..58ef0cc 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairNotice.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairNotice.aspx.cs
@@ -71,16 +71,17 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
                 }
                 else
                 {
-                    if (code.Substring(code.Length - 2, 1) == "K")
+                    if (code.Substring(code.Length - 3, 2) == "EX")
                     {
-                        newItem.RepairRecordCode = q.TrustBatchCode.Substring(0, code.Length - 2) + "-" + q.WeldJointCode + "K1R1";
+                        newItem.RepairRecordCode = q.TrustBatchCode.Substring(0, code.Length - 3) + "-" + q.WeldJointCode + "EX1R1";
                     }
                     else
                     {
-                        if (q.JudgeGrade == "修磨" || q.JudgeGrade == "异物")
+                        if (q.Remark.Contains("修磨"))
                         {
-                            newItem.RepairRecordCode = q.TrustBatchCode + "-" + q.WeldJointCode + "M1";
+                            newItem.RepairRecordCode = q.TrustBatchCode + "-" + q.WeldJointCode + "P1";
                         }
+                        
                         else
                         {
                             newItem.RepairRecordCode = q.TrustBatchCode + "-" + q.WeldJointCode + "R1";
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs
index c8afdf3..8c52f9c 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs
@@ -1272,7 +1272,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                     pointBatchItem.CutDate = System.DateTime.Now;////更新批明细 切除日期
                     Funs.DB.SubmitChanges();
 
-                    BLL.Batch_PointBatchService.UpdateNewKuoOrCutJointNo(pointBatchItem.PointBatchItemId, "C");
+                    BLL.Batch_PointBatchService.UpdateNewKuoOrCutJointNo(pointBatchItem.PointBatchItemId, "C1");
                     // 更新批 是否委托：否
                     var updatePointBatch = BLL.Batch_PointBatchService.GetPointBatchById(this.PointBatchId);
                     if (updatePointBatch != null)
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/SelectExpandPoint.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/SelectExpandPoint.aspx.cs
index 780539f..0e86dfa 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/SelectExpandPoint.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/SelectExpandPoint.aspx.cs
@@ -162,7 +162,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                             db.SubmitChanges(); ////更新批明细 返修日期 状态
 
                             int k_num = 0;
-                            string jot = "K1";
+                            string jot = "EX1";
 
                             Model.Pipeline_WeldJoint jointInfo = null;
                             if (!String.IsNullOrEmpty(weldJointId))
@@ -178,13 +178,13 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                                 }
                             }
 
-                            int indexK = jointInfo.WeldJointCode.LastIndexOf("K");
+                            int indexK = jointInfo.WeldJointCode.LastIndexOf("EX");
                             if (indexK > 0)
                             {
                                 try
                                 {
                                     k_num = Convert.ToInt32(jointInfo.WeldJointCode.Substring(indexK + 1, 1)) + 1;
-                                    jot = "K" + k_num.ToString();
+                                    jot = "EX" + k_num.ToString();
                                 }
                                 catch { }
                             }
diff --git a/HJGL/WebApi/WebApi.csproj.user b/HJGL/WebApi/WebApi.csproj.user
index 33091aa..6db81e9 100644
--- a/HJGL/WebApi/WebApi.csproj.user
+++ b/HJGL/WebApi/WebApi.csproj.user
@@ -8,7 +8,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
   </PropertyGroup>
   <ProjectExtensions>