20220928

source/DeviceLibrary/manager/SServerManager.cs

@@ -516,9 +516,9 @@ namespace OnlineStore.DeviceLibrary
                 //判断是否不连接服务器
                 if (string.IsNullOrEmpty(serverAddr))
                 {
-                    LogUtil.error(deviceName + "GetPosId[" + codeStr + "][" + height + "][" + width + "]：未找到服务器地址 ");
+                    LogUtil.error(deviceName + "GetPosId[" + codeStr + "][" + width + "][" + height + "]：未找到服务器地址 ");
                     result.Msg = "未找到服务器地址";
-                    result.Param = InOutPosInfo.NewNgPos(codeStr, "", height, width, "");
+                    result.Param = InOutPosInfo.NewNgPos(codeStr, "", width , height, "");
                     return result;
                 }
 
@@ -549,7 +549,7 @@ namespace OnlineStore.DeviceLibrary
                 {
                     result.Msg = deviceName + "  【" + codeStr + "】结果：没有收到服务器反馈，调用 cancelPutInTask ";
                     cancelPutInTask(deviceName, codeStr);
-                    result.Param = InOutPosInfo.NewNgPos(codeStr, "", height, width, "没有收到服务器反馈");
+                    result.Param = InOutPosInfo.NewNgPos(codeStr, "", width, height, "没有收到服务器反馈");
                     result.Param.rfid = rfid;
                     result.Param.IsNG = true;
                     return result;
@@ -570,7 +570,7 @@ namespace OnlineStore.DeviceLibrary
 
                     result.Msg ="收到出库信息["+ serverResult.barcode + "][" + serverResult.posId + "] ";
                     cancelPutInTask(deviceName, codeStr);
-                    result.Param = InOutPosInfo.NewNgPos(codeStr, "", height, width, "收到出库信息[" + serverResult.barcode + "][" + serverResult.posId + "]");
+                    result.Param = InOutPosInfo.NewNgPos(codeStr, "", width , height, "收到出库信息[" + serverResult.barcode + "][" + serverResult.posId + "]");
                     result.Param.rfid = rfid;
                     result.Param.IsNG = true;
                     return result; 
@@ -580,7 +580,7 @@ namespace OnlineStore.DeviceLibrary
                     result.Result = serverResult.result;
                     //result.Msg = deviceName + "  【" + codeStr + "】结果：" + serverResult.msg;
                     result.Msg = serverResult.msg;
-                    result.Param = InOutPosInfo.NewNgPos(codeStr, "", height, width, serverResult.msg);
+                    result.Param = InOutPosInfo.NewNgPos(codeStr, "", width, height, serverResult.msg);
                     result.Param.rfid = rfid;
                     return result;
                 }

source/DeviceLibrary/storeBean/boxBean/BoxEquip_PosDebug.cs

@@ -36,37 +36,6 @@ namespace OnlineStore.DeviceLibrary
             PullAxis_Inout_To_P1();
         }
 
-        //public void Test()
-        //{
-        //    Random random = new Random();
-        //    Task.Factory.StartNew(new Action(delegate
-        //    {
-        //        while (!posDebugInfo.IsLastDrawer())
-        //        {
-        //            while (!posDebugInfo.IsLastGrid())
-        //            {
-        //                PosDebugResultManager.SetGridResult(posDebugInfo.CurGrid, 1);
-        //                posDebugInfo.NextGrid();
-        //                System.Threading.Thread.Sleep(500);
-        //            }
-        //            PosDebugResultManager.SetGridResult(posDebugInfo.CurGrid, 1);
-        //            PosDebugResultManager.SetDrawerResult(posDebugInfo.CurDrawer, 1);
-        //            PosDebugResultManager.SetDrawerResultWithGrid(posDebugInfo.CurDrawer);
-        //            posDebugInfo.NextDrawer();
-        //            System.Threading.Thread.Sleep(500);
-        //        }
-        //        while (!posDebugInfo.IsLastGrid())
-        //        {
-        //           PosDebugResultManager.SetGridResult(posDebugInfo.CurGrid, 1);//random.Next(0, 2)
-        //            posDebugInfo.NextGrid();
-        //            System.Threading.Thread.Sleep(500);
-        //        }
-        //        PosDebugResultManager.SetGridResult(posDebugInfo.CurGrid, 1);
-        //        PosDebugResultManager.SetDrawerResultWithGrid(posDebugInfo.CurDrawer);
-        //        posDebugInfo.NextDrawer();
-        //    }));
-        //    PosDebugResultManager.SaveResult();
-        //}
         /// <summary>
         /// 更新移动信息
         /// </summary>

source/DeviceLibrary/storeBean/inputBean/BatchMoveBean_Partial.cs

@@ -528,7 +528,7 @@ namespace OnlineStore.DeviceLibrary
             }
 
             //如果检测出<=15,都按照8计算
-            if (height <= 15)
+            if (height <= 12)
             {
                 LastHeight = 8;
             }