桌位页面锁定桌位相关被预订的时候，提醒选中的桌子已经被预订

@@ -783,7 +783,21 @@ class TableManagerModel with ChangeNotifier {
             ///
             ///
             if (showMsg && selectTables.length > 0) {
             if (showMsg && selectTables.length > 0) {
               for (t.Table item in selectTables) {
               for (t.Table item in selectTables) {
-                if (item.id == tid) {
+                // if (item.isMerge == '1') {
+                //   //  (tids.contains(item.tids))
+                //   List<String> mergetids = item.tids.split(',');
+                //   outerloop:
+                //   for (int i = 0; i < mergetids.length; i++) {
+                //     String mergetid = mergetids[i];
+                //     if (tids.contains(mergetid)) {
+                //       msg += '${item.name},';
+                //       tempSelectTables.remove(item);
+                //       break outerloop;
+                //     }
+                //   }
+                // }
+                if (item.id == tid ||
+                    (item.isLock == '1' && (tids.contains(item.lockTid)))) {
                   msg += '${item.name},';
                   msg += '${item.name},';
                   tempSelectTables.remove(item);
                   tempSelectTables.remove(item);
                 }
                 }
@@ -791,6 +805,27 @@ class TableManagerModel with ChangeNotifier {
             }
             }
           }
           }
         }
         }
+        if (showMsg && selectTables.length > 0 && notebook.status == "1" ||
+            notebook.status == "2" ||
+            notebook.status == "5" ||
+            notebook.status == "10") {
+          outerloop:
+          for (t.Table item in selectTables) {
+            if (item.isMerge == '1') {
+              //  (tids.contains(item.tids))
+              List<String> mergetids = item.tids.split(',');
+
+              for (int i = 0; i < mergetids.length; i++) {
+                String mergetid = mergetids[i];
+                if (tids.contains(mergetid)) {
+                  msg += '${item.name},';
+                  tempSelectTables.remove(item);
+                  break outerloop;
+                }
+              }
+            }
+          }
+        }
       }
       }
       if (showMsg && msg != '' && selectTables.length > 0) {
       if (showMsg && msg != '' && selectTables.length > 0) {
         if (msg.endsWith(',')) {
         if (msg.endsWith(',')) {