pjb
23 小时以前 e156048b1ea844434ca7675af45e37a2dfad6e8c
rgv调度优化
4个文件已修改
36 ■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/utils/Utils.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/RgvThread.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/index.html 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -300,7 +300,7 @@
                        continue;
                    }
                    List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("rgv_no", rgvProtocol.getRgvNo()).eq("wrk_sts",9));
                    List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("rgv_no", rgvProtocol.getRgvNo()).eq("wrk_sts",10));
                    if (!wrkMasts.isEmpty()) {
                        continue;
                    }
src/main/java/com/zy/asrs/utils/Utils.java
@@ -186,26 +186,26 @@
        // 类型说明:0-直线,1-圆弧(需要圆心坐标)
        Object[][] intervals = {
                // 直线区间(0-134400)
                {0.0, 296680.0, 0, 350.0, 700.0, 1200.0, 700.0},
                {0.0, 296680.0, 0, 400.0, 750.0, 1000.0, 750.0},
                // 弧线区间(拐点-转弯-133)保持贝塞尔曲线
                {296680.0, 450865.0, 2, 1200.0, 700.0, 1200.0, 800.0, 1150.0, 650.0},
                {296680.0, 450865.0, 2, 1000.0, 750.0, 1000.0, 700.0, 950.0, 725.0},
                // 直线区间
                {450865.0, 945407.0,0, 100.0, 800.0, 1200.0, 800.0},
                {450865.0, 950000.0,0, 1000.0, 700.0, 100.0, 700.0},
                // 直线区间
                {450865.0, 1473370.0,0, 100.0, 800.0, 100.0, 100.0},
                {950000.0, 1473370.0,0, 100.0, 700.0, 100.0, -40.0},
                // 弧线区间(拐点112-顶点),控制点假设为(1215, 80)
                {1473370.0, 1550588.0,2, 0.0, 0.0, 100.0, 100.0,50.0,50.0},
                {1473370.0, 1550588.0,2, 100.0, -40.0, 50.0, -40.0,75.0,-15.0},
                // 弧线区间(拐点-顶点-111),控制点假设为(1164, 125)
//                {1016193.0, 1063563.0,0, 1164.0, 80.0, 1115.0, 125.0},
                // 直线区间
                {1550588.0, 2068254.0,0, 0.0, 0.0, 0.0, 700.0},
                {1550588.0, 2100000.0,0, 50.0, -40.0, 50.0, 750.0},
                // 弧线区间(拐点101-转弯),控制点假设为(1115, 750)
//                {2068254.0, 2110201.0,2, 1115.0, 720.0, 1100.0, 750.0,0.0,0.0},
                // 直线区间
                {2110201.0, 2318250.0,0, 0.0, 700.0, 350.0, 700.0},
                {2100000.0, 2318250.0,0, 50.0, 750.0, 400.0, 750.0},
        };
        for (Object[] interval : intervals) {
src/main/java/com/zy/core/thread/RgvThread.java
@@ -214,9 +214,7 @@
        array[4] = command.getTaskNo1();
        OperateResult result = siemensNet.Write("DB24.0", array);
        if (command.getAckFinish1().equals((short)0)) {
            Thread.sleep(100L);
            result = siemensNet.Write("DB24.10.0", true);
        } else {
            siemensNet.Write("DB24.10.1", true);
@@ -243,7 +241,7 @@
        } catch (Exception ignore) {}
        if (result != null && result.IsSuccess) {
            Thread.sleep(200);
            Thread.sleep(400);
            this.readStatus();
            log.info("RGV 工位1命令下发[id:{}] >>>>> {}", slave.getId(), JSON.toJSONString(command));
            OutputQueue.RGV.offer(MessageFormat.format("【{0}】[id:{1}] >>>>> 工位1命令下发: {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSONString(command)));
src/main/webapp/views/index.html
@@ -138,7 +138,7 @@
        }
        .container {
            width: 100vh;
            height: 72vh;
            height: 90vh;
            position: absolute;
            /*background: #8c939d;*/
        }
@@ -205,13 +205,15 @@
<!--                        C 250,100 90,90 100,250 z"-->
<!--                      style="fill:none; stroke:blue; stroke-width:4;" />-->
                <path d="M 0 0
                L 80 0
                L 80 600
                L 800 600
                L 800 650
                L 0 650
                L 32 -40
                L 32 810
                L 1100 810
                L 1100 770
                L 100 770
                L 100 -40
<!--                L 40 40-->
                Z"
                      style="fill:none; stroke:blue; stroke-width:4;" />
                      style="fill:none; stroke:blue; stroke-width:1;" />
            </svg>
<!--            <div class="bus-station">-->
<!--                <div v-for="(item,i) in devpPos1" class="bus-item-top" :style="'left:' + (75 + i * 15) + 'px'">{{item.dev_no}}</div>-->