生产线超时提醒 bug， 其它bug

src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgCheck/BillM100s/BillM100AppService.cs

@@ -2201,11 +2201,16 @@ select * from
                 retObj.ProductLine = plStr;
                 retObj.ConfigMinutes = _configuration[$"ConfigDic:ProductLineTimeoutRemind_New:{plStr}"].TryToInt() ?? 30;
 
-                int maxSN2= await _waitPrintRepository.Where(itm => itm.ProductLine == plStr).MaxAsync(itm => itm.HostSN2);
+                var qry = _waitPrintRepository.Where(itm => itm.ProductLine == plStr);
-                WaitPrint lastitem = await _waitPrintRepository.FirstOrDefaultAsync(itm => itm.ProductLine == plStr && itm.HostSN2 == maxSN2);
+                bool hasData = await qry.AnyAsync();
+
                 var cache = _timeoutCacheList.FirstOrDefault(itm => itm.ProductLine == plStr);
-                if (lastitem != null) //未打印表有数据
+                if (hasData) //未打印表有数据
                 {
+                    int maxSN2 = await qry.MaxAsync(itm => itm.HostSN2);
+                    WaitPrint lastitem = await _waitPrintRepository.FirstOrDefaultAsync(itm => itm.ProductLine == plStr && itm.HostSN2 == maxSN2);
+
+
                     retObj.LastReceiveTime = lastitem.ReceiveTime ?? ServerHelper.CurrentDateTime;
                     retObj.TimeoutMinutes = MinuteDiff(retObj.LastReceiveTime, ServerHelper.CurrentDateTime);
                     if (cache != null)

src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs

@@ -1248,10 +1248,11 @@ namespace WY.NewJit.PrintTable
                 ret.TotalCount = await GetEntityCountAsync("FisWaitPrint", where);
 
                 //计算分页
-                int fromRec = input.SkipCount;
+                int skipNum = input.SkipCount;
-                int ToRec = input.SkipCount + input.MaxResultCount;
+                int takeNum = input.MaxResultCount;
+
+                var lst = await GetEntityListFromToAsync<WaitPrintDto>("FisWaitPrint", where, "HostSN2", skipNum, takeNum);
 
-                var lst = await GetEntityListFromToAsync<WaitPrintDto>("FisWaitPrint", where, "HostSN2", fromRec, ToRec);
                 ret.Items = lst;
                 return ret;
             }

vue/src/router/index.js

@@ -64,10 +64,10 @@ export const constantRoutes = [
   },
   {
     path: '/login',
-    //component: () => import('@/views/login/index'),
+    component: () => import('@/views/login/index'),
 	  //component: () => import('@/views/pg-fis/basedate/partSwitch'), //?? one
 	  //component: () => import('@/views/pg-fis/basedate/assemblyCfg'), //?? one
-	  component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
+	  //component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
     hidden: true
   },
   {