出料机构的料架rfid上传到环形线

source/DeviceLibrary/bean/EquipBean.cs

@@ -948,6 +948,22 @@ namespace OnlineStore.DeviceLibrary
             }
             return str;
         }
+        public  string GetShelfRfids(string spilt = ",")
+        {
+            string str = "";
+            foreach (WorkStation shelf in StationMap.Values)
+            {
+                if (!String.IsNullOrEmpty( shelf.CurrShelf.RealShelf))
+                {
+                    str += shelf.CurrShelf.RealShelf + spilt;
+                }
+            }
+            if (str.EndsWith(spilt))
+            {
+                str = str.Substring(0, str.Length - 1);
+            }
+            return str;
+        }
         private void StartMove()
         {
            LogUtil.debug(Name+ "开始移栽【" + LineConnect.DoorPosInfo.ToStr() + "】");
@@ -1146,7 +1162,7 @@ namespace OnlineStore.DeviceLibrary
                                 posId = MoveInfo.MoveParam?.PosInfo.BoxPosId;
                             }
                         }
-                        StoreSendBean store = lineConn.GetBean((int)ss, (int)storeRunStatus, hasTray, (int)alarmType,posId);
+                        StoreSendBean store = lineConn.GetBean((int)ss, (int)storeRunStatus, hasTray, (int)alarmType,posId, GetShelfRfids());
                         lineConn.SendHeart(store);
                     }
 

source/DeviceLibrary/lineConnect/LineConnect.cs

@@ -222,9 +222,9 @@ namespace OnlineStore.DeviceLibrary
         }
 
 
-        public StoreSendBean GetBean(int ss, int runs, int doorHasTray, int alarmType,string currPosId)
+        public StoreSendBean GetBean(int ss, int runs, int doorHasTray, int alarmType,string currPosId,string rfids)
         {
-            StoreSendBean bean = new StoreSendBean(ss, runs, doorHasTray, alarmType, currPosId);
+            StoreSendBean bean = new StoreSendBean(ss, runs, doorHasTray, alarmType, currPosId, rfids);
             bean.StoreId = StoreId;
             bean.Cid = CID;
 
@@ -258,7 +258,7 @@ namespace OnlineStore.DeviceLibrary
     }
     public class StoreSendBean
     {
-        public StoreSendBean(int ss, int runs, int doorHasTray, int alarmType,string currPosId)
+        public StoreSendBean(int ss, int runs, int doorHasTray, int alarmType,string currPosId,string rfids)
         {
             this.StoreId = 7;
             this.Cid = "";
@@ -270,6 +270,7 @@ namespace OnlineStore.DeviceLibrary
             this.WaitInStoreList = new List<string>();
             this.data = new Dictionary<string, string>();
             this.CurrPosId = currPosId;
+            this.rfids = rfids;
 
         }
         public string Cmd = LineConnect.cmd_heart;
@@ -285,6 +286,6 @@ namespace OnlineStore.DeviceLibrary
         public List<string> WaitInStoreList = new List<string>();
         public Dictionary<string, string> data = new Dictionary<string, string>();
 
-
+        public string rfids = "";
     }
 }

source/HCSingleStore/FrmEquip.cs

@@ -631,16 +631,7 @@ namespace OnlineStore.ACSingleStore
                     }
                     posid = equip.MoveInfo.MoveParam?.PosInfo.BoxPosId;
                 }
-                StoreSendBean bean =  equip.lineConn.GetBean((int)ss, (int)StoreRunStatus.Runing, hasTray, (int)StoreAlarmType.None,posid);
-                //bean.data.Add(ParamDefine.posId, cmbPosition.Text);
-                //bean.data.Add(ParamDefine.plateH, "8");
-                //bean.data.Add(ParamDefine.plateW, "7");
-                //bean.data.Add(ParamDefine.cutReel, false.ToString());
-                //bean.data.Add(ParamDefine.smallReel, true.ToString());
-                //bean.data.Add(ParamDefine.urgentReel, false.ToString());
-                //bean.data.Add(ParamDefine.rfid, "E99");
-                //bean.data.Add(ParamDefine.rfidLoc, 72.ToString());
-                //bean.data.Add(ParamDefine.barcode, "code");
+                StoreSendBean bean =  equip.lineConn.GetBean((int)ss, (int)StoreRunStatus.Runing, hasTray, (int)StoreAlarmType.None,posid,equip.GetShelfRfids()); 
                 equip.lineConn.SendHeart(bean);
             }
         }