Merge branch 'master' of http://dev.ccwin-in.com:3000/zhibinlv/FIS1.5

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)

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

@@ -1251,10 +1251,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<WaitPrintDto>("FisWaitPrint", where, "HostSN2", skipNum, takeNum);
 
-                var lst = await GetEntityListFromToAsync<WaitPrintDto>("FisWaitPrint", where, "HostSN2", fromRec, ToRec);
                 ret.Items = lst;
                 return ret;
             }

src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleSyncToWms/Services/WmsSyncService.cs

@@ -169,7 +169,7 @@ namespace WY.NewJit.Job.ConsoleWmsSync.Services
             int cnt = 0;
             try
             {
-                int interval = _configuration["ConfigDic:MyTimer:IntervalInSeconds"].TryToInt() ?? 100;
+                int intervalInSeconds = _configuration["ConfigDic:MyTimer:IntervalInSeconds"].TryToInt() ?? 60;
 
                 //取待报废单据
                 List<string> scrapBillNumLst = await _tbBillScrapRepository.Where(itm => itm.IsExecute == false).Select(itm => itm.BillNum).ToListAsync();
@@ -226,7 +226,7 @@ namespace WY.NewJit.Job.ConsoleWmsSync.Services
                 }
                 else
                 {
-                    Thread.Sleep(interval * 1000);
+                    Thread.Sleep(intervalInSeconds * 1000);
                 }
             }
             catch (Exception ex)

src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleSyncToWms/appsettings.json

@@ -9,7 +9,7 @@
     "TakeCountPerTime": 10,
     "MyTimer": {
       "IsStop": false,
-      "IntervalInSeconds": 3600 //10
+      "IntervalInSeconds": 10
     }
   },
 
@@ -17,12 +17,12 @@
     //"Default": "Server=192.168.0.140;Database=NewJitPG_TEST_20230703;uid=sa;pwd=Microsoft2008;",
     //"ABP": "Server=192.168.0.140;Database=ABP;User ID=sa;Password=Microsoft2008;",
     //"WMS": "Server=192.168.0.140;Database=CPAT_WMS_TEST;User ID=sa;Password=Microsoft2008;"
-    //"Default": "Server=dev.ccwin-in.com,6208;Database=NewJitPG_15;uid=sa;pwd=ChangkeTec@2021;",
-    //"ABP": "Server=dev.ccwin-in.com,6208;Database=ABP;User ID=sa;Password=ChangkeTec@2021;",
-    //"WMS": "Server=dev.ccwin-in.com,6208;Database=CPAT_WMS;User ID=sa;Password=ChangkeTec@2021;"
-    "Default": "Server=192.168.0.228;Database=NewJitPG_15;uid=sa;pwd=ChangkeTec@2021;",
-    "ABP": "Server=192.168.0.228;Database=ABP;User ID=sa;Password=ChangkeTec@2021;",
-    "WMS": "Server=192.168.0.228;Database=CPAT_WMS;User ID=sa;Password=ChangkeTec@2021;"
+    "Default": "Server=dev.ccwin-in.com,6208;Database=NewJitPG_15;uid=sa;pwd=ChangkeTec@2021;",
+    "ABP": "Server=dev.ccwin-in.com,6208;Database=ABP;User ID=sa;Password=ChangkeTec@2021;",
+    "WMS": "Server=dev.ccwin-in.com,6208;Database=CPAT_WMS;User ID=sa;Password=ChangkeTec@2021;"
+    //"Default": "Server=192.168.0.228;Database=NewJitPG_15;uid=sa;pwd=ChangkeTec@2021;",
+    //"ABP": "Server=192.168.0.228;Database=ABP;User ID=sa;Password=ChangkeTec@2021;",
+    //"WMS": "Server=192.168.0.228;Database=CPAT_WMS;User ID=sa;Password=ChangkeTec@2021;"
 
   },
 

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
   },
   {