1

source/DeviceLibrary/storeBean/boxBean/BoxEquip_Partial.cs

@@ -64,7 +64,7 @@ namespace OnlineStore.DeviceLibrary
         /// <returns></returns>
         private bool CheckASide()
         {
-            if (MoveInfo.MoveParam.PosInfoBack.GetPosSide().Equals("A"))
+            if (MoveInfo.MoveParam.PosInfo.GetPosSide().Equals("A"))
                 return true;
             return false;
         }
@@ -75,7 +75,7 @@ namespace OnlineStore.DeviceLibrary
         /// <returns></returns>
         private bool CheckASide(InOutParam param)
         {
-            if (param.PosInfoBack.GetPosSide().Equals("A"))
+            if (param.PosInfo.GetPosSide().Equals("A"))
                 return true;
             return false;
         }
@@ -479,7 +479,7 @@ namespace OnlineStore.DeviceLibrary
             BoxPosition position = CSVPositionReader<BoxPosition>.GetPositon(MoveInfo.MoveParam.PosInfo.PosId);
             if (position != null)
             {
-                diff = position.BagHigh - MoveInfo.MoveParam.PosInfoBack.PlateH;
+                diff = position.BagHigh - MoveInfo.MoveParam.PosInfo.PlateH;
                 if (diff < 0) diff = 0;
                 LogInfo($"{MoveInfo.MoveParam.PosInfo.PosId}库位高度：{position.BagHigh}，料盘高度：{MoveInfo.MoveParam.PosInfo.PlateH}，差值：{diff}，系数：{comAxis_offset}，" +
                     $"实际值：{MoveInfo.MoveParam.MoveP.ComAxis_AB_P3 + diff * comAxis_offset}={MoveInfo.MoveParam.MoveP.ComAxis_AB_P3}加{diff * comAxis_offset}");
@@ -748,7 +748,7 @@ namespace OnlineStore.DeviceLibrary
             row = GetRowByPosition(side);
             PosId = $"{CID}{side}{row.ToString().PadLeft(2, '0')}{col.ToString().PadLeft(2, '0')}0101";
             MoveInfo.MoveParam = new InOutParam(new InOutPosInfo("Reset", PosId));
-            MoveInfo.MoveParam.MoveP = new LineMoveP(Config, MoveInfo.MoveParam.PosInfoBack.PosId);
+            MoveInfo.MoveParam.MoveP = new LineMoveP(Config, MoveInfo.MoveParam.PosInfo.PosId);
             if (hookA && atAside)
             {
                 return true;
@@ -975,13 +975,13 @@ namespace OnlineStore.DeviceLibrary
                 return false;
             }
             startInStoreTime = DateTime.Now;
-            LogInfo(" 启动入库【" + param.PosInfoBack.ToStr() + "】 ");
-            param.MoveP = new LineMoveP(Config, param.PosInfoBack.PosId);
+            LogInfo(" 启动入库【" + param.PosInfo.ToStr() + "】 ");
+            param.MoveP = new LineMoveP(Config, param.PosInfo.PosId);
             // LogInfo("LoadInoutParam:" + JsonHelper.SerializeObject(param.MoveP));
             MoveInfo.NewMove(MoveType.InStore, param);
             ///开始记录
             StartRecord();
-            SetBoxStatus(DeviceStatus.InStoreExecute, RunStatus.Busy, param.PosInfoBack.PosId, param.PosInfoBack.barcode);
+            SetBoxStatus(DeviceStatus.InStoreExecute, RunStatus.Busy, param.PosInfo.PosId, param.PosInfo.barcode);
             if (param.PosInfoBack != null)
                 MoveInfo.NextMoveStep(StepEnum.SIB_00_StartInstore);
             else
@@ -992,18 +992,18 @@ namespace OnlineStore.DeviceLibrary
 
         private bool InDoorCheck(InOutParam param)
         {
-            if (param.PosInfoBack == null)
+            if (param.PosInfo == null)
                 return false;
             if (CheckASide(param))
             {
-                if (IOValue(IO_Type.FeedingA_Instore_UpperArea_ReelCheck).Equals(IO_VALUE.HIGH) && param.PosInfoBack != null)
+                if (IOValue(IO_Type.FeedingA_Instore_UpperArea_ReelCheck).Equals(IO_VALUE.HIGH) && param.PosInfo != null)
                 {
                     return true;
                 }
             }
             else
             {
-                if (IOValue(IO_Type.FeedingB_Instore_UpperArea_ReelCheck).Equals(IO_VALUE.HIGH) && param.PosInfoBack != null)
+                if (IOValue(IO_Type.FeedingB_Instore_UpperArea_ReelCheck).Equals(IO_VALUE.HIGH) && param.PosInfo != null)
                 {
                     return true;
                 }
@@ -1096,16 +1096,16 @@ namespace OnlineStore.DeviceLibrary
         /// <returns></returns>
         private bool OutDoorCheck(InOutParam param)
         {
-            if (param.PosInfoBack == null)
+            if (param.PosInfo == null)
                 return false;
-            if (param.PosInfoBack.GetPosSide().Equals("A"))//A面
+            if (param.PosInfo.GetPosSide().Equals("A"))//A面
             {
                 if (CheckAOutDoor())
                 {
                     return true;
                 }
             }
-            else if (param.PosInfoBack.GetPosSide().Equals("B"))//B面
+            else if (param.PosInfo.GetPosSide().Equals("B"))//B面
             {
                 if (CheckBOutDoor())
                 {
@@ -1117,7 +1117,7 @@ namespace OnlineStore.DeviceLibrary
         }
         private bool BothOutDoorCheck(InOutParam param)
         {
-            if (param.PosInfoBack == null || param.PosInfoBack == null)
+            if (param.PosInfo == null || param.PosInfo == null)
                 return false;
 
             if (CheckAOutDoor() && CheckBOutDoor())
@@ -1161,24 +1161,24 @@ namespace OnlineStore.DeviceLibrary
             {
                 lock (outStoreObject)
                 {
-                    if (MoveInfo.MoveType.Equals(MoveType.OutStore) && MoveInfo.MoveParam.PosInfoBack.PosId.Equals(param.PosInfoBack.PosId))
+                    if (MoveInfo.MoveType.Equals(MoveType.OutStore) && MoveInfo.MoveParam.PosInfo.PosId.Equals(param.PosInfo.PosId))
                     {
-                        LogUtil.error(Name + " 出库命令【" + param.PosInfoBack.ToStr() + "】重复，【" + MoveInfo.MoveParam.PosInfoBack.PosId + "】出库执行中");
+                        LogUtil.error(Name + " 出库命令【" + param.PosInfo.ToStr() + "】重复，【" + MoveInfo.MoveParam.PosInfo.PosId + "】出库执行中");
                         return;
                     }
 
                     List<InOutParam> reviceList = new List<InOutParam>();
                     reviceList.AddRange(waitAOutStoreList);
                     reviceList.AddRange(waitBOutStoreList);
-                    reviceList = (from m in reviceList where m.PosInfoBack.PosId.Equals(param.PosInfoBack.PosId) select m).ToList<InOutParam>();
+                    reviceList = (from m in reviceList where m.PosInfo.PosId.Equals(param.PosInfo.PosId) select m).ToList<InOutParam>();
                     if (reviceList.Count == 0)
                     {
-                        LogInfo(" 执行出库【" + param.PosInfoBack.ToStr() + "】失败，加入等待队列");
-                        if (param.PosInfoBack.GetPosSide().Equals("A"))
+                        LogInfo(" 执行出库【" + param.PosInfo.ToStr() + "】失败，加入等待队列");
+                        if (param.PosInfo.GetPosSide().Equals("A"))
                         {
                             waitAOutStoreList.Enqueue(param);
                         }
-                        else if (param.PosInfoBack.GetPosSide().Equals("B"))
+                        else if (param.PosInfo.GetPosSide().Equals("B"))
                         {
                             waitBOutStoreList.Enqueue(param);
                         }
@@ -1212,16 +1212,16 @@ namespace OnlineStore.DeviceLibrary
                 return false;
             }
 
-            if (!param.PosInfoBack.CheckPosition())
+            if (!param.PosInfo.CheckPosition())
             {
-                SetWarnMsg(Name + " 启动出库【" + param.PosInfoBack.ToStr() + "】出错，找不到库位信息");
+                SetWarnMsg(Name + " 启动出库【" + param.PosInfo.ToStr() + "】出错，找不到库位信息");
                 return false;
             }
             startOutStoreTime = DateTime.Now;
-            param.MoveP = new LineMoveP(Config, param.PosInfoBack.PosId);
-            SetBoxStatus(DeviceStatus.OutStoreExecute, RunStatus.Busy, param.PosInfoBack.PosId, param.PosInfoBack.barcode);
+            param.MoveP = new LineMoveP(Config, param.PosInfo.PosId);
+            SetBoxStatus(DeviceStatus.OutStoreExecute, RunStatus.Busy, param.PosInfo.PosId, param.PosInfo.barcode);
             MoveInfo.NewMove(MoveType.OutStore, param);
-            LogInfo("启动出库【" + param.PosInfoBack.ToStr() + "】  ");
+            LogInfo("启动出库【" + param.PosInfo.ToStr() + "】  ");
             ///开始记录
             StartRecord();
             //LogInfo("LoadInoutParam:" + JsonHelper.SerializeObject(param.MoveP));