1、移除"已与服务器失联"关键字，会导致核价重新登陆

2、新增主规格保存检测副规格是否已审核

JLHHJSvr/Helper/MattressHelper.cs

@@ -3012,6 +3012,12 @@ namespace JLHHJSvr.Helper
 
             var existing = GetMattressSubspecs(mattress.mattressid, "mattressid") ?? new List<u_mattress>();
 
+            foreach (var child in existing)
+            {
+                if (child.flag == 1) throw new LJCommonException($"存在副规格[{child.mattresscode}]已财务审核，无法修改主规格!");
+                if (child.js1_flag == 1) throw new LJCommonException($"存在副规格[{child.mattresscode}]已产品审核，无法修改主规格!");
+            }
+
             var oldIdSet = new HashSet<int>(existing.Select(x => x.mattressid));
             var newIdSet = new HashSet<int>(mattress.subspecsList.Where(x => x.mattressid != 0).Select(x => x.mattressid));
             var toUpdate = mattress.subspecsList.Where(x => oldIdSet.Contains(x.mattressid)).ToList();

JLHWEB/src/utils/index.ts

@@ -786,7 +786,9 @@ export const setDateToDiff = (data: any) => {
  * @returns {Boolean}
  */
 export const ifErrorToLogin = (err: any) => {
-  return err.indexOf("会话") >= 0 || err.indexOf("已与服务器失联") >= 0 || err.indexOf("找不到网络路径") >= 0;
+  // 移除"已与服务器失联"关键字，只有L1失联会出现，会导致核价需要重新登陆
+  // return err.indexOf("会话") >= 0 || err.indexOf("已与服务器失联") >= 0 || err.indexOf("找不到网络路径") >= 0;
+  return err.indexOf("会话") >= 0 || err.indexOf("找不到网络路径") >= 0;
 };
 
 /**