Merge remote-tracking branch 'gitbit/xzjlwcs' into xzjlwcs

tqs

2023-03-27 cdeb9e9559783cae56cbc6581b2e7aef893429b7

Merge remote-tracking branch 'gitbit/xzjlwcs' into xzjlwcs

 src/main/java/com/zy/common/utils/NavigatePositionConvert.java

@@ -18,13 +18,13 @@
    //xy轴转坐标编号
    public static Short xyToPosition(int x, int y) {
        StringBuffer sb = new StringBuffer();
        sb.append(y);
        sb.append(x);
        if (x < 10) {
            sb.append("00");
        } else if (x < 100) {
            sb.append("0");
        }
        sb.append(x);
        sb.append(y);
        return Short.parseShort(sb.toString());
    }

@@ -38,7 +38,7 @@
    }

    public static int[] coverPosition(int col,int row) {
        return new int[]{row, col};
        return new int[]{col, row};
    }

}

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

@@ -288,7 +288,7 @@
    }

    //分配任务
    private void assignWork(ShuttleAssignCommand assignCommand) {
    private void assignWork(ShuttleAssignCommand assignCommand) throws Exception {
        //将此map存入redis中
        HashMap<String, Object> map = new HashMap<>();

@@ -299,6 +299,13 @@
            ArrayList<ArrayList<NavigateNode>> data = NavigateUtils.getSectionPath(calc);
            //路径数据
            map.put("path", data);
            //路径次数
            map.put("pathSize", data.size());
        }else {
            if (assignCommand.getTaskMode() == ShuttleTaskModeType.PAK_IN.id.shortValue() || assignCommand.getTaskMode() == ShuttleTaskModeType.PAK_OUT.id.shortValue()) {
                //属于入库出库，必须要计算路径，则抛出异常
                throw new Exception("未能找到运行路径");
            }
        }

        //工作号
@@ -336,11 +343,11 @@
                Object o1 = pathList.get(commandStep);
                ArrayList path = JSON.parseObject(o1.toString(), ArrayList.class);

                size = path.size();
                size = Integer.parseInt(map.get("pathSize").toString());
                //开始路径
                JSONObject startPath = JSON.parseObject(path.get(0).toString());
                //目标路径
                JSONObject endPath = JSON.parseObject(path.get(size - 1).toString());
                JSONObject endPath = JSON.parseObject(path.get(path.size() - 1).toString());

                command.setCommandWord((short) 1);
                command.setStartCodeNum(NavigatePositionConvert.xyToPosition(startPath.getIntValue("x"), startPath.getIntValue("y")));
@@ -393,7 +400,7 @@
            shuttleProtocol.setPakMk(false);

            //判断数据是否执行完成
            if (commandStep < size) {
            if (commandStep < size - 1) {
                //更新redis数据
                //步序增加
                commandStep++;

 src/main/webapp/views/console.html

@@ -426,7 +426,6 @@
                mapData = data
                let content = ""
                data.forEach((rowData,index) => {
                    let lastGroup = '<div class="stock-group">'
                    //去掉上下边缘禁区
                    if(!(index == 0 || data.length - 1 == index)){
                        let row = '<div class="stock-group">';
@@ -452,18 +451,16 @@
                                        col = '<div id="site-' + data + '" class="site">' + data + '(9991)</div>';
                                        break;
                                    default:
                                        col = '<button class="item">' + index + '</button>';
                                        col = '<button class="item">' + idx + '</button>';
                                }

                                if(data.length - 2 == index){
                                    //到达真实数据的最后一行，打上行数标记
                                    lastGroup += '<button class="item">' + idx + '#</button>';
                                if(rowData.length - 2 == idx){
                                    //打上行数标记
                                    col += '<span class="row-no">' + index + '#</span>';
                                }
                                row += col
                            }
                        })
                        lastGroup += '</div>';
                        row += lastGroup;
                        row += '</div>';
                        content += row
                    }