rgv功能完善

pjb

8 天以前 a609def9badafcb8e8ffa97e8d54962271b1e108

rgv功能完善

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

@@ -377,7 +377,12 @@

            runRgv:
            for (WrkMast wrkMast : wrkMasts) {
                BasDevpPosition basDevpPositions = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("dev_no", wrkMast.getRgvSstaNo())); // 站点
                Integer rgvSstaNo = wrkMast.getRgvSstaNo();
                // 1090，1089,1086,1083 按1083站点位置计算，能取1083，就能取1090，1089，1086，避免任务延迟下发方案一直给1083发
                if (rgvSstaNo == 1090 || rgvSstaNo == 1089 || rgvSstaNo == 1086) {
                    rgvSstaNo = 1083;
                }
                BasDevpPosition basDevpPositions = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("dev_no", rgvSstaNo)); // 站点
                long position = basDevpPositions.getPlcPosition(); // 起始站位置
                TreeMap<Long, RgvProtocol> map = new TreeMap<>();
                for (RgvProtocol rgvProtocol : rgvProtocolList) {
@@ -389,13 +394,13 @@
                    }
                    map.put(distance, rgvProtocol);
                }
                log.info("取货站点：{}，后面小车排序", basDevpPositions.getDevNo());
                StringBuilder sb = new StringBuilder();
                for (Map.Entry<Long, RgvProtocol> rgvProtocolMap : map.entrySet()) {
                    RgvProtocol rgvProtocol = rgvProtocolMap.getValue();
                    sb.append("[").append(rgvProtocol.getRgvNo()).append(",").append(rgvProtocol.getStatusType().desc).append("]");
                }
                log.info(sb.toString());
//                log.info("取货站点：{}，后面小车排序", basDevpPositions.getDevNo());
//                StringBuilder sb = new StringBuilder();
//                for (Map.Entry<Long, RgvProtocol> rgvProtocolMap : map.entrySet()) {
//                    RgvProtocol rgvProtocol = rgvProtocolMap.getValue();
//                    sb.append("[").append(rgvProtocol.getRgvNo()).append(",").append(rgvProtocol.getStatusType().desc).append("]");
//                }
//                log.info(sb.toString());

                for (Map.Entry<Long, RgvProtocol> rgvProtocolMap : map.entrySet()) {
                    RgvProtocol rgvProtocol = rgvProtocolMap.getValue(); // 最近距离小车
@@ -562,7 +567,7 @@
                log.error("小车复位RGV命令下发失败，RGV号={}", rgvNo);
                return false;
            } else {
                log.info("RGV命令下发成功，RGV号={}", rgvNo);
                log.info("小车复位RGV命令下发成功，RGV号={}", rgvNo);
                return true;
            }
        } catch (Exception e) {

 src/main/java/com/zy/core/thread/RgvThread.java

@@ -275,7 +275,7 @@
            Thread.sleep(100L);
            result = siemensNet.Write("DB24.10.0", true);
        } else {
            siemensNet.Write("DB24.10.1", true);
            result = siemensNet.Write("DB24.10.1", true);
            log.info("任务完成后复位清除rgv信息：小车号：{}，ack:{}", command.getRgvNo(),command.getAckFinish1());
        }


 src/main/resources/application.yml

@@ -6,9 +6,11 @@
spring:
  application:
    name: @pom.build.finalName@
  jmx:
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://192.168.2.201:1433;databasename=mdqzasrs
    url: jdbc:sqlserver://192.168.2.203:1433;databasename=mdqzasrs
#    url: jdbc:sqlserver://127.0.0.1:1433;databasename=mdqzasrs
    username: sa
    password: sa@123

 src/main/resources/license.lic

Binary files differ

 src/main/webapp/views/index.html

@@ -5,7 +5,7 @@
    <title>环形穿梭车智能系统</title>
    <link rel="stylesheet" href="../static/css/element.css">
    <link rel="stylesheet" href="../static/css/element-ui.css">
    <link rel="icon" href="../static/images/favicon.ico" type="image/x-icon">
<!--    <link rel="icon" href="../static/images/favicon.ico" type="image/x-icon">-->
    <script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
    <script type="text/javascript" src="../static/js/common.js"></script>
    <script type="text/javascript" src="../static/js/vue.min.js"></script>
@@ -295,18 +295,18 @@
                            prop="rgvSts"
                            label="RGV状态">
                    </el-table-column>
                    <el-table-column
                            label="操作"
                            type="template">
                        <template slot-scope="scope">
                            <el-button
                                    type="danger"
                                    size="small"
                                    @click="taskDelete(scope.row)">
                                删除
                            </el-button>
                        </template>
                    </el-table-column>
<!--                    <el-table-column-->
<!--                            label="操作"-->
<!--                            type="template">-->
<!--                        <template slot-scope="scope">-->
<!--                            <el-button-->
<!--                                    type="danger"-->
<!--                                    size="small"-->
<!--                                    @click="taskDelete(scope.row)">-->
<!--                                删除-->
<!--                            </el-button>-->
<!--                        </template>-->
<!--                    </el-table-column>-->
                </el-table>
            </div>
        </div>
@@ -350,18 +350,18 @@
                            prop="status$"
                            label="状态">
                    </el-table-column>
                    <el-table-column
                            label="操作"
                            type="template">
                        <template slot-scope="scope">
                            <el-button
                                    :type="scope.row.status === 0 ? 'primary' : 'danger'"
                                    size="small"
                                    @click="toggleStatus(scope.$index, scope.row)">
                                {{ scope.row.status === 0 ? '禁用' : '解除禁用' }}
                            </el-button>
                        </template>
                    </el-table-column>
<!--                    <el-table-column-->
<!--                            label="操作"-->
<!--                            type="template">-->
<!--                        <template slot-scope="scope">-->
<!--                            <el-button-->
<!--                                    :type="scope.row.status === 0 ? 'primary' : 'danger'"-->
<!--                                    size="small"-->
<!--                                    @click="toggleStatus(scope.$index, scope.row)">-->
<!--                                {{ scope.row.status === 0 ? '禁用' : '解除禁用' }}-->
<!--                            </el-button>-->
<!--                        </template>-->
<!--                    </el-table-column>-->
                </el-table>
            </div>
        </div>