Merge branch 'master' of http://106.15.194.121:8083/lina/SO908-XLRStore

source/Common/bean/Bean.cs

@@ -271,5 +271,7 @@ namespace OnlineStore.Common
         /// 执行时间
         /// 执行时间
         /// </summary>
         /// </summary>
         public static string executeTime = "executeTime ";
         public static string executeTime = "executeTime ";
+
+        public static string code = "code";
     }
     }
 }
 }

source/DeviceLibrary/storeBean/boxBean/BoxEquip_ConnectServerTimer.cs

@@ -21,7 +21,7 @@ namespace OnlineStore.DeviceLibrary
             serverConnectTimer = new System.Timers.Timer();
             serverConnectTimer = new System.Timers.Timer();
             serverConnectTimer.Interval = 1000;
             serverConnectTimer.Interval = 1000;
             serverConnectTimer.AutoReset = true;
             serverConnectTimer.AutoReset = true;
-            serverConnectTimer.Enabled = false;
+            serverConnectTimer.Enabled = true;
             serverConnectTimer.Elapsed += server_connect_timer_Tick;
             serverConnectTimer.Elapsed += server_connect_timer_Tick;
         }
         }
         internal void SetConnectServerTimer(bool open)
         internal void SetConnectServerTimer(bool open)
@@ -120,6 +120,18 @@ namespace OnlineStore.DeviceLibrary
                 lastBarcode = "";
                 lastBarcode = "";
             }
             }
 
 
+            if (MoveInfo.MoveType.Equals(MoveType.InStore)||MoveInfo.MoveType.Equals(MoveType.OutStore))
+            {
+                if ((MoveInfo.MoveParam != null)&&( MoveInfo.MoveParam.PosInfo!=null))
+                {
+                    if (!boxStatus.data.ContainsKey(ParamDefine.posId))
+                    {
+                        boxStatus.data.Add(ParamDefine.posId, MoveInfo.MoveParam.PosInfo.PosId);
+                    }
+                    boxStatus.data.Add(ParamDefine.code, MoveInfo.MoveParam.PosInfo.barcode);
+                }
+            }
+
             //温湿度
             //温湿度
             //ASTemperateParam param = HumitureServer.GetTemperateParam(Config.Temperate_Serveraddress);
             //ASTemperateParam param = HumitureServer.GetTemperateParam(Config.Temperate_Serveraddress);
             HumitureParam param = humBean.LastData;
             HumitureParam param = humBean.LastData;