优化

source/DeviceLibrary/manager/SServerManager.cs

@@ -629,7 +629,7 @@ namespace OnlineStore.DeviceLibrary
             try
             {                
                 Dictionary<string, string> paramMap = new Dictionary<string, string>();
-                paramMap.Add("cids", StoreManager.Config.CID);
+                paramMap.Add("cid", StoreManager.Config.CID);
                 paramMap.Add("hSerial", hSerial);
 
                 string server = GetAddr("/service/store/outTaskCount", paramMap);

source/DeviceLibrary/storeBean/boxBean/BoxEquip_ConnectServerTimer.cs

@@ -60,7 +60,7 @@ namespace OnlineStore.DeviceLibrary
                         SendLineStatus();
                         HttpHelper.Post<DoorInfo>(HttpHelper.GetPostApi("/api/xlc/updateDoorInfo"), StoreManager.XLRStore.inputEquip.BatchMove_A.doorInfo);
                         HttpHelper.Post<DoorInfo>(HttpHelper.GetPostApi("/api/xlc/updateDoorInfo"), StoreManager.XLRStore.inputEquip.BatchMove_B.doorInfo);
-                        
+
                     }
                 }
             }
@@ -76,8 +76,12 @@ namespace OnlineStore.DeviceLibrary
         public void SendStoreState(string posid, DeviceStatus storeStatus)
         {
             Operation operation = getLineBoxStatus();
-            if (!string.IsNullOrEmpty(posid))
+            if (!string.IsNullOrEmpty(posid) && !operation.boxStatus[1].data.ContainsKey(ParamDefine.posId))
                 operation.boxStatus[1].data.Add(ParamDefine.posId, posid);
+            else if (!string.IsNullOrEmpty(posid) && operation.boxStatus[1].data.ContainsKey(ParamDefine.posId))
+            {
+                operation.boxStatus[1].data[ParamDefine.posId] = posid;
+            }
             LogUtil.info($"SendStoreState,posid:{posid}, storeStatus:{storeStatus}");
             operation.boxStatus[1].status = (int)storeStatus;
 
@@ -127,26 +131,26 @@ namespace OnlineStore.DeviceLibrary
             else if (runStatus.Equals(DeviceStatus.OutStoreBoxEnd) || runStatus.Equals(DeviceStatus.InStoreEnd))
             {
                 boxStatus.data.Add(ParamDefine.posId, lastPosId);
-                boxStatus.data.Add(ParamDefine.barcode,lastBarcode);
+                boxStatus.data.Add(ParamDefine.barcode, lastBarcode);
                 boxStatus.data.Add(ParamDefine.executeTime, executeTime);
             }
             else if (!lastPosId.Equals(""))
             {
                 boxStatus.data.Add(ParamDefine.posId, lastPosId);
                 boxStatus.data.Add(ParamDefine.barcode, lastBarcode);
-                boxStatus.data.Add(ParamDefine.executeTime,executeTime);
+                boxStatus.data.Add(ParamDefine.executeTime, executeTime);
                 boxStatus.status = (int)deviceStatus;
                 if (lastPosId != "")
                 {
-                    LogUtil.info("给服务器发送出入库消息：" + Name + ",status【" + deviceStatus + "】posId【" + lastPosId + "】barcode【"+lastBarcode+"】");
+                    LogUtil.info("给服务器发送出入库消息：" + Name + ",status【" + deviceStatus + "】posId【" + lastPosId + "】barcode【" + lastBarcode + "】");
                 }
                 lastPosId = "";
                 lastBarcode = "";
             }
 
-            if (MoveInfo.MoveType.Equals(MoveType.InStore)||MoveInfo.MoveType.Equals(MoveType.OutStore))
+            if (MoveInfo.MoveType.Equals(MoveType.InStore) || MoveInfo.MoveType.Equals(MoveType.OutStore))
             {
-                if ((MoveInfo.MoveParam != null)&&( MoveInfo.MoveParam.PosInfo!=null))
+                if ((MoveInfo.MoveParam != null) && (MoveInfo.MoveParam.PosInfo != null))
                 {
                     if (!boxStatus.data.ContainsKey(ParamDefine.posId))
                     {
@@ -186,14 +190,14 @@ namespace OnlineStore.DeviceLibrary
                         vals.Add("humidity", humitureParams[i].Humidity.ToString());
                         vals.Add("temperature", humitureParams[i].Temperate.ToString());
                         valuePairs.Add(vals);
-                    }                  
+                    }
                     boxStatus.data.Add(ParamDefine.humiAndtempList, JsonHelper.SerializeObject(valuePairs));
                     //LogUtil.info($"上报温湿度数据【{JsonHelper.SerializeObject(valuePairs)}】【{JsonHelper.SerializeObject(boxStatus.data)}】");
                 }
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
-                LogUtil.error("上报温湿度数据异常",ex);
+                LogUtil.error("上报温湿度数据异常", ex);
             }
             return lineOperation;
         }
@@ -278,7 +282,7 @@ namespace OnlineStore.DeviceLibrary
                     }
                     else if (resultOperation.op.Equals(1))
                     {
-                        LogUtil.info(logName + " 成功"+$"【{JsonHelper.SerializeObject(resultOperation)}】");
+                        LogUtil.info(logName + " 成功" + $"【{JsonHelper.SerializeObject(resultOperation)}】");
                         return true;
                     }
                     else
@@ -360,8 +364,8 @@ namespace OnlineStore.DeviceLibrary
                     try
                     {
                         //判断是否接收过此库位的出库信息
-                        if (MoveInfo.MoveType.Equals(MoveType.OutStore) && (MoveInfo.MoveParam.PosInfo.PosId.Equals(posId)|| 
-                            (MoveInfo.MoveParam.PosInfoBack !=null && MoveInfo.MoveParam.PosInfoBack.PosId.Equals(posId))))
+                        if (MoveInfo.MoveType.Equals(MoveType.OutStore) && (MoveInfo.MoveParam.PosInfo.PosId.Equals(posId) ||
+                            (MoveInfo.MoveParam.PosInfoBack != null && MoveInfo.MoveParam.PosInfoBack.PosId.Equals(posId))))
                         {
                             LogUtil.error(Name + " 出库命令【" + inoutParam.PosInfo.ToStr() + "】重复，正在【" + posId + "】出库中");
                             continue;