From 76fd3e6c367a96d182c222416e6e48235e082603 Mon Sep 17 00:00:00 2001 From: liuyunfeng Date: Wed, 22 Nov 2023 17:32:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BA=BF=E8=B6=85=E6=97=B6?= =?UTF-8?q?=E6=8F=90=E9=86=92=20bug=EF=BC=8C=20=E5=85=B6=E5=AE=83bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MsgCheck/BillM100s/BillM100AppService.cs | 11 ++++++++--- .../PrintTable/WaitPrintAppService.cs | 7 ++++--- vue/src/router/index.js | 4 ++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgCheck/BillM100s/BillM100AppService.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgCheck/BillM100s/BillM100AppService.cs index 787420b..afce8a1 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgCheck/BillM100s/BillM100AppService.cs +++ b/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); - WaitPrint lastitem = await _waitPrintRepository.FirstOrDefaultAsync(itm => itm.ProductLine == plStr && itm.HostSN2 == maxSN2); + var qry = _waitPrintRepository.Where(itm => itm.ProductLine == plStr); + 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) diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs index 5455b89..105bf69 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs +++ b/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 ToRec = input.SkipCount + input.MaxResultCount; + int skipNum = input.SkipCount; + int takeNum = input.MaxResultCount; + + var lst = await GetEntityListFromToAsync("FisWaitPrint", where, "HostSN2", skipNum, takeNum); - var lst = await GetEntityListFromToAsync("FisWaitPrint", where, "HostSN2", fromRec, ToRec); ret.Items = lst; return ret; } diff --git a/vue/src/router/index.js b/vue/src/router/index.js index 7753e71..012c1f6 100644 --- a/vue/src/router/index.js +++ b/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 }, {