From 25a9d082e132ed120684b9165c8ff8d9c63d2678 Mon Sep 17 00:00:00 2001 From: liuyunfeng Date: Thu, 9 Nov 2023 11:03:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=8C=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WY.NewJit.Job.ConsoleGetEDIFile/appsettings.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleGetEDIFile/appsettings.json b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleGetEDIFile/appsettings.json index 110342d..66ffc08 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleGetEDIFile/appsettings.json +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleGetEDIFile/appsettings.json @@ -37,11 +37,11 @@ "FileFilterKeyword": "jit*.*", "PathReadType": "绝对", "PathRead": { - "接收目录": "D:\\web_publish\\MessageFile_Test\\JIS_RCV", - "工作目录": "D:\\web_publish\\MessageFile_Test\\JIS_WORK", - "备份目录": "D:\\web_publish\\MessageFile_Test\\JIS_BAK", - "错误目录": "D:\\web_publish\\MessageFile_Test\\JIS_ERR", - "等待目录": "D:\\web_publish\\MessageFile_Test\\JIS_WAIT" + "接收目录": "D:\\~all-publish\\PaiGe1.5\\MessageFile_Test\\JIS_RCV", + "工作目录": "D:\\~all-publish\\PaiGe1.5\\MessageFile_Test\\JIS_WORK", + "备份目录": "D:\\~all-publish\\PaiGe1.5\\MessageFile_Test\\JIS_BAK", + "错误目录": "D:\\~all-publish\\PaiGe1.5\\MessageFile_Test\\JIS_ERR", + "等待目录": "D:\\~all-publish\\PaiGe1.5\\MessageFile_Test\\JIS_WAIT" } }, From a04cde1a8906268cfb5caee72906934dfee07438 Mon Sep 17 00:00:00 2001 From: liuyunfeng Date: Thu, 9 Nov 2023 13:20:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=B9=E5=AE=9E=E4=BD=93=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../新版JIT或JIS系统服务端/WY.NewJit.sln | 16 +++++++++------- .../MsgCheck/Services/M100DomainService.cs | 8 ++++---- .../PrintTable/Entitys/AlreadyPrint.cs | 2 +- .../PrintTable/Entitys/WaitPrint.cs | 2 +- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/Modules/新版JIT或JIS系统服务端/WY.NewJit.sln b/src/Modules/新版JIT或JIS系统服务端/WY.NewJit.sln index 0cc66ff..bc223ff 100644 --- a/src/Modules/新版JIT或JIS系统服务端/WY.NewJit.sln +++ b/src/Modules/新版JIT或JIS系统服务端/WY.NewJit.sln @@ -55,6 +55,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaseService.Domain", "..\Ba EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FIS1.5版本", "FIS1.5版本", "{9CB5F3B9-0044-40C3-BD36-0B41CEEC0487}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Base", "Base", "{A8441906-AA32-4B6A-8D55-6B3DEF4E5DEB}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -179,13 +181,13 @@ Global {D0ED965A-9F7D-405B-A072-96AFBBF5F1C8} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {76F4BCFC-22A9-419F-8488-7943481AA9C4} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {3682475F-0356-46A6-BBC7-E67F1BA9C3F6} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} - {3B098743-38AF-42DA-9811-17BDD3296466} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} - {B48BD519-C781-480E-9A9A-0A08C447F7F3} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} - {D4F3D7A1-A1DC-49B8-99DD-BDCBFD495B03} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} - {F089699D-73EA-478B-BAF5-014F7985F735} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} - {794221E7-875A-4C82-8A38-511C64FAD739} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} - {F1A82B70-8DF4-48EE-984E-ED527D86A44F} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} - {4568BFE0-D0F9-408D-BD7E-99415C9EC010} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} + {3B098743-38AF-42DA-9811-17BDD3296466} = {A8441906-AA32-4B6A-8D55-6B3DEF4E5DEB} + {B48BD519-C781-480E-9A9A-0A08C447F7F3} = {A8441906-AA32-4B6A-8D55-6B3DEF4E5DEB} + {D4F3D7A1-A1DC-49B8-99DD-BDCBFD495B03} = {A8441906-AA32-4B6A-8D55-6B3DEF4E5DEB} + {F089699D-73EA-478B-BAF5-014F7985F735} = {A8441906-AA32-4B6A-8D55-6B3DEF4E5DEB} + {794221E7-875A-4C82-8A38-511C64FAD739} = {A8441906-AA32-4B6A-8D55-6B3DEF4E5DEB} + {F1A82B70-8DF4-48EE-984E-ED527D86A44F} = {A8441906-AA32-4B6A-8D55-6B3DEF4E5DEB} + {4568BFE0-D0F9-408D-BD7E-99415C9EC010} = {A8441906-AA32-4B6A-8D55-6B3DEF4E5DEB} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F} diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgCheck/Services/M100DomainService.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgCheck/Services/M100DomainService.cs index 52a981b..9e52b71 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgCheck/Services/M100DomainService.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgCheck/Services/M100DomainService.cs @@ -90,10 +90,10 @@ namespace WY.NewJit.MsgCheck targetWaitPrint.HostSN2 = breaknum.HostSN2; targetWaitPrint.Description = null; targetWaitPrint.ReceiveTime = null; - targetWaitPrint.CreationTime = null; - targetWaitPrint.CreatorId = null; - targetWaitPrint.LastModificationTime = null; - targetWaitPrint.LastModifierId = null; + //targetWaitPrint.CreationTime = null; + //targetWaitPrint.CreatorId = null; + //targetWaitPrint.LastModificationTime = null; + //targetWaitPrint.LastModifierId = null; waitPrintBreakNumLst.Add(targetWaitPrint); } } diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Entitys/AlreadyPrint.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Entitys/AlreadyPrint.cs index 3e9d1da..b6c00f4 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Entitys/AlreadyPrint.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Entitys/AlreadyPrint.cs @@ -93,7 +93,7 @@ namespace WY.NewJit.PrintTable /// /// 创建时间 /// - public DateTime? CreationTime { get; set; } + public DateTime CreationTime { get; set; } /// /// 创建人 diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Entitys/WaitPrint.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Entitys/WaitPrint.cs index 94a04f6..4a1e405 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Entitys/WaitPrint.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Entitys/WaitPrint.cs @@ -93,7 +93,7 @@ namespace WY.NewJit.PrintTable /// /// 创建时间 /// - public DateTime? CreationTime { get; set; } + public DateTime CreationTime { get; set; } /// /// 创建人