chenxy 5 år sedan
förälder
incheckning
73b96e9cf9
2 ändrade filer med 36 tillägg och 29 borttagningar
  1. 1 0
      .gitignore
  2. 35 29
      WCF.Service/WCF.WebHosting/Global.asax.cs

+ 1 - 0
.gitignore

@@ -264,3 +264,4 @@ __pycache__/
 /IBOSS.PRD.Service
 /IBOSS.PRD.WebService
 /DK.Service/PMModuleLogic/PMModuleLogicDAL - 副本.cs
+/DK.Service/PMModuleLogic/PMModuleLogicDAL - 副本 (同步产量).cs

+ 35 - 29
WCF.Service/WCF.WebHosting/Global.asax.cs

@@ -246,49 +246,55 @@ namespace Dongke.IBOSS.PRD.WCF.WebHosting
 
                     // 下次开始时间
                     string nextDate = ini.ReadIniData("SAP_HEGII", "NextDate");
-                    DateTime ndate = DateTime.ParseExact(nextDate, "yyyy-MM-dd HH:mm", CultureInfo.InvariantCulture);
-                    DateTime.TryParseExact(nextDate, "yyyy-MM-dd HH:mm", CultureInfo.InvariantCulture, DateTimeStyles.None, out ndate);
-
-                    if (ndate != null && ndate <= dateTimeNow)
+                    string strInterval = ini.ReadIniData("SAP_HEGII", "Interval");
+                    DateTime ndate;
+                    if (!string.IsNullOrWhiteSpace(nextDate) && !string.IsNullOrWhiteSpace(strInterval))
                     {
-                        // 间隔时间(分钟)
-                        int interval = ini.ReadIniData("SAP_HEGII", "Interval").ToInt32();
-                        DateTime nextDateINI = ndate.AddMinutes(interval);
-                        while (nextDateINI <= dateTimeNow)
+                        ndate = DateTime.ParseExact(nextDate, "yyyy-MM-dd HH:mm", CultureInfo.InvariantCulture);
+                        DateTime.TryParseExact(nextDate, "yyyy-MM-dd HH:mm", CultureInfo.InvariantCulture, DateTimeStyles.None, out ndate);
+
+                        if (ndate != null && ndate <= dateTimeNow)
                         {
-                            nextDateINI = nextDateINI.AddMinutes(interval);
-                        }
+                            // 间隔时间(分钟)
+                            int interval = strInterval.ToInt32();
+                            DateTime nextDateINI = ndate.AddMinutes(interval);
+                            while (nextDateINI <= dateTimeNow)
+                            {
+                                nextDateINI = nextDateINI.AddMinutes(interval);
+                            }
 
-                        // 更新下次执行时间
-                        ini.WriteIniData("SAP_HEGII", "NextDate", nextDateINI.ToString("yyyy-MM-dd HH:mm"));
+                            // 更新下次执行时间
+                            ini.WriteIniData("SAP_HEGII", "NextDate", nextDateINI.ToString("yyyy-MM-dd HH:mm"));
 
-                        string funCode = ini.ReadIniData("SAP_HEGII", "FunCode");
-                        OutputLog.TraceLog(LogPriority.Information,
-                                   "Global2",
-                                   "OnTimedEvent begin: " + funCode,
-                                   "AutoWorkDataToSAP : " + Timer_Loker.LockerName + " - " + e.SignalTime.ToString("yyyy-MM-dd HH:mm:ss")
-                                    + " - " + dateTimeNow.ToString("yyyy-MM-dd HH:mm:ss") + $" -date:" + ndate.ToString("yyyy-MM-dd HH:mm:ss")
-                                    + $" -[{interval}]" + nextDateINI.ToString("yyyy-MM-dd HH:mm:ss"),
-                                   LocalPath.LogExePath + "SAP_HEGII\\Timer_");
+                            string funCode = ini.ReadIniData("SAP_HEGII", "FunCode");
+                            OutputLog.TraceLog(LogPriority.Information,
+                                       "Global2",
+                                       "OnTimedEvent begin: " + funCode,
+                                       "AutoWorkDataToSAP : " + Timer_Loker.LockerName + " - " + e.SignalTime.ToString("yyyy-MM-dd HH:mm:ss")
+                                        + " - " + dateTimeNow.ToString("yyyy-MM-dd HH:mm:ss") + $" -date:" + ndate.ToString("yyyy-MM-dd HH:mm:ss")
+                                        + $" -[{interval}]" + nextDateINI.ToString("yyyy-MM-dd HH:mm:ss"),
+                                       LocalPath.LogExePath + "SAP_HEGII\\Timer_");
 
-                        Service.SAPHegiiDataService.SAPDataLogic.AutoWorkDataToSAP(ndate, funCode, ndate);
+                            Service.SAPHegiiDataService.SAPDataLogic.AutoWorkDataToSAP(ndate, funCode, ndate);
 
-                        OutputLog.TraceLog(LogPriority.Information,
-                                   "Global2",
-                                   "OnTimedEvent end",
-                                   "AutoWorkDataToSAP : " + Timer_Loker.LockerName + " - " + e.SignalTime.ToString("yyyy-MM-dd HH:mm:ss")
-                                    + " - " + dateTimeNow.ToString("yyyy-MM-dd HH:mm:ss") + " - " + ndate.ToString("yyyy-MM-dd HH:mm:ss"),
-                                   LocalPath.LogExePath + "SAP_HEGII\\Timer_");
+                            OutputLog.TraceLog(LogPriority.Information,
+                                       "Global2",
+                                       "OnTimedEvent end",
+                                       "AutoWorkDataToSAP : " + Timer_Loker.LockerName + " - " + e.SignalTime.ToString("yyyy-MM-dd HH:mm:ss")
+                                        + " - " + dateTimeNow.ToString("yyyy-MM-dd HH:mm:ss") + " - " + ndate.ToString("yyyy-MM-dd HH:mm:ss"),
+                                       LocalPath.LogExePath + "SAP_HEGII\\Timer_");
+                        }
                     }
 
                     #region 50
                     string nextDate50 = ini.ReadIniData("SAP_HEGII", "NextDate50");
-                    if (!string.IsNullOrWhiteSpace(nextDate50) &&
+                    string strInterval50 = ini.ReadIniData("SAP_HEGII", "Interval50");
+                    if (!string.IsNullOrWhiteSpace(nextDate50) && !string.IsNullOrWhiteSpace(strInterval50) &&
                         DateTime.TryParseExact(nextDate50, "yyyy-MM-dd HH:mm", null, DateTimeStyles.None, out ndate) &&
                         ndate <= dateTimeNow)
                     {
                         // 间隔时间(分钟)
-                        int interval50 = ini.ReadIniData("SAP_HEGII", "Interval50").ToInt32();
+                        int interval50 = strInterval50.ToInt32();
                         DateTime nextDateINI50 = ndate.AddMinutes(interval50);
                         while (nextDateINI50 <= dateTimeNow)
                         {