#

whycq

2024-03-04 b9ec258ab956263aeacd29d38236f7a32f248774

#

 src/main/java/com/zy/asrs/controller/AgvLocMastController.java

@@ -103,9 +103,9 @@
        //清空原有库位
        //agvLockMastService.clearLoc();
        //初始化一楼站点
        //agvLockMastService.initLocFloor1();
        agvLockMastService.initLocFloor1();
        //初始化三楼站点
        agvLockMastService.initLocFloor3();
        //agvLockMastService.initLocFloor3();

        return R.ok();
    }

 src/main/java/com/zy/asrs/controller/AgvMapController.java

@@ -63,19 +63,19 @@

            int x = bay;
            int y = row;
            //1楼
            if(floor == 1){
                x = generateMap1Row(row);
                y = generateMap1Bay(bay);
            }
            //3楼
            if(floor == 3){
                y = generateMap3Row(row);
                x = generateMap3Bay(bay);
            }
            ////1楼
            //if(floor == 1){
            //    x = generateMap1Row(row);
            //    y = generateMap1Bay(bay);
            //}
            ////3楼
            //if(floor == 3){
            //    y = generateMap3Row(row);
            //    x = generateMap3Bay(bay);
            //}

            ArrayList rowData = arrayLists.get(x);
            Object o = rowData.get(y);
            ArrayList rowData = arrayLists.get(y);
            Object o = rowData.get(x);

            JSONObject jsonObject = JSON.parseObject(o.toString());
            jsonObject.put("value","0");

 src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java

@@ -27,7 +27,7 @@

    public void initLocFloor1() {
        //1楼 13排 86列 12层
        List<AgvLocMast> agvLocMastList = getLocMastList(1,13,1,86,1,12,1);
        List<AgvLocMast> agvLocMastList = getLocMastList(1,33,1,45,1,1,1);
        this.insertBatch(agvLocMastList);
    }

@@ -77,7 +77,7 @@
                    String locRow = row < 10 ? "-00" + row : "-0" + row;
                    String locBay = bay < 10 ? "-00" + bay : "-0" + bay;
                    String locLev = lev < 10 ? "-0" + lev : "-" + lev;
                    String locNo = "SK" + locRow + locBay + locLev + "@" + floor;
                    String locNo = "YZ" + locRow + locBay + locLev + "@" + floor;
                    loc.setLocNo(locNo);
                    loc.setLocSts("O");
                    loc.setRow1(row);
@@ -96,14 +96,67 @@
    }

    private boolean checkLocExist(int row, int bay, int floor){
        if(floor == 1 && (row == 8 || row == 9)){
            if((bay >=8 && bay <=11)
                    || (bay >= 20 && bay <=23)
                    || (bay>=37 && bay <=39)
                    || (bay>=50 && bay <=52)
                    || (bay>=63 && bay <=64)
                    || (bay>=79 && bay <=80)){
        //if(floor == 1 && (row == 2)){
        //    if((bay >=8 && bay <=11)
        //            || (bay >= 20 && bay <=23)
        //            || (bay>=37 && bay <=39)
        //            || (bay>=50 && bay <=52)
        //            || (bay>=63 && bay <=64)
        //            || (bay>=79 && bay <=80)){
        //        return false;
        //    }
        //}
        if (floor == 1) {
            if (row == 2 || row == 5 || row == 8 || row == 11
                    || row == 14 || row == 17 || row == 19 || row == 22 || row == 25
                    || row == 28 || (row >29 && row <39)|| row == 41|| row == 44) {
                return false;
            } else if (row == 1) {
                if (bay < 19) {
                    return false;
                }
            } else if (row == 3 || row == 4) {
                if (bay < 19 || bay == 26) {
                    return false;
                }
            } else if (row == 6) {
                if (bay < 20 || bay == 25 || bay == 30) {
                    return false;
                }
            } else if (row == 7) {
                if (bay < 4 || bay == 25) {
                    return false;
                }
            } else if (row == 9 || row ==10 ) {
                if (bay < 4 || bay == 12 || bay == 25) {
                    return false;
                }
            } else if (row == 12) {
                if (bay < 4) {
                    return false;
                }
            } else if (row == 15 || row == 18 || row == 20 || row == 21 || row == 24 || row == 26 || row == 27 || row == 40) {
                if (bay == 12 || bay == 26) {
                    return false;
                }
            } else if (row == 16 || row == 23 || row == 39) {
                if (bay == 3 || bay == 4 || bay == 9 || bay == 12 || bay == 14 || bay == 20 || bay == 25  || bay == 26) {
                    return false;
                }
            } else if (row == 42) {
                if (bay == 5 || bay == 12 || bay == 26) {
                    return false;
                }
            } else if (row == 43) {
                if (bay < 6 || bay == 12 || bay == 26) {
                    return false;
                }
            } else if (row == 45) {
                if (bay < 6) {
                    return false;
                }
            } else {
                return true;
            }
        }


 src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 8081
  port: 8083
  servlet:
    context-path: /@pom.build.finalName@

@@ -45,7 +45,7 @@

#License相关配置
license:
  subject: tzskasrs
  subject: phyzasrs
  publicAlias: publicCert
  storePass: public_zhongyang_123456789
  licensePath: license.lic

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

@@ -380,12 +380,12 @@
    </style>
</head>
<body>
<div id="app" style="display: flex;justify-content: space-around;margin-top: 50px;flex-wrap: wrap;" @click="bgClick()">
<div id="app" style="display: flex;justify-content: space-around;margin-top: 0px;flex-wrap: wrap;" @click="bgClick()">

    <div style="margin-top: 20px;"><button class="layui-btn" @click="currentFloor = 1" :style="{background: currentFloor==1?'red':''}">1楼</button></div>
    <div style="margin-top: 20px;"><button class="layui-btn" @click="currentFloor = 3" :style="{background: currentFloor==3?'red':''}">3楼</button></div>
    <!--<div style="margin-top: 20px;"><button class="layui-btn" @click="currentFloor = 1" :style="{background: currentFloor==1?'red':''}">1楼</button></div>-->
    <!--<div style="margin-top: 20px;"><button class="layui-btn" @click="currentFloor = 3" :style="{background: currentFloor==3?'red':''}">3楼</button></div>-->

    <div style="flex: 18;display: flex;justify-content: center;" :style="{zoom:showScale/100.0,marginTop:(showScale)*4 + 'px'}">
    <div style="flex: 18;display: flex;justify-content: center;" :style="{zoom:showScale/100.0,marginTop:(showScale)*3 + 'px'}">
        <div style="margin-top: -110px;">
            <div class="pointContainer" v-for="(x,index) in map" :key="index">
                <div v-if="index != 0 && (index != map.length-1)" v-for="(y,idx) in x" :key="idx">
@@ -426,18 +426,18 @@
        </div>

        <div>
            <div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 1" :style="{background: currentLev==1?'red':''}">1F</button></div>
            <div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 2" :style="{background: currentLev==2?'red':''}">2F</button></div>
            <div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 3" :style="{background: currentLev==3?'red':''}">3F</button></div>
            <div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 4" :style="{background: currentLev==4?'red':''}">4F</button></div>
            <div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 5" :style="{background: currentLev==5?'red':''}">5F</button></div>
            <div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 6" :style="{background: currentLev==6?'red':''}">6F</button></div>
            <div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 7" :style="{background: currentLev==7?'red':''}">7F</button></div>
            <div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">8F</button></div>
            <div class="lev-for-floor1" style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">9F</button></div>
            <div class="lev-for-floor1" style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">10F</button></div>
            <div class="lev-for-floor1" style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">11F</button></div>
            <div class="lev-for-floor1" style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">12F</button></div>
            <!--<div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 1" :style="{background: currentLev==1?'red':''}">1F</button></div>-->
            <!--<div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 2" :style="{background: currentLev==2?'red':''}">2F</button></div>-->
            <!--<div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 3" :style="{background: currentLev==3?'red':''}">3F</button></div>-->
            <!--<div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 4" :style="{background: currentLev==4?'red':''}">4F</button></div>-->
            <!--<div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 5" :style="{background: currentLev==5?'red':''}">5F</button></div>-->
            <!--<div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 6" :style="{background: currentLev==6?'red':''}">6F</button></div>-->
            <!--<div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 7" :style="{background: currentLev==7?'red':''}">7F</button></div>-->
            <!--<div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">8F</button></div>-->
            <!--<div class="lev-for-floor1" style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">9F</button></div>-->
            <!--<div class="lev-for-floor1" style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">10F</button></div>-->
            <!--<div class="lev-for-floor1" style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">11F</button></div>-->
            <!--<div class="lev-for-floor1" style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">12F</button></div>-->
        </div>
    </div>
    <div style="padding: 40px 20px 10px 10px;" :style="window.innerWidth < 2000 ? 'margin-top: 0px;' : 'flex: 5;margin-top: -70px;'">