diff --git a/HJGL_DS/.vs/SGGL/v15/.suo b/HJGL_DS/.vs/SGGL/v15/.suo index 13bbb16..3fd62df 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 03ae05c..c6fb31e 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 f580f5b..e6b7f40 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 c1276ad..0402150 100644 --- a/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs +++ b/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs @@ -789,26 +789,29 @@ namespace BLL { newJointInfo.RT3_RepairFilmNum = newJointInfo.RT3_RepairFilmNum - 1; } - string[] strs = newJointInfo.RT3_RepairFilm.Split(','); - if (strs.Length == 1) + if (!string.IsNullOrEmpty(newJointInfo.RT3_RepairFilm)) { - newJointInfo.RT3_RepairFilm = null; - } - else - { - string str = string.Empty; - foreach (var item in strs) + string[] strs = newJointInfo.RT3_RepairFilm.Split(','); + if (strs.Length == 1) { - if (item != filmNum) + newJointInfo.RT3_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.RT3_RepairFilm = str; } - if (!string.IsNullOrEmpty(str)) - { - str = str.Substring(0, str.LastIndexOf(",")); - } - newJointInfo.RT3_RepairFilm = str; } newJointInfo.HardResultDate = DateTime.Now; db.SubmitChanges(); diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index 97d6b43..bf404b8 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -11,7 +11,7 @@ - +