1

AGVControl-ProductionLine/BLL/Common.cs

@@ -1084,7 +1084,6 @@ namespace AGVControl
             int idx = Common.nodeInfo.FindIndex(s => s.Name == nodeName);
             int idx = Common.nodeInfo.FindIndex(s => s.Name == nodeName);
             if (idx > -1)
             if (idx > -1)
             {
             {
-               // Common.missionManager.missionList.Add(new MissionStru(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), nodeName));
                 Common.missionManager.AddMission(new MissionStru(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), nodeName,rfid));
                 Common.missionManager.AddMission(new MissionStru(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), nodeName,rfid));
                 Common.nodeInfo[idx].IncreEmptyShelfCnt(rfid);
                 Common.nodeInfo[idx].IncreEmptyShelfCnt(rfid);
                 using (System.IO.StreamWriter file = new System.IO.StreamWriter(CONFIG_PATH + "LinePlace.txt"))
                 using (System.IO.StreamWriter file = new System.IO.StreamWriter(CONFIG_PATH + "LinePlace.txt"))

AGVControl-ProductionLine/bean/node/ClientNode.cs

@@ -79,7 +79,7 @@ namespace AGVControl
         /// <param name="name"></param>
         /// <param name="name"></param>
         /// <param name="ip"></param>
         /// <param name="ip"></param>
         /// <param name="isUse"></param>
         /// <param name="isUse"></param>
-        public ClientNode(string name, string ip, string aliceName,string lineName, string pos_name, string pos_guid, bool isUse,int emptyCnt) : base(name, ip, isUse)
+        public ClientNode(string name, string ip, string aliceName, string lineName, string pos_name, string pos_guid, bool isUse, int emptyCnt) : base(name, ip, isUse)
         {
         {
 
 
             AliceName = aliceName;
             AliceName = aliceName;
@@ -111,38 +111,39 @@ namespace AGVControl
         /// <summary>
         /// <summary>
         ///空料架数量增加,如果RFID相同，不增加数量
         ///空料架数量增加,如果RFID相同，不增加数量
         /// </summary>
         /// </summary>
-        public void IncreEmptyShelfCnt(string rfid="")
+        public void IncreEmptyShelfCnt(string rfid)
         {
         {
-            if(!rfid.Equals("") && !EmptyShelfRFIDs.Contains(rfid))
+            if (!rfid.Equals("") && !EmptyShelfRFIDs.Contains(rfid))
             {
             {
                 System.Threading.Interlocked.Increment(ref _EmptyShelfCnt);
                 System.Threading.Interlocked.Increment(ref _EmptyShelfCnt);
                 EmptyShelfRFIDs.Add(rfid);
                 EmptyShelfRFIDs.Add(rfid);
-                Common.WriteIni(Name, SettingString.EmptyShelfRFIDs, string.Join(",",EmptyShelfRFIDs.ToArray()));
-                Common.WriteIni(Name, SettingString.EmptyShelfCnt,_EmptyShelfCnt.ToString());
-            }
-            else if(rfid.Equals(""))
-            {
-                System.Threading.Interlocked.Increment(ref _EmptyShelfCnt);
+                Common.WriteIni(Name, SettingString.EmptyShelfRFIDs, string.Join(",", EmptyShelfRFIDs.ToArray()));
                 Common.WriteIni(Name, SettingString.EmptyShelfCnt, _EmptyShelfCnt.ToString());
                 Common.WriteIni(Name, SettingString.EmptyShelfCnt, _EmptyShelfCnt.ToString());
+                Common.LogInfo(string.Format("{0}解绑任务添加成功:RFID={1}", Name, rfid));
             }
             }
+            //else if(rfid.Equals(""))
+            //{
+            //    System.Threading.Interlocked.Increment(ref _EmptyShelfCnt);
+            //    Common.WriteIni(Name, SettingString.EmptyShelfCnt, _EmptyShelfCnt.ToString());
+            //}
         }
         }
         /// <summary>
         /// <summary>
         /// 空料架数量减少1
         /// 空料架数量减少1
         /// </summary>
         /// </summary>
-        public void DecreEmptyShelfCnt(string rfid="")
+        public void DecreEmptyShelfCnt(string rfid)
         {
         {
             if (_EmptyShelfCnt > 0)
             if (_EmptyShelfCnt > 0)
             {
             {
+                if (!rfid.Equals("") && EmptyShelfRFIDs.Contains(rfid))
+                {
                     System.Threading.Interlocked.Decrement(ref _EmptyShelfCnt);
                     System.Threading.Interlocked.Decrement(ref _EmptyShelfCnt);
                     Common.WriteIni(Name, SettingString.EmptyShelfCnt, _EmptyShelfCnt.ToString());
                     Common.WriteIni(Name, SettingString.EmptyShelfCnt, _EmptyShelfCnt.ToString());
-                if(!rfid.Equals("") && EmptyShelfRFIDs.Contains(rfid))
-                {
                     EmptyShelfRFIDs.Remove(rfid);
                     EmptyShelfRFIDs.Remove(rfid);
                     Common.WriteIni(Name, SettingString.EmptyShelfRFIDs, string.Join(",", EmptyShelfRFIDs.ToArray()));
                     Common.WriteIni(Name, SettingString.EmptyShelfRFIDs, string.Join(",", EmptyShelfRFIDs.ToArray()));
+                    Common.LogInfo(string.Format("{0}解绑任务删除成功:RFID={1}", Name, rfid));
                 }
                 }
             }
             }
-
-            if(_EmptyShelfCnt.Equals(0) && EmptyShelfRFIDs.Count>0)
+            else if (_EmptyShelfCnt.Equals(0) && EmptyShelfRFIDs.Count > 0)
             {
             {
                 EmptyShelfRFIDs.Clear();
                 EmptyShelfRFIDs.Clear();
             }
             }