出库完成必须上报完成再动作

source/DeviceLibrary/storeBean/boxBean/BoxEquip_ConnectServerTimer.cs

@@ -73,35 +73,42 @@ namespace OnlineStore.DeviceLibrary
                 isInProcess = false;
                 isInProcess = false;
             }
             }
         }
         }
-        public bool SendStoreState(string posid, DeviceStatus storeStatus)
+        public bool SendStoreState(string posid,DeviceStatus storeStatus)
         {
         {
             if (Monitor.TryEnter(serverLoc))
             if (Monitor.TryEnter(serverLoc))
             {
             {
                 try
                 try
                 {
                 {
-                    Operation operation = getLineBoxStatus();
-                    for (int i = 0; i < 5; i++)
                     {
                     {
-                        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 operation = getLineBoxStatus();
+                        for (int i = 0; i < 5; i++)
                         {
                         {
-                            operation.boxStatus[1].data[ParamDefine.posId] = posid;
-                        }
-                        operation.boxStatus[1].status = (int)storeStatus;
-                        LogUtil.info(JsonHelper.SerializeObject(operation));
-                        Operation resultOperation = HttpHelper.Post(SServerManager.GetPostApi(server), operation, false);
-                        if (operation.seq == resultOperation.seq)
-                        {
-                            LogUtil.info($"SendStoreState,posid:{posid}, storeStatus:{storeStatus}");
-                            return true;
-                        }
-                        else
-                        {
-                            LogUtil.info($"SendStoreState error,posid:{posid}, storeStatus:{storeStatus}");
-                            Thread.Sleep(2000);
+                            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;
+                            }
+                            operation.boxStatus[1].status = (int)storeStatus;
+                            LogUtil.info(JsonHelper.SerializeObject(operation));
+                            Operation resultOperation = HttpHelper.Post(SServerManager.GetPostApi(server), operation, false);
+                            if(resultOperation != null)
+                            {
+                                if (operation.seq == resultOperation.seq)
+                                {
+                                    LogUtil.info($"SendStoreState success,posid:{posid}, storeStatus:{storeStatus}");
+                                    return true;
+                                }
+                                else
+                                {
+                                    LogUtil.info($"SendStoreState error,posid:{posid}, storeStatus:{storeStatus}");
+                                    Thread.Sleep(2000);
+                                }
+                            }
+
                         }
                         }
                     }
                     }
+
                 }
                 }
                 finally
                 finally
                 {
                 {

source/DeviceLibrary/storeBean/boxBean/BoxEquip_OutExecute.cs

@@ -275,6 +275,8 @@ namespace OnlineStore.DeviceLibrary
                     UpdownAxisTo_P5_P11();
                     UpdownAxisTo_P5_P11();
                     break;
                     break;
                 case StepEnum.SO_18_PutReel:
                 case StepEnum.SO_18_PutReel:
+                    if (!StoreManager.XLRStore.boxEquip.SendStoreState(MoveInfo.MoveParam.PosInfo.PosId, DeviceStatus.OutStoreBoxEnd))
+                        return;
                     MoveInfo.NextMoveStep(StepEnum.SO_19_InOutBackFromBuff);
                     MoveInfo.NextMoveStep(StepEnum.SO_19_InOutBackFromBuff);
                     LogInfo($"出库 {MoveInfo.SLog}：[{MoveInfo.MoveParam.PosInfo.ToStr()}]出库完成[耗时：{(DateTime.Now - startTime).TotalSeconds.ToString("f2")}秒],移栽X轴到待机点P1,行走机构到待机点P1[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
                     LogInfo($"出库 {MoveInfo.SLog}：[{MoveInfo.MoveParam.PosInfo.ToStr()}]出库完成[耗时：{(DateTime.Now - startTime).TotalSeconds.ToString("f2")}秒],移栽X轴到待机点P1,行走机构到待机点P1[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
                     XAxis_To_P1();
                     XAxis_To_P1();