From 847574e092ed2b348dac7d8b32e314fd35007c03 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 04 一月 2022 13:30:48 +0800
Subject: [PATCH] #

---
 static/js/app.js               |   14 --------------
 static/js/object/StoreGoods.js |    9 +++------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/static/js/app.js b/static/js/app.js
index 7a25951..0520b6a 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -336,20 +336,6 @@
 							if (line.bins !== null) {
 								new StoreGoods(object, line.bins, shelf);
 							}
-							//鏄剧ず搴撲綅涓婄殑璐х墿
-							// for (var bin of line.bins) {
-							// 	let existGoods=this.getExistedGoodType(bin.State);
-							// 	let storeGoods = new StoreGoods(optionGroup, bin);
-							// 	if(existGoods==null) {
-							// 		let goods=storeGoods.create();
-							// 		object.addObject(goods);
-							// 		this.goodTypes.push({type: bin.State, object: goods});
-							// 	} else {
-							// 		let goods= storeGoods.clone(existGoods);
-							// 		object.addObject(goods);
-							// 	}
-							// }
-
 						}
 					}
 					this.firstTime = 0;
diff --git a/static/js/object/StoreGoods.js b/static/js/object/StoreGoods.js
index dcd5c3a..9741678 100644
--- a/static/js/object/StoreGoods.js
+++ b/static/js/object/StoreGoods.js
@@ -38,18 +38,15 @@
                         }
                     });
                     obj.scale.set(4, 4, 3.5);
-                    obj.position.x = -1;
-                    obj.position.y = 22;
-                    obj.position.z = -46;
 
                     palletList.map(item => {
-                        var clone = obj.clone();
+                        let clone = obj.clone();
                         let positionX = that.shelf.positionX || 0;
-                        let positionY = that.shelf.positionY || 0;
+                        let positionY = that.shelf.bottomHight + (item.lev1-1)*that.shelf.binHeight || 0;
                         let positionZ = that.shelf.positionZ || 0;
 
                         clone.position.x = -18 + positionX;
-                        clone.position.y = 22 + positionY;
+                        clone.position.y = 2 + positionY;
                         clone.position.z = -46 + positionZ;
                         that.object.addObject(clone);
                     })

--
Gitblit v1.9.1