fix

Projects/永冠OPP/WCS.Service/Works/SRM/SRMWork.cs

@@ -496,7 +496,7 @@ namespace WCS.Service.Works.SRM
 
                         foreach (var dev in stationDevices)
                         {
-                            var task = tasks.FirstOrDefault(v => v.STATUS < TaskStatus.堆垛机执行 && v.ID == dev.Data2.Tasknum) ?? throw new WarnException($"设备有光电有任务且不在运行状态，但WCS找不到任务{dev.Data2.Tasknum}");
+                            var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.STATUS < TaskStatus.堆垛机执行 && v.ID == dev.Data2.Tasknum) ?? throw new WarnException($"设备有光电有任务且不在运行状态，但WCS找不到任务{dev.Data2.Tasknum}");
                             var oldTask = task.STATUS;
                             var tunnel = dev.Entity.ROUTES.First().NEXT.CODE;
                             I_WCS_GetWareCellResponse loc;

Projects/永冠OPP/WCS.Service/log4net.config

@@ -1,153 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
   <log4net>
-    <appender name="Info_InitAppender" type="log4net.Appender.RollingFileAppender">
+    <appender name="Db_ExAppender" type="log4net.Appender.RollingFileAppender">
       <param name="Encoding" value="utf-8" />
-      <file value="D:\WCSLog\Info" />
+      <file value="D:\WCSLog\Db" />
       <appendToFile value="true" />
       <rollingStyle value="Composite" />
       <maxSizeRollBackups value="-1" />
       <maximumFileSize value="40MB" />
       <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
       <staticLogFileName value="false" />
-      <DatePattern value="/yyyyMMdd/'Info_Init.log'" />
+      <DatePattern value="/yyyyMMdd/'Db_Ex.log'" />
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
       </layout>
     </appender>
-    <logger name="Info_Init">
+    <logger name="Db_Ex">
       <level value="ALL" />
-      <appender-ref ref="Info_InitAppender" />
+      <appender-ref ref="Db_ExAppender" />
     </logger>
-    <appender name="Info_SrmAlarmAppender" type="log4net.Appender.RollingFileAppender">
+    <appender name="Db_CleanAppender" type="log4net.Appender.RollingFileAppender">
       <param name="Encoding" value="utf-8" />
-      <file value="D:\WCSLog\Info" />
+      <file value="D:\WCSLog\Db" />
       <appendToFile value="true" />
       <rollingStyle value="Composite" />
       <maxSizeRollBackups value="-1" />
       <maximumFileSize value="40MB" />
       <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
       <staticLogFileName value="false" />
-      <DatePattern value="/yyyyMMdd/'Info_SrmAlarm.log'" />
+      <DatePattern value="/yyyyMMdd/'Db_Clean.log'" />
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
       </layout>
     </appender>
-    <logger name="Info_SrmAlarm">
+    <logger name="Db_Clean">
       <level value="ALL" />
-      <appender-ref ref="Info_SrmAlarmAppender" />
-    </logger>
-    <appender name="Info_InfoAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="Encoding" value="utf-8" />
-      <file value="D:\WCSLog\Info" />
-      <appendToFile value="true" />
-      <rollingStyle value="Composite" />
-      <maxSizeRollBackups value="-1" />
-      <maximumFileSize value="40MB" />
-      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-      <staticLogFileName value="false" />
-      <DatePattern value="/yyyyMMdd/'Info_Info.log'" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
-      </layout>
-    </appender>
-    <logger name="Info_Info">
-      <level value="ALL" />
-      <appender-ref ref="Info_InfoAppender" />
-    </logger>
-    <appender name="Info_ErrorAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="Encoding" value="utf-8" />
-      <file value="D:\WCSLog\Info" />
-      <appendToFile value="true" />
-      <rollingStyle value="Composite" />
-      <maxSizeRollBackups value="-1" />
-      <maximumFileSize value="40MB" />
-      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-      <staticLogFileName value="false" />
-      <DatePattern value="/yyyyMMdd/'Info_Error.log'" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
-      </layout>
-    </appender>
-    <logger name="Info_Error">
-      <level value="ALL" />
-      <appender-ref ref="Info_ErrorAppender" />
-    </logger>
-    <appender name="Info_SRMInfoAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="Encoding" value="utf-8" />
-      <file value="D:\WCSLog\Info" />
-      <appendToFile value="true" />
-      <rollingStyle value="Composite" />
-      <maxSizeRollBackups value="-1" />
-      <maximumFileSize value="40MB" />
-      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-      <staticLogFileName value="false" />
-      <DatePattern value="/yyyyMMdd/'Info_SRMInfo.log'" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
-      </layout>
-    </appender>
-    <logger name="Info_SRMInfo">
-      <level value="ALL" />
-      <appender-ref ref="Info_SRMInfoAppender" />
-    </logger>
-    <appender name="Info_SyTaskTatusAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="Encoding" value="utf-8" />
-      <file value="D:\WCSLog\Info" />
-      <appendToFile value="true" />
-      <rollingStyle value="Composite" />
-      <maxSizeRollBackups value="-1" />
-      <maximumFileSize value="40MB" />
-      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-      <staticLogFileName value="false" />
-      <DatePattern value="/yyyyMMdd/'Info_SyTaskTatus.log'" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
-      </layout>
-    </appender>
-    <logger name="Info_SyTaskTatus">
-      <level value="ALL" />
-      <appender-ref ref="Info_SyTaskTatusAppender" />
-    </logger>
-    <appender name="INFO_WMSRequestAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="Encoding" value="utf-8" />
-      <file value="D:\WCSLog\Info" />
-      <appendToFile value="true" />
-      <rollingStyle value="Composite" />
-      <maxSizeRollBackups value="-1" />
-      <maximumFileSize value="40MB" />
-      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-      <staticLogFileName value="false" />
-      <DatePattern value="/yyyyMMdd/'INFO_WMSRequest.log'" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
-      </layout>
-    </appender>
-    <logger name="INFO_WMSRequest">
-      <level value="ALL" />
-      <appender-ref ref="INFO_WMSRequestAppender" />
-    </logger>
-    <appender name="Info_WarnAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="Encoding" value="utf-8" />
-      <file value="D:\WCSLog\Info" />
-      <appendToFile value="true" />
-      <rollingStyle value="Composite" />
-      <maxSizeRollBackups value="-1" />
-      <maximumFileSize value="40MB" />
-      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-      <staticLogFileName value="false" />
-      <DatePattern value="/yyyyMMdd/'Info_Warn.log'" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
-      </layout>
-    </appender>
-    <logger name="Info_Warn">
-      <level value="ALL" />
-      <appender-ref ref="Info_WarnAppender" />
+      <appender-ref ref="Db_CleanAppender" />
     </logger>
     <appender name="Info_PlcReadLogAppender" type="log4net.Appender.RollingFileAppender">
       <param name="Encoding" value="utf-8" />
-      <file value="D:\WCSLog\Info" />
+      <file value="D:\WCSLog\Db" />
       <appendToFile value="true" />
       <rollingStyle value="Composite" />
       <maxSizeRollBackups value="-1" />
@@ -163,149 +55,23 @@
       <level value="ALL" />
       <appender-ref ref="Info_PlcReadLogAppender" />
     </logger>
-    <appender name="Info_TimingAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="Encoding" value="utf-8" />
-      <file value="D:\WCSLog\Info" />
-      <appendToFile value="true" />
-      <rollingStyle value="Composite" />
-      <maxSizeRollBackups value="-1" />
-      <maximumFileSize value="40MB" />
-      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-      <staticLogFileName value="false" />
-      <DatePattern value="/yyyyMMdd/'Info_Timing.log'" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
-      </layout>
-    </appender>
-    <logger name="Info_Timing">
-      <level value="ALL" />
-      <appender-ref ref="Info_TimingAppender" />
-    </logger>
-    <appender name="INFO_I_WCS_GetExcTaskAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="Encoding" value="utf-8" />
-      <file value="D:\WCSLog\Info" />
-      <appendToFile value="true" />
-      <rollingStyle value="Composite" />
-      <maxSizeRollBackups value="-1" />
-      <maximumFileSize value="40MB" />
-      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-      <staticLogFileName value="false" />
-      <DatePattern value="/yyyyMMdd/'INFO_I_WCS_GetExcTask.log'" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
-      </layout>
-    </appender>
-    <logger name="INFO_I_WCS_GetExcTask">
-      <level value="ALL" />
-      <appender-ref ref="INFO_I_WCS_GetExcTaskAppender" />
-    </logger>
-    <appender name="CreateTaskInAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="Encoding" value="utf-8" />
-      <file value="D:\WCSLog\Info" />
-      <appendToFile value="true" />
-      <rollingStyle value="Composite" />
-      <maxSizeRollBackups value="-1" />
-      <maximumFileSize value="40MB" />
-      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-      <staticLogFileName value="false" />
-      <DatePattern value="/yyyyMMdd/'CreateTaskIn.log'" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
-      </layout>
-    </appender>
-    <logger name="CreateTaskIn">
-      <level value="ALL" />
-      <appender-ref ref="CreateTaskInAppender" />
-    </logger>
-    <appender name="RgvInfoAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="Encoding" value="utf-8" />
-      <file value="D:\WCSLog\Info" />
-      <appendToFile value="true" />
-      <rollingStyle value="Composite" />
-      <maxSizeRollBackups value="-1" />
-      <maximumFileSize value="40MB" />
-      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-      <staticLogFileName value="false" />
-      <DatePattern value="/yyyyMMdd/'RgvInfo.log'" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
-      </layout>
-    </appender>
-    <logger name="RgvInfo">
-      <level value="ALL" />
-      <appender-ref ref="RgvInfoAppender" />
-    </logger>
-    <appender name="info_agvAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="Encoding" value="utf-8" />
-      <file value="D:\WCSLog\Info" />
-      <appendToFile value="true" />
-      <rollingStyle value="Composite" />
-      <maxSizeRollBackups value="-1" />
-      <maximumFileSize value="40MB" />
-      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-      <staticLogFileName value="false" />
-      <DatePattern value="/yyyyMMdd/'info_agv.log'" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
-      </layout>
-    </appender>
-    <logger name="info_agv">
-      <level value="ALL" />
-      <appender-ref ref="info_agvAppender" />
-    </logger>
-    <appender name="INFO_ErrorCheckAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="Encoding" value="utf-8" />
-      <file value="D:\WCSLog\Info" />
-      <appendToFile value="true" />
-      <rollingStyle value="Composite" />
-      <maxSizeRollBackups value="-1" />
-      <maximumFileSize value="40MB" />
-      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-      <staticLogFileName value="false" />
-      <DatePattern value="/yyyyMMdd/'INFO_ErrorCheck.log'" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
-      </layout>
-    </appender>
-    <logger name="INFO_ErrorCheck">
-      <level value="ALL" />
-      <appender-ref ref="INFO_ErrorCheckAppender" />
-    </logger>
-    <appender name="INFO_DeviceTaskTimeAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="Encoding" value="utf-8" />
-      <file value="D:\WCSLog\Info" />
-      <appendToFile value="true" />
-      <rollingStyle value="Composite" />
-      <maxSizeRollBackups value="-1" />
-      <maximumFileSize value="40MB" />
-      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-      <staticLogFileName value="false" />
-      <DatePattern value="/yyyyMMdd/'INFO_DeviceTaskTime.log'" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
-      </layout>
-    </appender>
-    <logger name="INFO_DeviceTaskTime">
-      <level value="ALL" />
-      <appender-ref ref="INFO_DeviceTaskTimeAppender" />
-    </logger>
-    <appender name="InfoAppender" type="log4net.Appender.RollingFileAppender">
+    <appender name="DbAppender" type="log4net.Appender.RollingFileAppender">
       <param name="Encoding" value="utf-8" />
-      <file value="D:\WCSLog\Info" />
+      <file value="D:\WCSLog\Db" />
       <appendToFile value="true" />
       <rollingStyle value="Composite" />
       <maxSizeRollBackups value="-1" />
       <maximumFileSize value="40MB" />
       <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
       <staticLogFileName value="false" />
-      <DatePattern value="/yyyyMMdd/'Info.log'" />
+      <DatePattern value="/yyyyMMdd/'Db.log'" />
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
       </layout>
     </appender>
-    <logger name="Info">
+    <logger name="Db">
       <level value="ALL" />
-      <appender-ref ref="InfoAppender" />
+      <appender-ref ref="DbAppender" />
     </logger>
   </log4net>
 </configuration>