From 7d25d293acb4e901402ca2ec1d933518d6c29cf7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 10 五月 2024 16:33:24 +0800
Subject: [PATCH] #
---
src/components/agv.jsx | 147 +++++++++++++++++++++++++++++++-----------------
1 files changed, 94 insertions(+), 53 deletions(-)
diff --git a/src/components/agv.jsx b/src/components/agv.jsx
index fb1d7fe..6ecf7a0 100644
--- a/src/components/agv.jsx
+++ b/src/components/agv.jsx
@@ -20,80 +20,117 @@
if (loaderAngle > 180 - 10 && loaderAngle < 180 + 10) {
return -forkDis;
}
- if (loaderAngle > 270 - 10 && loaderAngle < 270 + 10) {
+ if (loaderAngle > 90 - 10 && loaderAngle < 90 + 10) {
return forkDis;
}
- if (loaderAngle > 90 - 10 && loaderAngle < 90 + 10) {
+ if (loaderAngle > 270 - 10 && loaderAngle < 270 + 10) {
return forkDis;
}
return forkDis;
}
-const getLoaderHasBox = (loaderAngle, finger1, finger2, finger3, finger4) => {
- // console.log(loaderAngle, finger1, finger2, finger3, finger4);
+const getLoaderHasBox = (loaderAngle, inOutFlag, finger1, finger2, finger3, finger4) => {
+ // console.log(loaderAngle, forkDis, finger1, finger2, finger3, finger4);
if (loaderAngle > 360 - 10 || loaderAngle < 0 + 10) {
- return finger1 && finger2; // 鍙栬揣鏄鐨� 鏀捐揣鏄鐨�
+ if (inOutFlag === 1) {
+ return finger1 && finger2;
+ }
+ if (inOutFlag === 2) {
+ return finger3 && finger4;
+ }
+ 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
-
+ if (inOutFlag === 1) {
+ return finger1 && finger2;
+ }
+ if (inOutFlag === 2) {
+ return finger3 && finger4;
+ }
+ 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) {
+ if (inOutFlag === 3) {
+ return finger3 && finger4;
+ }
+ if (inOutFlag === 4) {
+ return finger1 && finger2;
+ }
+ 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;
}
+const forkLengthFn = (forkLen, loaderAngle) => {
+ let maxVal = 800;
+ if (loaderAngle > 360 - 10 || loaderAngle < 0 + 10) {
+ maxVal = 1100;
+ }
+ if (loaderAngle > 180 - 10 && loaderAngle < 180 + 10) {
+ maxVal = 1100;
+ }
+ if (loaderAngle > 90 - 10 && loaderAngle < 90 + 10) {
+ maxVal = 800;
+ }
+ if (loaderAngle > 270 - 10 && loaderAngle < 270 + 10) {
+ maxVal = 0;
+ }
+ if (forkLen < 0) {
+ return -maxVal * 0.077;
+ } else if (forkLen > 0) {
+ return maxVal * 0.077;
+ } else {
+ return 0;
+ }
+}
+
const Agv = (props) => {
- const { agvNo, position, trayList, hasBox, finger1, finger2, finger3, finger4 } = props;
+ const { agvNo, position, trayList, hasBox, finger1, finger2, finger3, finger4, inOutFlag } = props;
const theta = -props.theta;
const height = props.height * 0.0655;
- const forkLength = props.forkLength * 0.1;
- // console.log(props.forkLength);
- const loaderTheta = Number(props.loaderTheta?.toFixed(1));
const [groupPos, setGroupPos] = useState({ x: 0, y: 0, z: 0 });
const [groupTheta, setGroupTheta] = useState(0);
@@ -106,6 +143,8 @@
if (!props || Object.keys(props).length === 0) {
return;
}
+
+ console.log(props.taskShelfBarcode);
// group position
const pos = {
@@ -153,7 +192,7 @@
}
// loader theta
- const loaderTargetTheta = Common.normalizeAngle(loaderTheta + 90);
+ const loaderTargetTheta = Common.normalizeAngle(Number(props.loaderTheta?.toFixed(1)) + 90);
if (loaderAngle !== loaderTargetTheta && props.loaderTheta !== null) {
new TWEEN.Tween({ value: loaderAngle })
.to({ value: loaderTargetTheta }, INTERVAL_TIME)
@@ -167,6 +206,8 @@
}
// fork lenght
+ const forkLength = props.forkLength * 0.077;
+ // const forkLength = forkLengthFn(props.forkLength, loaderTargetTheta);
if (forkDis !== forkLength && props.forkLength !== null) {
const targetForkDis = getCorrectForkDis(Common.positiveAngle(loaderTargetTheta), forkLength);
new TWEEN.Tween({ value: forkDis })
@@ -231,7 +272,7 @@
<primitive object={loaderModel} castShadow position={[0, 0, 0]} />
<group position-z={forkDis}>
<primitive object={forkModel} castShadow position={[0, 6, 0]} />
- {(hasBox || getLoaderHasBox(loaderAngle, finger1, finger2, finger3, finger4)) && <Box position={[0, 6, 0]} />}
+ {(hasBox || getLoaderHasBox(loaderAngle, inOutFlag, finger1, finger2, finger3, finger4)) && <Box position={[0, 6, 0]} />}
</group>
</group>
<group>
--
Gitblit v1.9.1