#

zyx

2024-05-31 4799dfece3090ad3221e5b6c7ff9c403effc5da2

 src/main/webapp/views/home/map.html

@@ -6,22 +6,24 @@
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/element.css">
    <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
    <script type="text/javascript" src="../../static/layui/layui.js"></script>
    <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
    <script type="text/javascript" src="../../static/js/common.js"></script>
    <script type="text/javascript" src="../../static/js/vue.min.js"></script>
    <script type="text/javascript" src="../../static/js/element.js"></script>
    <style>
        .pointContainer {
            display: flex;
            justify-content: center;
            justify-content: flex-start;
            margin-top: 1px;
        }

        .pointBox {
            background: #bababa;
            width: 40px;
            height: 40px;
            background: #fffef9;
            width: 35px;
            height: 35px;
            margin-right: 1px;
            display: flex;
            justify-content: center;
@@ -31,56 +33,12 @@
            color: #fff;
        }

        /*.pointBox {*/
        /*    background: #bababa;*/
        /*    width: 40px;*/
        /*    height: 40px;*/
        /*    margin-right: 1px;*/
        /*    display: flex;*/
        /*    justify-content: center;*/
        /*    align-items: center;*/
        /*    font-size: 14px;*/
        /*    user-select: none;*/
        /*    color: #fff;*/
        /*    transform: perspective(70px) rotateX(30deg) translateZ(-10px);*/
        /*    box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.3);*/
        /*}*/

        /*.pointBox {*/
        /*    width: 100px;*/
        /*    height: 100px;*/
        /*    transform-style: preserve-3d;*/
        /*    transform: rotateX(45deg) rotateY(45deg);*/
        /*    box-shadow: -5px 5px 5px rgba(0,0,0,0.5);*/
        /*    background: #e5e5e5;*/
        /*    position: relative;*/
        /*}*/

        /*.pointBox:before, .cube:after {*/
        /*    content: "";*/
        /*    position: absolute;*/
        /*    top: 0;*/
        /*    left: 0;*/
        /*    right: 0;*/
        /*    bottom: 0;*/
        /*    background: inherit;*/
        /*    box-shadow: inherit;*/
        /*}*/

        /*!*.pointBox:before {*!*/
        /*!*    transform: rotateY(90deg);*!*/
        /*!*}*!*/

        /*!*.pointBox:after {*!*/
        /*!*    transform: rotateX(90deg);*!*/
        /*!*}*!*/

        .pointBox:hover{
            background: #00ff7f;
            background: #945833;
        }

        .pointBoxEmpty {
            background: #c2c934;
            background: #57c3c2;
        }

        .pointBoxOut {
@@ -92,23 +50,15 @@
        }

        .pointBoxInYy {
            background: #fa736f;
        }

        .pointBoxGreen {
            background: #00ff7f;
            background: #e2c027;
        }

        .pointBoxBlue {
            background: #55aaff;
            background: #89BCEF;
        }

        .pointBoxRed {
            background: #ff0000;
        }

        .pointBoxStart {
            background: #ffaa00;
            background: #ee4866;
        }

        .pointBoxEnd {
@@ -124,15 +74,7 @@
        }

        .pointBoxDefault {
            background: #86779d;
        }

        .pointBoxSelected {
            background: #00ff7f !important;
        }

        .pointBoxSearch {
            background: #9900ff;
            background: #ffffff;
        }

        .crnLine{
@@ -143,31 +85,8 @@
            position: relative;
        }

        .crnBox{
            width: 120px;
            height: 40px;
            background: url("../../static/image/Crane_manual.png") no-repeat;
            position: absolute;
            top: -25px;
            left: -120px;
            transition:left 2s;
            cursor: pointer;
        }

        .carBox{
            width: 40px;
            height: 40px;
            background: url("../../static/image/ste/car.png") no-repeat;
            background-size: 100% 100%;
            position: absolute;
            top: 0;
            left: 0;
            transition:left 2s;
            cursor: pointer;
        }

        .popBox {
            position: absolute;
            position: fixed;
        }

        /*卡片样式start*/
@@ -238,7 +157,7 @@

        /*滑动卡片start*/
        .hoverCard {
            width: 160px;
            width: 152px;
            height: 224px;
            border-radius: 20px;
            background: #f5f5f5;
@@ -405,32 +324,11 @@
        }
        /*楼层控制end*/

        /*搜索start*/
        .search-input {
            line-height: 28px;
            border: 2px solid transparent;
            border-bottom-color: #777;
            padding: .2rem 0;
            outline: none;
            background-color: transparent;
            color: #0d0c22;
            transition: .3s cubic-bezier(0.645, 0.045, 0.355, 1);
        }

        .search-input:focus, .search-input:hover {
            outline: none;
            padding: .2rem 1rem;
            border-radius: 1rem;
            border-color: #7a9cc6;
        }

        .search-input::placeholder {
            color: #777;
        }

        .search-input:focus::placeholder {
            opacity: 0;
            transition: opacity .3s;
        }
        /*搜索end*/

@@ -445,128 +343,59 @@
    </style>
</head>
<body>
<div id="app" style="display: flex;justify-content: space-around;margin-top: 50px;flex-wrap: wrap;" @click="bgClick()">
    <div style="flex: 12;">
        <div>
<div id="app" style="display: flex;justify-content: space-around;margin-top: 50px;flex-wrap:nowrap; " @click="bgClick()"    >
    <div style="flex: 3;overflow: auto; " :style="{scale:showScale/100.0,marginTop:(showScale-100)*5 + 'px'}">
        <div style="width: 100%;overflow: auto;">
            <div class="pointContainer" v-for="(x,index) in map" :key="index">
                <div style="width: 40px; display: flex;justify-content: flex-end;align-items: center;">
                    {{ getRealRowByX(index) }}
                </div>
                <div v-if="index != 0 && (index != map.length-1)" v-for="(y,idx) in x" :key="idx">
                    <div v-if="idx != 0 && (idx != map[index].length-1)">
                        <div v-if="map[index][idx].value < 0" class="pointBox"></div>
                        <div v-if="map[index][idx].value < 0" style="visibility: hidden;" class="pointBox"></div>

                        <!--库位-->
                        <div v-else-if="map[index][idx].value  == 0" @contextmenu.prevent="rightEvent(index,idx,$event)">
                            <div v-if="map[index][idx].locSts == 'O'" class="pointBox pointBoxBlue">{{ map[index][idx].locSts }}</div>
                            <div v-if="map[index][idx].locSts == 'O'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxBlue">{{ map[index][idx].locSts }}</div>
                            <div v-else-if="map[index][idx].locSts == 'F'" @click.left.stop="selectLoc(index,idx)" :class="{'pointBoxSelected':map[index][idx].locOutSelected,'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxRed">{{ map[index][idx].locSts }}</div>
                            <div v-else-if="map[index][idx].locSts == 'D'" class="pointBox pointBoxEmpty">{{ map[index][idx].locSts }}</div>
                            <div v-else-if="map[index][idx].locSts == 'P'" class="pointBox pointBoxOut">{{ map[index][idx].locSts }}</div>
                            <div v-else-if="map[index][idx].locSts == 'D'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxEmpty">{{ map[index][idx].locSts }}</div>
                            <div v-else-if="map[index][idx].locSts == 'P'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxOut">{{ map[index][idx].locSts }}</div>
                            <div v-else-if="map[index][idx].locSts == 'R'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxOutYy">{{ map[index][idx].locSts }}</div>
                            <div v-else-if="map[index][idx].locSts == 'S'" class="pointBox pointBoxInYy">{{ map[index][idx].locSts }}</div>
                            <div v-else class="pointBox pointBoxDefault">{{ map[index][idx].locSts }}</div>
                            <div v-else-if="map[index][idx].locSts == 'S'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxInYy">{{ map[index][idx].locSts }}</div>
                            <div v-else-if="map[index][idx].locSts == 'X'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxEnd">{{ map[index][idx].locSts }}</div>
                            <div v-else class="pointBox pointBoxDefault" :class="{'pointBoxSearch':map[index][idx].searchStatus}">{{ map[index][idx].locSts }}</div>
                        </div>

                        <!--堆垛机-->
                        <div v-else-if="map[index][idx].value  == 3">
                            <div v-if="idx == 1" class="crnLine" :style="{width:pointContainerWidth + 'px'}">
<!--                                <div v-if="index == 2" @contextmenu.prevent="clickCrnBox($event,1)" :style="{left:crnList[0].left + 'px'}" class="crnBox" id="crnBox1"></div>-->
<!--                                <div v-else @contextmenu.prevent="clickCrnBox($event,2)" :style="{left:crnList[1].left + 'px'}" class="crnBox" id="crnBox2"></div>-->
                            </div>
                        </div>

                        <div v-else-if="map[index][idx].value  == 4" class="pointBox pointBoxStation"
                             @contextmenu.prevent="rightEvent(index,idx,$event)"></div>
                        <div v-else-if="map[index][idx].value  == 5" class="pointBox chargeStation"
                             @contextmenu.prevent="rightEvent(index,idx,$event)"></div>
                        <div v-else-if="map[index][idx].value  == 9" class="pointBox pointBoxRed"
                             @contextmenu.prevent="rightEvent(index,idx,$event)"></div>
                        <div v-else-if="map[index][idx].value  == 10" class="pointBox pointBoxRed" style="visibility: hidden"
                             @contextmenu.prevent="rightEvent(index,idx,$event)">
                            <!--穿梭车轨道-->
                        </div>

                    </div>
                </div>
            </div>
        </div>
    </div>
    <div style="padding: 20px;flex: 5;margin-top: -70px;">
    <div  style="padding: 20px;flex: 1;margin-top: -70px;">
        <el-slider v-model="showScale" :marks="showScaleMarks"></el-slider>
        <div style="display: flex;justify-content: space-between;flex-wrap: wrap;">
            <div class="hoverCard" style="width: 100%;">
                <div class="card-details" style="place-content: normal;height: auto;">
                    <div class="text-body" style="display: flex;flex-wrap: wrap;">
                        <div style="width: 100%;margin-bottom: 20px;">
                            <div style="display: flex;justify-content: space-between;">
                                <div><input v-model="searchMatnr" placeholder="物料号" type="text" class="search-input"></div>
                                <div><input v-model="searchOrderNo" placeholder="订单号" type="text" class="search-input"></div>
                            </div>
                            <div style="display: flex;justify-content: space-between;margin-top: 10px;">
                                <div><input style="width: 110px;" v-model="searchMaktx" placeholder="物料名称" type="text" class="search-input"></div>
                                <div><input style="width: 110px;" v-model="searchSpecs" placeholder="规格" type="text" class="search-input"></div>
                                <div><input style="width: 110px;" v-model="searchLocNo" placeholder="库位号" type="text" class="search-input"></div>
                            </div>
                            <button style="width: 100%;margin-top: 10px;" @click="searchLoc" class="layui-btn layui-btn-sm">搜索</button>
                        </div>
                        <div>
                            <button @click="locToLoc2" class="layui-btn layui-btn-sm">侧边移库</button>
                        </div>
                        <div v-if="!locOutStatus" style="margin-left: 10px;">
                            <button @click="locOutStatus = true" class="layui-btn layui-btn-sm">出库选择</button>
                        </div>
                        <div v-else style="margin-left: 10px;border: 1px red solid;display: flex;">
                            <div>
                                <button @click="cancelSelectLoc" class="layui-btn layui-btn-sm">取消选择</button>
                            </div>
                            <div style="display: flex;justify-content: center;align-items: center;">
                                <select v-model="outSite">
                                    <option v-for="(item,index) in outSites" :key="index" :value="item.siteId">{{ item.desc }}</option>
                                </select>
                            </div>
                            <div>
                                <button @click="locOut" class="layui-btn layui-btn-sm">出库</button>
                            </div>
            <div class="hoverCard">
                <div class="card-details">
                    <p class="text-title" style="text-align: center;">库区 {{currentArea}}</p>
                    <div class="text-body" style="display: flex;">
                        <div class="floorSelect">
                            <label for="a">A区</label>
                            <input id="a" type="radio" name="k" v-model="currentArea" value="A" checked="">
                            <label for="b">B区</label>
                            <input id="b" type="radio" v-model="currentArea" name="k" value="B">
                            <label for="c">C区</label>
                            <input id="c" type="radio" v-model="currentArea" name="k" value="C">
                            <label for="d">D区</label>
                            <input id="d" type="radio" v-model="currentArea" name="k" value="D">
                            <label for="e">E区</label>
                            <input id="e" type="radio" v-model="currentArea" name="k" value="E">
                        </div>
                    </div>
                </div>
                <button class="card-button">功能区</button>
                <button class="card-button">库区 {{currentArea}}</button>
            </div>

            <div class="hoverCard">
            <div class="hoverCard" id="myElement">
                <div class="card-details">
                    <div class="text-body" style="display: flex;justify-content: space-around;flex-wrap: wrap;">
                        <div style="flex: 1;margin-top: 10px;">
                            <div style="font-size: 10px;">空库位</div><div class="pointBox pointBoxBlue">O</div>
                        </div>
                        <div style="flex: 1;margin-top: 10px;">
                            <div style="font-size: 10px;">在库</div><div class="pointBox pointBoxRed">F</div>
                        </div>
                        <div style="flex: 1;margin-top: 10px;">
                            <div style="font-size: 10px;">空板</div><div class="pointBox pointBoxEmpty">D</div>
                        </div>
                        <div style="flex: 1;margin-top: 10px;">
                            <div style="font-size: 10px;">出库中</div><div class="pointBox pointBoxOut">P</div>
                        </div>
                        <div style="flex: 1;margin-top: 10px;">
                            <div style="font-size: 10px;">出库预约</div><div class="pointBox pointBoxOutYy">R</div>
                        </div>
                        <div style="flex: 1;margin-top: 10px;">
                            <div style="font-size: 10px;">入库预约</div><div class="pointBox pointBoxInYy">S</div>
                        </div>
                        <div style="flex: 1;margin-top: 10px;">
                            <div style="font-size: 10px;">搜索结果</div><div class="pointBox pointBoxSearch"></div>
                        </div>
                        <div style="flex: 1;margin-top: 10px;">
                            <div style="font-size: 10px;">选择结果</div><div class="pointBox pointBoxSelected"></div>
                        </div>
                        <div style="flex: 1;margin-top: 10px;">
                            <div style="font-size: 10px;">其他</div><div class="pointBox pointBoxDefault">其他</div>
                        </div>
                    </div>
                </div>
                <button class="card-button">库位状态</button>
            </div>

            <div class="hoverCard">
                <div class="card-details">
                    <p class="text-title" style="text-align: center;">楼层 {{currentLev}}F</p>
                    <p class="text-title" style="text-align: center;">库位层 {{currentLev}}</p>
                    <div class="text-body" style="display: flex;">
                        <div class="floorSelect">
                            <label for="01">1F</label>
@@ -610,48 +439,16 @@
                    库位号: {{ map[mapI][mapJ].locNo }}
                </div>
                <div style="margin-top: 10px;">
                    库位状态: {{ map[mapI][mapJ].locSts$ }}
                    库位状态: {{ getLocSts(map[mapI][mapJ].locSts) }}
                </div>
                <div style="margin-top: 10px;display: flex;justify-content: space-between;flex-wrap: wrap;">
                    <div style="margin-top: 5px;">
                        <button class="layui-btn layui-btn-sm" @click="openLocDetail(map[mapI][mapJ].locNo)">库位详情</button>
                    </div>
                    <div style="margin-top: 5px;">
                        <button v-if="map[mapI][mapJ].locSts == 'F'" class="layui-btn layui-btn-sm" @click="locMove(map[mapI][mapJ].locNo)">库位移转</button>
                        <button v-else-if="map[mapI][mapJ].locSts == 'D'" class="layui-btn layui-btn-sm" @click="locMove(map[mapI][mapJ].locNo)">库位移转</button>
                        <button v-else class="layui-btn layui-btn-sm layui-btn-disabled" disabled>库位移转</button>
                    </div>
                </div>
            </div>
        </div>
    </div>

    <div v-if="crnBox" @click.stop="" :style="{left: crnBoxLeft,top: crnBoxTop}" class="popBox">
        <div class="apple-card">
            <div class="tools">
                <div class="circle" @click.stop="crnBox = false">
                    <span class="red box"></span>
                </div>
                <div class="circle">
                    <span class="yellow box"></span>
                </div>
                <div class="circle">
                    <span class="green box"></span>
                </div>
            </div>
            <div class="card-content">
                <div>堆垛机号：{{crnList[crnBox - 1].crnNo}}</div>
                <div>工作号：{{crnList[crnBox - 1].wrkNo}}</div>
                <div>源库位：{{crnList[crnBox - 1].frmLocno}}</div>
                <div>目标库位：{{crnList[crnBox - 1].toLocno}}</div>
                <div>可入：{{crnList[crnBox - 1].inEnable}}</div>
                <div>可出：{{crnList[crnBox - 1].outEnable}}</div>
                <div>状态：{{crnList[crnBox - 1].crnSts$}}</div>
                <div>异常：{{crnList[crnBox - 1].crnErr$}}</div>
            </div>
        </div>
    </div>

</div>
<script>

@@ -674,6 +471,9 @@
            rightBoxLeft: "0px",
            pointContainerWidth: 0,
            currentLev: 1,
            currentArea: 'A',
            area:1,
            areaName:"立库",
            crnList: null,
            crnBox: false,
            crnBoxTop: "0px",
@@ -687,16 +487,24 @@
            searchLocNo: "",
            outSite: null,
            outSites: null,
            showScale: 85, //控制地图显示大小比例
            showScaleMarks: {//比例滑动条显示标记
                0: "0%",
                50: {
                    style: {
                        color: '#1989FA'
                    },
                    label: "50%"
                },
                100: "100%",
            },
            locStsList: [],//库位状态列表
            y: 1
        },
        created(){
            this.init()

            this.getOutSite()

            // setInterval((that) => {
            //     //定时获取堆垛机数据
            //     that.getCrnData()
            // },1000,this)
        },
        watch: {
            map: {
@@ -709,6 +517,26 @@
                deep: true,
                handler(val) {
                    this.init()
                    this.searchLoc()
                }
            },
            currentArea: {
                deep: true,
                handler(val) {
                    let element = document.getElementById("myElement");
                    if (val === "A") {
                        element.style.display = "block";
                    } else {
                        element.style.display = "none";
                    }
                    this.init()
                    if (this.searchMatnr != ""
                        || this.searchOrderNo != ""
                        || this.searchSpecs != ""
                        || this.searchMaktx != ""
                        || this.searchLocNo != "") {
                        this.searchLoc()
                    }
                }
            }
        },
@@ -716,7 +544,11 @@
            init(){
                let that = this
                $.ajax({
                    url: baseUrl + "/map/getData/" + this.currentLev + "/auth",
                    url: baseUrl + "/map/getData/auth",
                    data:{
                        lev : this.currentLev,
                        area : this.currentArea
                    },
                    headers: {'token': localStorage.getItem('token')},
                    method: "get",
                    success: (data) => {
@@ -726,6 +558,16 @@

                this.locOutStatus = false
                this.locOutLocNo = []

                this.getLocStsList();//获取库位状态列表
            },
            resetSearch(){
                this.searchMatnr = ""
                this.searchOrderNo = ""
                this.searchSpecs = ""
                this.searchMaktx = ""
                this.searchLocNo = ""
                this.searchLoc()
            },
            printData() {
                this.mapData = JSON.stringify(this.map)
@@ -739,11 +581,25 @@
                        val.searchStatus = false//搜索标记
                        data2.push(val)
                    })
                    this.pointContainerWidth = item.length * (40+1)
                    this.pointContainerWidth = item.length * (35+1)
                    data.push(data2)
                })
                this.map = data
                this.printData()
            },
            getRealRowByX(x) {
                //获取真实库位行号，通过坐标x
                let data = this.map
                let rowData = data[x]

                for (var i = 1; i < rowData.length; i++) {
                    let locNo = rowData[i].locNo;
                    if (locNo != undefined) {
                        return "#" + parseInt(locNo.substr(1, 2));
                    }
                }

                return "";
            },
            rightEvent(x, y, e) {
                this.rightBox = true
@@ -767,6 +623,29 @@
                    success: function(layero, index){
                    }
                });
            },
            getLocStsList() {
                //获取库位状态列表
                let that = this
                $.ajax({
                    url: baseUrl + "/basLocSts/list/auth",
                    headers: {'token': localStorage.getItem('token')},
                    method: "get",
                    success: (res) => {
                        that.locStsList = res.data.records
                    }
                })
            },
            getLocSts(locSts) {
                //获取库位状态
                let locStsList = this.locStsList
                let locDesc = ""
                locStsList.forEach((item,index) => {
                    if (item.locSts == locSts) {
                        locDesc = item.locDesc
                    }
                })
                return locDesc
            },
            locMove(locNo) {
                //库位移转
@@ -895,111 +774,6 @@
                    }
                })

                // let result = true;//最终结果
                // //检测库位是否缺少选择导致不完整
                // bayList.forEach((item,index) => {
                //     //搜索当前巷道有效在库list
                //     //上半部分，巷道
                //     let topList = []
                //     for (var i = 8; i >= 3; i--) {
                //         let obj = {
                //             x: i,
                //             y: index,
                //             status: false,
                //             locNo: map[i][index].locNo
                //         }
                //
                //         if (map[i][index].locSts == 'F') {
                //             //在库状态，存入巷道在库list
                //             topList.push(obj)
                //         }
                //     }
                //
                //     //下半部分，巷道
                //     let bottomList = []
                //     for (var i = 9; i < 14; i++) {
                //         let obj = {
                //             x: i,
                //             y: index,
                //             status: false,
                //             locNo: map[i][index].locNo
                //         }
                //
                //         if (map[i][index].locSts == 'F') {
                //             //在库状态，存入巷道在库list
                //             bottomList.push(obj)
                //         }
                //     }
                //
                //     // if (topList.length == 0 && bottomList.length == 0) {
                //     //     result = false;
                //     // }
                //
                //     for (var i = 0; i < item.length; i++) {
                //         if (item[i].x > 8) {
                //             //下半部分数据
                //             let index = this.searchDataIndex(item[i],bottomList)
                //             // console.log(item[i],bottomList,index)
                //             if (index == -1) {
                //                 continue
                //             }
                //             bottomList[index].status = true
                //         }else {
                //             //上半部分数据
                //             let index = this.searchDataIndex(item[i],topList)
                //             // console.log(item[i],topList,index)
                //             if (index == -1) {
                //                 continue
                //             }
                //             topList[index].status = true
                //         }
                //
                //     }
                //
                //     let tmp1 = []
                //     let tmp2 = []
                //     for (var i = item.length - 1; i >= 0; i--) {
                //         if (item[i].x < 9) {
                //             tmp1.push(item[i]);
                //         }
                //     }
                //     for (var i = 0; i < item.length; i++) {
                //         if (item[i].x > 8) {
                //             tmp2.push(item[i]);
                //         }
                //     }
                //
                //     if (tmp1.length > 0) {
                //         //判断上半部分出库是否选择完整
                //         let topIndex = this.searchDataIndex(tmp1[0],topList);
                //         if (topIndex != -1) {
                //             for (var i = topIndex; i < topList.length; i++) {
                //                 if (topList[i].status != true) {
                //                     result = false;
                //                 }
                //             }
                //         }
                //     }
                //
                //     if (tmp2.length > 0) {
                //         //判断下半部分出库是否选择完整
                //         let bottomIndex = this.searchDataIndex(tmp2[0],bottomList)
                //         if (bottomIndex != -1) {
                //             for (var i = bottomIndex; i < bottomList.length; i++) {
                //                 if (bottomList[i].status != true) {
                //                     result = false;
                //                 }
                //             }
                //             console.log(tmp2[0],bottomList,bottomIndex)
                //         }
                //     }
                // })
                //
                // if (!result) {
                //     $layui.layer.msg("出库路径选择有误");
                //     return;
                // }

                //准备出库
                if (this.outSite == null) {
                    $layui.layer.msg("请选择出库站点");
@@ -1107,12 +881,6 @@
                this.locOutStatus = false
            },
            searchLoc() {
                //通过物料编号搜索库位号
                // if (this.searchValue == "") {
                //     $layui.layer.msg("请输入物料编号或订单号");
                //     return;
                // }

                let that = this;
                $.ajax({
                    url: baseUrl + "/map/searchData/auth",
@@ -1148,24 +916,15 @@

                                })
                            })
                            data.forEach((item,index) => {
                            data.forEach((item,i) => {
                                let locNo = item.locNo
                                let y = parseInt(locNo.substr(2,3))
                                let x = parseInt(locNo.substr(0,2))
                                console.log(x)
                                // if ( (x+2) %5 === 0 ) {
                                //     x = 5*item.crnNo-2;
                                // }else
                                if(x<17){
                                    if (x % 4 == 0 || (x+1) % 4 == 0){
                                        x = item.crnNo+x
                                    }else {
                                        x = item.crnNo+x-1
                                    }
                                }
                                console.log(x)

                                tmp[x][y].searchStatus = true//搜索标记
                                tmp.forEach((item,index) => {
                                    item.forEach((val,idx) => {
                                        if (tmp[index][idx].locNo == locNo) {
                                            tmp[index][idx].searchStatus = true//搜索标记
                                        }
                                    })
                                })
                            })
                            that.map = tmp
                            $layui.layer.msg("搜索成功");