From 95b5cc27cea4d2f846883738789cebf29246b738 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 09 五月 2024 14:34:10 +0800
Subject: [PATCH] #
---
src/assets/data/agv.js | 6 +-
src/config/setting.js | 2
src/core/warehouse.jsx | 2
src/components/agv.jsx | 89 ++++++++++++++++++++++----------------------
4 files changed, 50 insertions(+), 49 deletions(-)
diff --git a/src/assets/data/agv.js b/src/assets/data/agv.js
index fce6d91..946b2ba 100644
--- a/src/assets/data/agv.js
+++ b/src/assets/data/agv.js
@@ -3,10 +3,10 @@
{
no: 1,
position: [3300, 0, 100],
- theta: 0,
- height: 2320,
+ theta: 90,
+ height: 1778,
loaderTheta: 0,
- forkLength: -500,
+ forkLength: -800,
trayList: [
{
no: 1,
diff --git a/src/components/agv.jsx b/src/components/agv.jsx
index fb1d7fe..137ce38 100644
--- a/src/components/agv.jsx
+++ b/src/components/agv.jsx
@@ -32,57 +32,58 @@
const getLoaderHasBox = (loaderAngle, finger1, finger2, finger3, finger4) => {
// console.log(loaderAngle, finger1, finger2, finger3, finger4);
if (loaderAngle > 360 - 10 || loaderAngle < 0 + 10) {
- return finger1 && finger2; // 鍙栬揣鏄鐨� 鏀捐揣鏄鐨�
+ return finger1 && finger2; // 鍙栬揣鏄鐨� 鏀捐揣鏄敊鐨� 锛堝彸锛�
+ /**
+ * 2鎺� (0)
+ *
+ * 鍙栬揣
+ * 0 false false false false
+ * 0 false false true true
+ * 0 true true true true
+ *
+ * 鏀捐揣
+ *
+ * 0 true true true true
+ * 0 false false true true
+ * 0 false false false false
+ *
+ */
}
if (loaderAngle > 180 - 10 && loaderAngle < 180 + 10) {
- return finger3 && finger4; // 鏀捐揣鏄鐨� 鍙栬揣鏄敊鐨�
- /**
- * 鏀捐揣 锛堝乏杈癸級
- * 34agv.jsx:33 180 false false true true
-warehouse.jsx:29 do
-35agv.jsx:33 180 false false true true
-warehouse.jsx:29 do
-32agv.jsx:33 180 false false true true
-warehouse.jsx:29 do
-39agv.jsx:33 180 false false true true
-warehouse.jsx:29 do
-34agv.jsx:33 180 false false true true
-warehouse.jsx:29 do
-38agv.jsx:33 180 false false true true
-warehouse.jsx:29 do
-agv.jsx:33 180 false false true true
-36agv.jsx:33 180 false false false false
-warehouse.jsx:29 do
-30agv.jsx:33 180 false false false false
-warehouse.jsx:29 do
-37agv.jsx:33 180 false false false false
-warehouse.jsx:29 do
-4agv.jsx:33 180 false false false false
-warehouse.jsx:29 do
-36agv.jsx:33 180 false false false false
-
+ return finger3 && finger4; // 鏀捐揣鏄鐨� 鍙栬揣鏄敊鐨� 锛堝乏锛�
+ /**
+ * 1銆�3鎺� (180)
*
- *
- * 鍙栬揣锛堝乏杈癸級
+ * 鍙栬揣
+ * 180 false false false false
* 180 false false true true
-warehouse.jsx:29 do
-30agv.jsx:33 180 false false true true
-warehouse.jsx:29 do
-31agv.jsx:33 180 false false true true
-warehouse.jsx:29 do
-4agv.jsx:33 180 false false true true
-32agv.jsx:33 180 true true true true
-warehouse.jsx:29 do
-34agv.jsx:33 180 true true true true
-warehouse.jsx:29 do
-2agv.jsx:33 180 true true true true
+ * 180 true true true true
+ *
+ * 鏀捐揣
+ * 180 false false true true
+ * 180 false false false false
+ *
+ */
+ }
+ if (loaderAngle > 90 - 10 && loaderAngle < 90 + 10) {
+ return finger1 && finger2; // 鏀捐揣鏄鐨� 鍙栬揣鏄敊鐨� 锛堜腑锛�
+ /**
+ * 鑳岀瘬 (90)
+ *
+ * 鍙栬揣
+ * 90 true true false false
+ * 90 true true true true
+ *
+ * 鏀捐揣
+ *
+ * 90 true true true true
+ * 90 true true false false
+ * 90 false false false false
+ *
*/
}
if (loaderAngle > 270 - 10 && loaderAngle < 270 + 10) {
return finger1 && finger2;
- }
- if (loaderAngle > 90 - 10 && loaderAngle < 90 + 10) {
- return finger1 && finger2; // 鏀捐揣鏄鐨�
}
return finger1 && finger2 && finger3 && finger4;
}
@@ -91,7 +92,7 @@
const { agvNo, position, trayList, hasBox, finger1, finger2, finger3, finger4 } = props;
const theta = -props.theta;
const height = props.height * 0.0655;
- const forkLength = props.forkLength * 0.1;
+ const forkLength = props.forkLength * 0.077;
// console.log(props.forkLength);
const loaderTheta = Number(props.loaderTheta?.toFixed(1));
diff --git a/src/config/setting.js b/src/config/setting.js
index c5ec995..6b47d4e 100644
--- a/src/config/setting.js
+++ b/src/config/setting.js
@@ -31,7 +31,7 @@
export const SHELF_BAY_GROUP_COUNT = 3;
-export const SHELF_BAY_UNIT_SEPARTE_DISTANCE = 55;
+export const SHELF_BAY_UNIT_SEPARTE_DISTANCE = 54;
export const SHELF_HEIGHT_FROM_GROUND = 32;
diff --git a/src/core/warehouse.jsx b/src/core/warehouse.jsx
index 6e281b5..45969b1 100644
--- a/src/core/warehouse.jsx
+++ b/src/core/warehouse.jsx
@@ -35,7 +35,7 @@
// lev: 1,
// locSts: "STOCK",
// })
- // setBoxData(res);
+ setBoxData(res);
})
getAgvData().then(res => {
--
Gitblit v1.9.1