Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack

Junjie

2024-04-03 46887b3db52f011cdf740ead100e7ae467b5c5a6

Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack

 zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js

@@ -190,20 +190,24 @@
    generateMesh = (fn) => {
        // fn(this.addObject);
        const loader = new FBXLoader();
        loader.load('model/001-5.fbx', (mesh) => {
            mesh.position.set(0, 10, 0);
            mesh.scale.set(5, 5, 5);
            mesh.name = '0100101';
            // mesh.rotation.x = Utils.rotationParseNum(270);
            mesh.traverse(function (child) {
                if (child.isMesh) {
                    child.name = '0100101';
                    child.castShadow = true;
                    child.receiveShadow = true;
                }
            });
            this.addObject(mesh);
        const promise = new Promise((resolve) => {
            loader.load('model/001-5.fbx', (mesh) => {
                mesh.position.set(0, 10, 0);
                mesh.scale.set(5, 5, 5);
                mesh.name = '1-1-1';
                // mesh.rotation.x = Utils.rotationParseNum(270);
                mesh.traverse(function (child) {
                    if (child.isMesh) {
                        child.name = '1-1-1';
                        child.castShadow = true;
                        child.receiveShadow = true;
                    }
                });
                this.addObject(mesh);
                resolve();
            })
        })
        return promise;
    }

    setNewSelectedMesh = (objName) => {

 zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx

@@ -78,8 +78,9 @@
                palletMesh.position.set(0, 70 + 100 * (lev - 1), 0);
                addObject(palletMesh)
            }
        }).then(() => {
            shelfThree.setNewSelectedMesh(locNo);
        });
        shelfThree.setNewSelectedMesh(locNo);
    }
}