diff --git a/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgCheck/Services/M100CheckDomainService.cs b/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgCheck/Services/M100CheckDomainService.cs index 04280cb..3d80748 100644 --- a/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgCheck/Services/M100CheckDomainService.cs +++ b/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgCheck/Services/M100CheckDomainService.cs @@ -434,6 +434,7 @@ namespace WY.NewJit.MsgCheck { //断号提醒 string errorMsg = $"{curProductLine}生产线M100报文出现断号，当前VIN：{curVinNum}：{curHostSN}，上一VIN：{priorVinNum}：{priorHostSN}。可以操作M100单据信息维护模块进行补号！"; + _logger.LogError(errorMsg); _logRemindDomainService.WriteLogRemind(_billNumber, errorMsg, LogTypeEnum.M100); } } diff --git a/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgCheck/Services/R100CheckDomainService.cs b/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgCheck/Services/R100CheckDomainService.cs index 3cb7ec6..e944bd9 100644 --- a/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgCheck/Services/R100CheckDomainService.cs +++ b/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgCheck/Services/R100CheckDomainService.cs @@ -707,6 +707,7 @@ namespace WY.NewJit.MsgCheck { //断号提醒 string errorMsg = $"R100报文出现断号，当前KNR：{r100Bill.KNR}-{curHostSN}，上一KNR：{priorBill.KNR}-{priorHostSN}"; + _logger.LogError(errorMsg); _logRemindDomainService.WriteLogRemind(_billNumber, errorMsg, LogTypeEnum.R100); } } diff --git a/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleApp/Messages/MsgTransmissionService.cs b/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleApp/Messages/MsgTransmissionService.cs index edc3cdf..369ce39 100644 --- a/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleApp/Messages/MsgTransmissionService.cs +++ b/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleApp/Messages/MsgTransmissionService.cs @@ -579,8 +579,9 @@ namespace WY.NewJit.Job.ConsoleApp.Messages if (isRepeat == true) { var succObj = _r100CheckDomainSrv.InsertR100Repeat(msgReceiveObj, r100Bill); - _logger.LogDebug(_errorMessagePrefix + $"是重复报文：{msgReceiveObj.MessageFileName}"); - return; + string msg = _errorMessagePrefix + $"R100是重复报文：{msgReceiveObj.MessageFileName}"; + _logger.LogDebug(msg); + throw new Exception(msg); } } else if (billResObj.M100Bill != null) @@ -590,8 +591,9 @@ namespace WY.NewJit.Job.ConsoleApp.Messages if (isRepeat == true) { var succObj = _m100CheckDomainService.InsertM100RepeatBill(msgReceiveObj, m100Bill); - _logger.LogDebug(_errorMessagePrefix + $"是重复报文：{msgReceiveObj.MessageFileName}"); - return; + string msg = _errorMessagePrefix + $"M100是重复报文：{msgReceiveObj.MessageFileName}"; + _logger.LogDebug(msg); + throw new Exception(msg); } } #endregion @@ -600,6 +602,10 @@ namespace WY.NewJit.Job.ConsoleApp.Messages string unknowPartCode = UpdatePartLargeType(billResObj); if (unknowPartCode.HasValue()) //有不识别零件 { + msgReceiveObj.ErrorCount = 3; + msgReceiveObj.ErrorMessage = $"存在不识别的零件{unknowPartCode}"; + _messageReceiveRepository.UpdateAsync(msgReceiveObj).GetAwaiter().GetResult(); + throw new Exception($"存在不识别的零件{unknowPartCode}：{msgReceiveObj.MessageFileName}"); //零件大类没有维护时，直接返回解析失败，程序执行中断，报警（不进入未知总成） } #endregion @@ -681,7 +687,7 @@ namespace WY.NewJit.Job.ConsoleApp.Messages msgReceiveObj.ErrorCount = errCnt + 1; msgReceiveObj.ErrorMessage = ex0.Message; msgReceiveObj.SetReceiveStatus(ReceiveStatusEnum.Received); - _messageReceiveRepository.UpdateAsync(msgReceiveObj); + var succObj = _messageReceiveRepository.UpdateAsync(msgReceiveObj); string errorMsg = $"{errorHeader}：{ex0.Message}"; _logRemindDomainService.WriteLogRemind(fileName, errorMsg, LogTypeEnum.None); diff --git a/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleApp/appsettings.json b/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleApp/appsettings.json index f8ea5ce..2e6c0b5 100644 --- a/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleApp/appsettings.json +++ b/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleApp/appsettings.json @@ -6,7 +6,7 @@ "ConfigDic": { "CurrentVersion": "PaiGe", - "TransferFileCountPerTime": 1, //每次读取的报文数 + "TransferFileCountPerTime": 10, //每次读取的报文数 "ParseAssemblyCycleCount": 4, "MsgTransmessionTimer": { "IsStop": false, @@ -60,11 +60,14 @@ }, "ConnectionStrings": { - /*"Default": "Server=192.168.1.228;Database=NewJitPG_TEST_0114;uid=sa;pwd=ChangkeTec@2021;",*/ - "Default": "Server=192.168.1.228;Database=NewJitPG;uid=sa;pwd=ChangkeTec@2021;", - /*"Default": "Server=192.168.0.216;Database=NewJitPG;uid=sa;pwd=ChangkeTec@2021;",*/ - "ABP": "Server=192.168.1.228;Database=ABP;User ID=sa;Password=ChangkeTec@2021;", - "WMS": "Server=192.168.1.228;Database=CPAT_WMS_TEST;User ID=sa;Password=ChangkeTec@2021;" + //"Default": "Server=192.168.1.228;Database=NewJitPG;uid=sa;pwd=ChangkeTec@2021;", + //"ABP": "Server=192.168.1.228;Database=ABP;User ID=sa;Password=ChangkeTec@2021;", + //"WMS": "Server=192.168.1.228;Database=CPAT_WMS_TEST;User ID=sa;Password=ChangkeTec@2021;", + + "Default": "Server=dev.ccwin-in.com,6208;Database=NewJitPG;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_TEST;User ID=sa;Password=ChangkeTec@2021;" + }, /* diff --git a/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleGetEDIFile/appsettings.json b/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleGetEDIFile/appsettings.json index 01b9d8a..8205641 100644 --- a/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleGetEDIFile/appsettings.json +++ b/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleGetEDIFile/appsettings.json @@ -46,9 +46,14 @@ }, "ConnectionStrings": { - "Default": "Server=192.168.1.228;Database=NewJitPG;uid=sa;pwd=ChangkeTec@2021;", - "ABP": "Server=192.168.1.228;Database=ABP;User ID=sa;Password=ChangkeTec@2021;", - "WMS": "Server=192.168.1.228;Database=CPAT_WMS_TEST;User ID=sa;Password=ChangkeTec@2021;" + //"Default": "Server=192.168.1.228;Database=NewJitPG;uid=sa;pwd=ChangkeTec@2021;", + //"ABP": "Server=192.168.1.228;Database=ABP;User ID=sa;Password=ChangkeTec@2021;", + //"WMS": "Server=192.168.1.228;Database=CPAT_WMS_TEST;User ID=sa;Password=ChangkeTec@2021;", + + "Default": "Server=dev.ccwin-in.com,6208;Database=NewJitPG;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_TEST;User ID=sa;Password=ChangkeTec@2021;" + },