提交代码

HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs

@@ -714,26 +714,29 @@ namespace BLL
                 {
                     newJointInfo.RT2_RepairFilmNum = newJointInfo.RT2_RepairFilmNum - 1;
                 }
-                string[] strs = newJointInfo.RT2_RepairFilm.Split(',');
+                if (!string.IsNullOrEmpty(newJointInfo.RT2_RepairFilm))
-                if (strs.Length == 1)
                 {
-                    newJointInfo.RT2_RepairFilm = null;
+                    string[] strs = newJointInfo.RT2_RepairFilm.Split(',');
-                }
+                    if (strs.Length == 1)
-                else
-                {
-                    string str = string.Empty;
-                    foreach (var item in strs)
                     {
-                        if (item != filmNum)
+                        newJointInfo.RT2_RepairFilm = null;
+                    }
+                    else
+                    {
+                        string str = string.Empty;
+                        foreach (var item in strs)
                         {
-                            str += item + ",";
+                            if (item != filmNum)
+                            {
+                                str += item + ",";
+                            }
                         }
+                        if (!string.IsNullOrEmpty(str))
+                        {
+                            str = str.Substring(0, str.LastIndexOf(","));
+                        }
+                        newJointInfo.RT2_RepairFilm = str;
                     }
-                    if (!string.IsNullOrEmpty(str))
-                    {
-                        str = str.Substring(0, str.LastIndexOf(","));
-                    }
-                    newJointInfo.RT2_RepairFilm = str;
                 }
                 newJointInfo.HardResultDate = DateTime.Now;
                 db.SubmitChanges();

HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user

@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />

HJGL_DS/FineUIPro.Web/Web.config

@@ -50,7 +50,7 @@
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
       <add path="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport"/>
     </httpHandlers>
-    <compilation debug="false" targetFramework="4.6.1">
+    <compilation debug="true" targetFramework="4.6.1">
       <assemblies>
         <add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
       </assemblies>

HJGL_DS/WebAPI/WebAPI.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />