diff --git a/HJGL_DS/.vs/SGGL/v15/.suo b/HJGL_DS/.vs/SGGL/v15/.suo index 3fd62df..10d7d15 100644 Binary files a/HJGL_DS/.vs/SGGL/v15/.suo and b/HJGL_DS/.vs/SGGL/v15/.suo differ diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide index c6fb31e..b8d63c0 100644 Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide differ diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal index e6b7f40..2df811f 100644 Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal differ diff --git a/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs b/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs index 0402150..f9fb7a2 100644 --- a/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs +++ b/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 (strs.Length == 1) + if (!string.IsNullOrEmpty(newJointInfo.RT2_RepairFilm)) { - newJointInfo.RT2_RepairFilm = null; - } - else - { - string str = string.Empty; - foreach (var item in strs) + string[] strs = newJointInfo.RT2_RepairFilm.Split(','); + if (strs.Length == 1) { - 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(); diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user index 8aa7c11..bf54086 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -2,7 +2,7 @@ true - Release|Any CPU + Debug|Any CPU diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index bf404b8..ede14f6 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -50,7 +50,7 @@ - + diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user index 28be9c4..a48b337 100644 --- a/HJGL_DS/WebAPI/WebAPI.csproj.user +++ b/HJGL_DS/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU FolderProfile true