From f95ca89c0f7bbd2f2bad6f8b28661fc4857ade30 Mon Sep 17 00:00:00 2001 From: icewint Date: Sun, 27 Oct 2024 22:11:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=A7=E5=B1=8F=E5=8F=8D?= =?UTF-8?q?=E9=A6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WcsMain/DataBase/Dao/AppErrRecorDao.cs | 1 + WcsMain/DataBase/Dao/AppWmsTaskDao.cs | 2 +- WcsMain/Properties/PublishProfiles/FolderProfile.pubxml.user | 2 +- WcsMain/appsettings.json | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/WcsMain/DataBase/Dao/AppErrRecorDao.cs b/WcsMain/DataBase/Dao/AppErrRecorDao.cs index 9afb6d1..18f66ba 100644 --- a/WcsMain/DataBase/Dao/AppErrRecorDao.cs +++ b/WcsMain/DataBase/Dao/AppErrRecorDao.cs @@ -77,6 +77,7 @@ public class AppErrRecorDao var sqlFuc = CommonTool.DbServe.Queryable() .LeftJoin((r, b) => r.ErrNo == b.ErrNo) .Where(r => r.CreateTime > DateTime.Now.AddMonths(-1)) + .OrderByDescending(r => r.CreateTime) .Select((r, b) => new AppErrorRecordJoin { diff --git a/WcsMain/DataBase/Dao/AppWmsTaskDao.cs b/WcsMain/DataBase/Dao/AppWmsTaskDao.cs index 0f453db..aac89a0 100644 --- a/WcsMain/DataBase/Dao/AppWmsTaskDao.cs +++ b/WcsMain/DataBase/Dao/AppWmsTaskDao.cs @@ -270,7 +270,7 @@ public class AppWmsTaskDao try { var sqlFuc = CommonTool.DbServe.Queryable() - .Where(w => w.CreateTime> DateTime.Now.AddHours(-1)) + .Where(w => w.CreateTime> DateTime.Now.AddHours(-1) && w.TaskStatus == (int)WmsTaskStatusEnum.complete) .ToList(); return sqlFuc; } diff --git a/WcsMain/Properties/PublishProfiles/FolderProfile.pubxml.user b/WcsMain/Properties/PublishProfiles/FolderProfile.pubxml.user index 34316f5..d753398 100644 --- a/WcsMain/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/WcsMain/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>F:\A开发项目\A菲达宝开项目\2024-05_苏州卡特\应用程序\WcsService\WcsMain\bin\Release\net8.0\publish\ - True|2024-09-06T08:18:45.0903975Z||;True|2024-09-06T13:30:31.9024648+08:00||;True|2024-09-06T13:07:27.3235992+08:00||;True|2024-08-28T15:48:21.8213718+08:00||;True|2024-08-28T14:10:05.4634419+08:00||;True|2024-08-15T11:33:38.2722633+08:00||;True|2024-08-15T10:25:38.1970709+08:00||;True|2024-08-15T09:10:35.3249477+08:00||;True|2024-08-15T08:54:49.3636124+08:00||;True|2024-08-14T10:23:19.0348163+08:00||;True|2024-08-07T10:16:37.1827604+08:00||;True|2024-03-29T15:42:25.2332590+08:00||;False|2024-03-29T15:41:29.1754215+08:00||;True|2024-03-29T15:21:55.1373612+08:00||;True|2024-03-28T09:54:32.8968372+08:00||;True|2024-01-28T15:05:36.1055501+08:00||;True|2024-01-28T15:02:06.6945727+08:00||;True|2024-01-28T14:56:23.0500171+08:00||;True|2024-01-20T20:29:00.5459863+08:00||; + True|2024-10-23T09:39:34.7555503Z||;True|2024-10-23T07:48:54.8341411+08:00||;True|2024-10-22T10:55:30.7912605+08:00||;True|2024-10-22T10:34:49.3123361+08:00||;True|2024-09-06T16:18:45.0903975+08:00||;True|2024-09-06T13:30:31.9024648+08:00||;True|2024-09-06T13:07:27.3235992+08:00||;True|2024-08-28T15:48:21.8213718+08:00||;True|2024-08-28T14:10:05.4634419+08:00||;True|2024-08-15T11:33:38.2722633+08:00||;True|2024-08-15T10:25:38.1970709+08:00||;True|2024-08-15T09:10:35.3249477+08:00||;True|2024-08-15T08:54:49.3636124+08:00||;True|2024-08-14T10:23:19.0348163+08:00||;True|2024-08-07T10:16:37.1827604+08:00||;True|2024-03-29T15:42:25.2332590+08:00||;False|2024-03-29T15:41:29.1754215+08:00||;True|2024-03-29T15:21:55.1373612+08:00||;True|2024-03-28T09:54:32.8968372+08:00||;True|2024-01-28T15:05:36.1055501+08:00||;True|2024-01-28T15:02:06.6945727+08:00||;True|2024-01-28T14:56:23.0500171+08:00||;True|2024-01-20T20:29:00.5459863+08:00||; \ No newline at end of file diff --git a/WcsMain/appsettings.json b/WcsMain/appsettings.json index b733ed3..dc1c1ef 100644 --- a/WcsMain/appsettings.json +++ b/WcsMain/appsettings.json @@ -14,7 +14,7 @@ "DBMssqlLocal": "Data Source=192.168.142.131;Initial Catalog=wcs_stacker;User Id=sa;Password=Sa123;", "ApplicationConfig": { - "ApiOnly": true, + "ApiOnly": false, "Language": "zh-CN" }, "UseUrls": [ "http://*:18990" ]