From 059270c12f452fcc3344b826f35295fd7c20906e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 21 三月 2023 08:31:37 +0800
Subject: [PATCH] #
---
static/js/object/StoreGoods.js | 76 ++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/static/js/object/StoreGoods.js b/static/js/object/StoreGoods.js
index 24b85a7..f8b85aa 100644
--- a/static/js/object/StoreGoods.js
+++ b/static/js/object/StoreGoods.js
@@ -1,14 +1,12 @@
-import {MTLLoader} from "../lib/MTLLoader.js";
-import {OBJLoader} from "../lib/OBJLoader.js";
import * as THREE from '../three.module.js';
import * as BufferGeometryUtils from '../utils/BufferGeometryUtils.js';
const palletX = -2;
-const palletY = 23 - 20 - 3;
+const palletY = 0;
const palletZ = -25;
const goodsX = -2;
-const goodsY = 40 - 18;
+const goodsY = 22;
const goodsZ = -25;
/**
@@ -63,27 +61,30 @@
positionZ = (item.bay1-1)*-ref.binHeight || 0;
clone.name = item.loc_no + "-" + "Pallet";
- clone.traverse (function (child) {
- if (child instanceof THREE.Mesh) {
- child.name = item.loc_no + "-" + child.name;
- }
- })
break;
case 2:
- positionX = ref.position.x || 0;
- positionY = ref.position.y || 0;
- positionZ = ref.position.z || 0;
+ switch (ref.objectType) {
+ case 'chain':
+ positionX = ref.position.x || 0;
+ positionY = ref.position.y || 0;
+ positionZ = ref.position.z || 0;
- positionX -= 48 - 1;
- positionY += 20;
- positionZ -= 138 + 20;
+ positionX -= 48 - 1;
+ positionY += 20;
+ positionZ -= 138 + 20;
+ break
+ case 'roller':
+ positionX = ref.position.x || 0;
+ positionY = ref.position.y || 0;
+ positionZ = ref.position.z || 0;
+
+ positionY += 20;
+ break
+ default:
+ break
+ }
clone.name = item.wrkNo + "-" + "Pallet";
- clone.traverse (function (child) {
- if (child instanceof THREE.Mesh) {
- child.name = item.wrkNo + "-" + child.name;
- }
- })
break;
default:
console.error("InitPallet param[type] error ===>> " + type);
@@ -124,27 +125,30 @@
positionZ = (item.bay1-1)*-ref.binHeight || 0;
clone.name = item.loc_no + "-" + "Goods";
- clone.traverse (function (child) {
- if (child instanceof THREE.Mesh) {
- child.name = item.loc_no + "-" + child.name;
- }
- })
break;
case 2:
- positionX = ref.position.x || 0;
- positionY = ref.position.y || 0;
- positionZ = ref.position.z || 0;
+ switch (ref.objectType) {
+ case 'chain':
+ positionX = ref.position.x || 0;
+ positionY = ref.position.y || 0;
+ positionZ = ref.position.z || 0;
- positionX -= 48 - 1;
- positionY += 20;
- positionZ -= 138 + 20;
+ positionX -= 48 - 1;
+ positionY += 20;
+ positionZ -= 138 + 20;
+ break
+ case 'roller':
+ positionX = ref.position.x || 0;
+ positionY = ref.position.y || 0;
+ positionZ = ref.position.z || 0;
+
+ positionY += 20;
+ break
+ default:
+ break
+ }
clone.name = item.wrkNo + "-" + "Goods";
- clone.traverse (function (child) {
- if (child instanceof THREE.Mesh) {
- child.name = item.wrkNo + "-" + child.name;
- }
- })
break;
default:
console.error("InitGoods param[type] error ===>> " + type);
--
Gitblit v1.9.1