添加任务日志

AGVControl-ProductionLine/App.config

@@ -31,6 +31,21 @@
         <conversionPattern value="[%date]%-5p %m%n"/>
         <conversionPattern value="[%date]%-5p %m%n"/>
       </layout>
       </layout>
     </appender>
     </appender>
+    <appender name="RunLog" type="log4net.Appender.RollingFileAppender">
+      <file value="logs/runLog/RunLog.json"/>
+      <param name="Encoding" value="UTF-8"/>
+      <appendToFile value="true"/>
+      <param name="MaxSizeRollBackups" value="10" />
+      <rollingStyle value="Date"/>
+      <datePattern value="yyyy-MM-dd"/>
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%m%n"/>
+      </layout>
+    </appender>
+    <logger name="RunLog">
+      <level value="Info"/>
+      <appender-ref ref="RunLog"/>
+    </logger>
     <logger name ="LineWebService">
     <logger name ="LineWebService">
       <level value="Info"/>
       <level value="Info"/>
       <appender-ref ref="LineWebService"/>
       <appender-ref ref="LineWebService"/>

AGVControl-ProductionLine/BLL/AGVManager.cs

@@ -10,6 +10,44 @@ using RestSharp;
 
 
 namespace AGVControl
 namespace AGVControl
 {
 {
+    public class RunInfo
+    {
+        /// <summary>
+        /// AGV编号
+        /// </summary>
+        public string AGVNum { get; set; } = "";
+        /// <summary>
+        /// 时间
+        /// </summary>
+        public string DateTime { get; set; } = "";
+        /// <summary>
+        /// 任务信息
+        /// </summary>
+        public string MissionInfo { get; set; } = "";
+        public RunInfo(string AGVNum, string missionInfo)
+        {
+            //2006-01-02 15:04:05
+            DateTime = System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            this.AGVNum = AGVNum;
+            MissionInfo = missionInfo;
+        }
+        public RunInfo() { }
+        public override bool Equals(object obj)
+        {
+            if (obj is RunInfo)
+            {
+                RunInfo info = (RunInfo)obj;
+                if (this.MissionInfo.Equals(info.MissionInfo))
+                    return true;
+                this.MissionInfo = info.MissionInfo;
+            }
+            return false;
+        }
+        public override string ToString()
+        {
+            return JsonHelper.SerializeObject(this);
+        }
+    }
     public class AGVManager
     public class AGVManager
     {
     {
         private static string Addr_CurSO = "/rest/api/qisda/device/currentOutLine";
         private static string Addr_CurSO = "/rest/api/qisda/device/currentOutLine";

AGVControl-ProductionLine/BLL/Common.cs

@@ -98,6 +98,7 @@ namespace AGVControl
         public static ChargeStatus chargeStatus;
         public static ChargeStatus chargeStatus;
         public static string itsHttp;
         public static string itsHttp;
         public static log4net.ILog log;
         public static log4net.ILog log;
+        public static log4net.ILog runLog;
         public static Dictionary<string, string> agvMission;
         public static Dictionary<string, string> agvMission;
         public static Dictionary<string, string> showNameMissionName;
         public static Dictionary<string, string> showNameMissionName;
         //public static Dictionary<string, string> agvProductionLine;
         //public static Dictionary<string, string> agvProductionLine;
@@ -109,7 +110,24 @@ namespace AGVControl
         private static string preLog = "";
         private static string preLog = "";
         public static readonly string CONFIG_PATH = AppDomain.CurrentDomain.BaseDirectory + "Config\\";
         public static readonly string CONFIG_PATH = AppDomain.CurrentDomain.BaseDirectory + "Config\\";
 
 
-
+        static Dictionary<string, RunInfo> runInfoMap = new Dictionary<string, RunInfo>();
+        public static void RunLogInfo(RunInfo info)
+        {
+            if (runInfoMap == null)
+                return;
+            if (runInfoMap.Keys.Contains(info.AGVNum))
+            {
+                if (!runInfoMap[info.AGVNum].Equals(info))
+                {
+                    runLog.Info(info.ToString());
+                }
+            }
+            else
+            {
+                runInfoMap.Add(info.AGVNum, info);
+                runLog.Info(info.ToString());
+            }
+        }
         public static string ReadIni(string section, string key)
         public static string ReadIni(string section, string key)
         {
         {
             return IniHelper.ReadValue(section, key, CONFIG_PATH + SettingString.FileName_tempData);
             return IniHelper.ReadValue(section, key, CONFIG_PATH + SettingString.FileName_tempData);

AGVControl-ProductionLine/BLL/Control.cs

@@ -212,7 +212,11 @@ namespace AGVControl.BLL
                     if (!isAlarm)
                     if (!isAlarm)
                     {
                     {
                         if (!Common.agvInfo[i].Msg.Equals(""))
                         if (!Common.agvInfo[i].Msg.Equals(""))
-                            msglist.Add(new AlarmMsg(Common.agvInfo[i].Name, "lineAgv." + Common.agvInfo[i].Name + ".Msg", Common.agvInfo[i].Msg,1));
+                        {
+                            msglist.Add(new AlarmMsg(Common.agvInfo[i].Name, "lineAgv." + Common.agvInfo[i].Name + ".Msg", Common.agvInfo[i].Msg, 1));
+                            Common.RunLogInfo(new AGVControl.RunInfo(Common.agvInfo[i].Name, Common.agvInfo[i].Msg));
+                        }
+
                         else
                         else
                         {
                         {
                             if ((Common.agvInfo[i].Place.Contains(SettingString.AutoCharge) || Common.agvInfo[i].Place.Contains(SettingString.Standby)))
                             if ((Common.agvInfo[i].Place.Contains(SettingString.AutoCharge) || Common.agvInfo[i].Place.Contains(SettingString.Standby)))

AGVControl-ProductionLine/FrmMain.Designer.cs

@@ -880,7 +880,6 @@
             this.btnAddMission.TabIndex = 40;
             this.btnAddMission.TabIndex = 40;
             this.btnAddMission.Text = "添加绑定任务";
             this.btnAddMission.Text = "添加绑定任务";
             this.btnAddMission.UseVisualStyleBackColor = true;
             this.btnAddMission.UseVisualStyleBackColor = true;
-            this.btnAddMission.Visible = false;
             this.btnAddMission.Click += new System.EventHandler(this.btnAddMission_Click);
             this.btnAddMission.Click += new System.EventHandler(this.btnAddMission_Click);
             // 
             // 
             // cmbBoxLineName
             // cmbBoxLineName

AGVControl-ProductionLine/Program.cs

@@ -43,6 +43,7 @@ namespace AGVControl
             //Common.logTextBox = new TextBox();
             //Common.logTextBox = new TextBox();
             //Common.missionView = new DataGridView();
             //Common.missionView = new DataGridView();
             Common.log = log4net.LogManager.GetLogger("AgvServer");
             Common.log = log4net.LogManager.GetLogger("AgvServer");
+            Common.runLog = log4net.LogManager.GetLogger("RunLog");
             Common.log.Info("=====程序开始=====");
             Common.log.Info("=====程序开始=====");
             ReadConfig();
             ReadConfig();
             Common.ReadUnlockLineInfo();
             Common.ReadUnlockLineInfo();

AGVControl-ProductionLine/bin/Debug/AGVControl-ProductionLine.exe.config

@@ -31,6 +31,21 @@
         <conversionPattern value="[%date]%-5p %m%n"/>
         <conversionPattern value="[%date]%-5p %m%n"/>
       </layout>
       </layout>
     </appender>
     </appender>
+    <appender name="RunLog" type="log4net.Appender.RollingFileAppender">
+      <file value="logs/runLog/RunLog.json"/>
+      <param name="Encoding" value="UTF-8"/>
+      <appendToFile value="true"/>
+      <param name="MaxSizeRollBackups" value="10" />
+      <rollingStyle value="Date"/>
+      <datePattern value="yyyy-MM-dd"/>
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%m%n"/>
+      </layout>
+    </appender>
+    <logger name="RunLog">
+      <level value="Info"/>
+      <appender-ref ref="RunLog"/>
+    </logger>
     <logger name ="LineWebService">
     <logger name ="LineWebService">
       <level value="Info"/>
       <level value="Info"/>
       <appender-ref ref="LineWebService"/>
       <appender-ref ref="LineWebService"/>

AGVControl-ProductionLine/obj/Debug/AGVControl-ProductionLine.csproj.FileListAbsolute.txt

@@ -71,3 +71,4 @@ E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLi
 E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csproj.CopyComplete
 E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csproj.CopyComplete
 E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.exe
 E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.exe
 E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.pdb
 E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.pdb
+E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csprojAssemblyReference.cache