#

luxiaotao1123

2022-06-22 967b1b51f17b94b9aaa6264d14266a73d48416ed

 static/js/object/CrnTask.js

@@ -33,6 +33,7 @@
    that.preZ = 0;
    that.prePosition = null;
    that.preForkPos = -1;    // -1, "不在定位" 0, "货叉原位" 1, "货叉在左侧远" 2, "货叉在左侧" 3, "货叉在右侧"  4, "货叉在右侧远"
    that.preLoadPos = -1;
    // 当前数据
    that.bay = 1 ;
    that.lev = 1 ;
@@ -41,6 +42,7 @@
    that.z = 0;
    that.position = null;
    that.forkPos = -1;
    that.loadPos = -1;

    that.crnBody = null;
    that.crnLoad = null;
@@ -49,6 +51,7 @@
    that.pallet = null;
    that.goods = null;

    that.wrkNo = null;
    that.sourceLocNo = null;
    that.locNo = null;

@@ -63,6 +66,7 @@
        that.z = crnData.position.z;
        that.position = crnData.position;
        that.forkPos = crnData.forkPos;
        that.loadPos = crnData.loadPos;

        that.crnBody = getArrVal(object.objects, "name", that.crnNo + "-body");
        that.crnLoad = getArrVal(object.objects, "name", that.crnNo + "-load");
@@ -81,23 +85,27 @@
        }
        if (that.crnBody===null) {
            that.crnBody = getArrVal(object.objects, "name", that.crnNo + "-body");
            // return;
            return;
        }
        if (that.crnLoad===null) {
            that.crnLoad = getArrVal(object.objects, "name", that.crnNo + "-load");
            // return;
            return;
        }
        if (that.crnFork===null) {
            that.crnFork = getArrVal(object.objects, "name", that.crnNo + "-fork");
            // return;
            return;
        }

        // 出库 / 移库
        if (crnData.sourceLocNo != null) {
            that.sourceLocNo = crnData.sourceLocNo;
            that.pallet = getArrVal(object.objects, "name", crnData.sourceLocNo + "-Pallet");
            that.goods = getArrVal(object.objects, "name", crnData.sourceLocNo + "-Goods");
        }
        if (crnData.locNo != null) {
            that.locNo = crnData.locNo;
        } else {
            // 入库
            if (crnData.wrkNo != null) {
                that.pallet = getArrVal(object.objects, "name", crnData.wrkNo + "-Pallet");
                that.goods = getArrVal(object.objects, "name", crnData.wrkNo + "-Goods");
            }
        }

        if (JSON.stringify(crnData.position) === JSON.stringify(that.position)) {
@@ -109,9 +117,10 @@
        that.preLev = that.lev;
        that.preX = that.x;
        that.preY = that.y;
        that.preY = that.y;
        that.preZ = that.z;
        that.prePosition = JSON.parse(JSON.stringify(that.position));
        that.preForkPos = that.forkPos;
        that.preLoadPos = that.loadPos;
        // 当前
        that.bay = crnData.bay;
        that.lev = crnData.lev;
@@ -120,6 +129,38 @@
        that.z = crnData.position.z;
        that.position = crnData.position;
        that.forkPos = crnData.forkPos;
        that.loadPos = crnData.loadPos;
        that.sourceLocNo = crnData.sourceLocNo;
        that.locNo = crnData.locNo;
        that.wrkNo = crnData.wrkNo;

        // 根据货叉上下定位 判断堆垛机取放货作业 -----------------------------------------------

        // 上定位 ===>> 下定位    放货完成
        if (that.preLoadPos === 1 && that.loadPos === 0) {
            // 入库 / 移库
            if (that.locNo != null) {
                if (that.pallet != null) {
                    that.pallet.name = that.locNo + "-Pallet";
                }
                if (that.goods != null) {
                    that.goods.name = that.locNo + "-Goods";
                }
            } else {
                // 出库
                if (crnData.wrkNo != null) {
                    if (that.pallet != null) {
                        that.pallet.name = crnData.wrkNo + "-Pallet";
                    }
                    if (that.goods != null) {
                        that.goods.name = crnData.wrkNo + "-Goods";
                    }
                }
            }
        // 下定位 ===>> 上定位    取货完成
        } else {

        }

        // create Route ------------------------------------------------

@@ -130,6 +171,7 @@
                progress: 0,
                part: 'fork',
                loaded: crnData.loaded,
                loadPos: crnData.loadPos,
                route: new Route([
                    {
                        x: that.prePosition.x,
@@ -152,6 +194,7 @@
                progress: 0,
                part: 'load',
                loaded: crnData.loaded,
                loadPos: crnData.loadPos,
                route: new Route([
                    {
                        x: that.crnLoad.position.x,
@@ -169,7 +212,6 @@

        curves.map((value, index) => {
            if (that.crnNo === 1) {
                // console.log(crnData)
                // console.log(value.part + " --> " + JSON.stringify(value.route.points))
            }
        });
@@ -188,15 +230,6 @@
                        if (i !== curves.length - 1) {
                            curves[i+1].start = true;
                        } else {
                            // if (that.locNo != null) {
                            //     if (that.pallet != null) {
                            //         that.pallet.name = that.locNo + "-Pallet";
                            //     }
                            //     if (that.goods != null) {
                            //         that.goods.name = that.locNo + "-Goods";
                            //     }
                            // }
                            // reset
                            curves = [];
                            that.run = false;
                        }
@@ -215,8 +248,8 @@
                                    break
                                case 'fork':
                                    that.crnFork.position.set(point.x + xOffset1, point.y, point.z);
                                    // todo:luxiaotao 托盘+货物 运动 不是根据loaded，是根据上下定位
                                    if (curves[i].loaded === 1 && that.pallet) {
                                    // console.log("loadPos:" + curves[i].loadPos + "\n" + that.pallet);
                                    if (curves[i].loadPos === 1 && that.pallet) {
                                        that.pallet.position.setX(point.x + palletX);
                                        that.goods.position.setX(point.x + goodsX);
                                    }