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 |   56 ++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/static/js/object/StoreGoods.js b/static/js/object/StoreGoods.js
index 63b412e..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;
 
 /**
@@ -65,13 +63,26 @@
                 clone.name = item.loc_no + "-" + "Pallet";
                 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";
                 break;
@@ -116,13 +127,26 @@
                 clone.name = item.loc_no + "-" + "Goods";
                 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";
                 break;

--
Gitblit v1.9.1