存储机构

source/DeviceLibrary/storeBean/boxBean/BoxEquip_InExecute.cs

@@ -133,7 +133,7 @@ namespace OnlineStore.DeviceLibrary
                     PullAxisToP1("入库");
                     break;
                 case StepEnum.SI_01_PullAxis_Ready:
-                    SetBoxStatus(DeviceStatus.InStoreExecute, RunStatus.Busy);
+                    SetBoxStatus(DeviceStatus.InStoreExecute, RunStatus.Busy,MoveInfo.MoveParam.PosInfo.PosId);
                     MoveInfo.NextMoveStep(StepEnum.SI_01_Pull_Updown_ToPosition);
                     if (!IsMoveAxisInSafePos())
                     {
@@ -280,7 +280,7 @@ namespace OnlineStore.DeviceLibrary
                     MoveInfo.NextMoveStep(StepEnum.SI_15_UpDownBack);
                     LogInfo($"入库 {MoveInfo.SLog}：叉子从库位返回，[{MoveInfo.MoveParam.PosInfo.ToStr()}]入库完成，移栽升降轴到料屉上方过度点P6/P12[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
                     //入库完成
-                    SetBoxStatus(DeviceStatus.InStoreEnd, RunStatus.Busy);
+                    SetBoxStatus(DeviceStatus.InStoreEnd, RunStatus.Busy,MoveInfo.MoveParam.PosInfo.PosId);
                     UpdownAxisTo_P6_P12();
                     break;
                 case StepEnum.SI_15_UpDownBack:

source/DeviceLibrary/storeBean/boxBean/BoxEquip_OutExecute.cs

@@ -40,7 +40,7 @@ namespace OnlineStore.DeviceLibrary
                     break;
 
                 case StepEnum.SO_01_PullAxis_Ready:
-                    SetBoxStatus(DeviceStatus.OutStoreExecute, RunStatus.Busy);
+                    SetBoxStatus(DeviceStatus.OutStoreExecute, RunStatus.Busy, MoveInfo.MoveParam.PosInfo.PosId);
                     MoveInfo.NextMoveStep(StepEnum.SO_01_MoveAxis_Ready);
                     if(!IsMoveAxisInSafePos())
                     {
@@ -216,7 +216,7 @@ namespace OnlineStore.DeviceLibrary
                     XAxis_To_P1();
                     //出库料盘放置成功，将料盘信息写入对应出料口
                     SetReelInfoToBuff();
-                    SetBoxStatus(DeviceStatus.OutStoreBoxEnd, RunStatus.Busy);
+                    SetBoxStatus(DeviceStatus.OutStoreBoxEnd, RunStatus.Busy, MoveInfo.MoveParam.PosInfo.PosId);
                     break;
                 case StepEnum.SO_19_InOutBackFromBuff:
                     if (MoveInfo.MoveParam.PosInfoBack == null)

source/DeviceLibrary/storeBean/boxBean/BoxEquip_Partial.cs

@@ -485,8 +485,10 @@ namespace OnlineStore.DeviceLibrary
         /// </summary>
         /// <param name="deviceStatus">设备上报服务端的状态</param>
         /// <param name="runStatus">设备显示的状态</param>
-        private void SetBoxStatus(DeviceStatus deviceStatus, RunStatus runStatus)
+        private void SetBoxStatus(DeviceStatus deviceStatus, RunStatus runStatus,string lastPosId="")
         {
+            if (!string.IsNullOrEmpty(lastPosId))
+                this.lastPosId = lastPosId;
             this.deviceStatus = deviceStatus;
             this.runStatus = runStatus;
         }
@@ -590,7 +592,7 @@ namespace OnlineStore.DeviceLibrary
             LogInfo("LoadInoutParam:" + JsonHelper.SerializeObject(param.MoveP));
             MoveInfo.NewMove(MoveType.InStore, param);
             IgnoreCamDect = false;
-            SetBoxStatus(DeviceStatus.InStoreExecute, RunStatus.Busy);
+            SetBoxStatus(DeviceStatus.InStoreExecute, RunStatus.Busy,param.PosInfo.PosId);
             MoveInfo.NextMoveStep(StepEnum.SI_00_StartInstore);
             return true;
         }
@@ -737,7 +739,7 @@ namespace OnlineStore.DeviceLibrary
             }
             startOutStoreTime = DateTime.Now;
             param.MoveP = new LineMoveP(Config, param.PosInfo.PosId);
-            SetBoxStatus(DeviceStatus.OutStoreExecute, RunStatus.Busy);
+            SetBoxStatus(DeviceStatus.OutStoreExecute, RunStatus.Busy,param.PosInfo.PosId);
             MoveInfo.NewMove(MoveType.OutStore, param);
             LogInfo("启动出库【" + param.PosInfo.ToStr() + "】  ");
             LogInfo("LoadInoutParam:" + JsonHelper.SerializeObject(param.MoveP));