#

Junjie

2 天以前 6d99081f3f6e0363b0bd28053e545a8e4589b979

#

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

@@ -221,6 +221,7 @@
                            StationObjModel barcodeStationModel = new StationObjModel();
                            barcodeStationModel.setDeviceNo(deviceNo);
                            barcodeStationModel.setStationId(value.getInteger("stationId"));
                            barcodeStationModel.setBarcodeIdx(value.getInteger("barcodeIdx"));

                            if (value.getInteger("backStation") != null) {
                                StationObjModel backStation = new StationObjModel();

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

@@ -119,7 +119,9 @@
                vo.setEnableIn(stationProtocol.isEnableIn());// å¯åŠ¨å…¥åº“
                vo.setPalletHeight(stationProtocol.getPalletHeight()); // æ‰˜ç›˜é«˜åº¦
                vo.setError(stationProtocol.getError()); // é”™è¯¯ç 
                vo.setErrorMsg(stationProtocol.getErrorMsg()); // æŠ¥è­¦ä¿¡æ¯
                vo.setBarcode(stationProtocol.getBarcode()); // æ¡ç 
                vo.setWeight(stationProtocol.getWeight());//重量
                String stationStatus = StationStatusType.process(stationProtocol).toString().toLowerCase().replaceAll("_", "-");
                if (stationProtocol.isAutoing() && stationProtocol.isLoading() && stationProtocol.getTaskNo() > 0 && !stationProtocol.isRunBlock()) {
                    String taskClass = getStationTaskClass(stationProtocol.getTaskNo(), inTaskRange, outTaskRange);

 src/main/java/com/zy/asrs/domain/vo/StationLatestDataVo.java

@@ -44,9 +44,15 @@
    //报警
    private Integer error;

    //报警信息
    private String errorMsg;

    //条码
    private String barcode;

    private String stationStatus;

    //重量
    private Double weight;

}

 src/main/java/com/zy/asrs/utils/Utils.java

@@ -193,10 +193,20 @@
                    .eq("in_enable", "Y")
                    .eq("status", 1);

            if (hasConfig) {
                wrapper.in("crn_no", allowedCrnNos);
            }

            if (currentCircleTaskCrnNo != null) {
                currentCircleTaskCrnNo = currentCircleTaskCrnNo + 1;
                BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", currentCircleTaskCrnNo));
                List<WrkMast> currentCrnTask = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", currentCircleTaskCrnNo));
                BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
                        .eq("crn_no", currentCircleTaskCrnNo)
                        .eq("in_enable", "Y")
                        .eq("status", 1)
                );
                List<WrkMast> currentCrnTask = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                        .eq("crn_no", currentCircleTaskCrnNo)
                );
                if (currentCrnTask.size() <= 1) {
                    if (basCrnp != null) {
                        List<List<Integer>> rowList = basCrnp.getControlRows$();
@@ -230,9 +240,6 @@

            List<BasCrnp> enabledCrnps = new ArrayList<>();
            for (BasCrnp basCrnp : baseList) {
                if (hasConfig && !allowedCrnNos.contains(basCrnp.getCrnNo())) {
                    continue;
                }
                CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo());
                if (crnThread == null) {
                    continue;
@@ -311,6 +318,10 @@
                    .eq("in_enable", "Y")
                    .eq("status", 1);

            if (hasConfig) {
                wrapper.in("crn_no", allowedCrnNos);
            }

            HashMap<Integer, Integer> map = new HashMap<>();
            List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<>());
            List<BasDualCrnp> basDualCrnps = basDualCrnpService.selectList(wrapper);
@@ -333,10 +344,6 @@

            List<BasDualCrnp> enabledCrnps = new ArrayList<>();
            for (BasDualCrnp basDualCrnp : baseList) {
                if (hasConfig && !allowedCrnNos.contains(basDualCrnp.getCrnNo())) {
                    continue;
                }

                DualCrnThread dualCrnThread = (DualCrnThread) SlaveConnection.get(SlaveType.DualCrn, basDualCrnp.getCrnNo());
                if (dualCrnThread == null) {
                    continue;

 src/main/java/com/zy/core/enums/RedisKeyType.java

@@ -40,6 +40,7 @@
    CHECK_STATION_RUN_BLOCK_LIMIT_("check_station_run_block_limit_"),
    CHECK_SHALLOW_LOC_STATUS_LIMIT("check_shallow_loc_status_limit_"),
    GENERATE_ENABLE_IN_STATION_DATA_LIMIT("generate_enable_in_station_data_limit_"),
    GENERATE_STATION_BACK_LIMIT("generate_station_back_limit_"),

    DUAL_CRN_PICK_WAIT_NEXT_TASK("dual_crn_pick_wait_next_task_"),
    DUAL_CRN_OUT_TASK_STATION_INFO("dual_crn_out_task_station_info_"),

 src/main/java/com/zy/core/enums/WrkIoType.java

@@ -8,6 +8,8 @@
    OUT(101, "出库"),
    LOC_MOVE(201, "移库任务"),
    FAKE_TASK_NO(9999, "仿真随机工作号"),
    ENABLE_IN(9998, "启动入库"),
    STATION_BACK(9997, "站点回退"),
    ;

    WrkIoType(int id, String desc) {

 src/main/java/com/zy/core/model/StationObjModel.java

@@ -17,6 +17,8 @@

    private Integer stationLev;

    private Integer barcodeIdx;

    private StationObjModel barcodeStation;

    private StationObjModel backStation;

 src/main/java/com/zy/core/model/protocol/StationProtocol.java

@@ -49,6 +49,9 @@
    //报警
    private Integer error;

    //报警信息
    private String errorMsg;

    //条码
    private String barcode;


 src/main/java/com/zy/core/network/entity/ZyStationStatusEntity.java

@@ -41,6 +41,9 @@
    //报警
    private Integer error;

    //报警信息
    private String errorMsg;

    //条码
    private String barcode;


 src/main/java/com/zy/core/network/real/ZyStationRealConnect.java

@@ -22,6 +22,7 @@
import com.zy.core.network.api.ZyStationConnectApi;
import com.zy.core.network.entity.ZyStationStatusEntity;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;

import java.text.MessageFormat;
@@ -87,6 +88,9 @@
            }

            statusList = JSONObject.parseArray(basDevp.getStationList(), ZyStationStatusEntity.class);
            if (statusList != null) {
                statusList.sort(Comparator.comparing(ZyStationStatusEntity::getStationId));
            }
            barcodeStatusList = JSONObject.parseArray(basDevp.getBarcodeStationList(), ZyStationStatusEntity.class);
        }


 src/main/java/com/zy/core/network/real/ZyStationV3RealConnect.java

@@ -17,6 +17,7 @@
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.StationCommandType;
import com.zy.core.model.CommandResponse;
import com.zy.core.model.StationObjModel;
import com.zy.core.model.command.StationCommand;
import com.zy.core.network.api.ZyStationConnectApi;
import com.zy.core.network.entity.ZyStationStatusEntity;
@@ -35,7 +36,7 @@
public class ZyStationV3RealConnect implements ZyStationConnectApi {

    private List<ZyStationStatusEntity> statusList;
    private List<ZyStationStatusEntity> barcodeStatusList;
    private List<StationObjModel> barcodeOriginList;
    private SiemensS7Net siemensNet;
    private DeviceConfig deviceConfig;
    private RedisUtil redisUtil;
@@ -94,10 +95,7 @@
            if (statusList != null) {
                statusList.sort(Comparator.comparing(ZyStationStatusEntity::getStationId));
            }
            barcodeStatusList = JSONObject.parseArray(basDevp.getBarcodeStationList(), ZyStationStatusEntity.class);
            if (barcodeStatusList != null) {
                barcodeStatusList.sort(Comparator.comparing(ZyStationStatusEntity::getStationId));
            }
            barcodeOriginList = basDevp.getBarcodeStationList$();
        }

        if (siemensNet == null) {
@@ -122,21 +120,94 @@
                boolean[] status2 = siemensNet.getByteTransform().TransBool(result.Content, i * 8 + 7, 1);
                statusEntity.setRunBlock(status2[1]);//重新规划路线
                statusEntity.setEnableIn(status2[3]);//启动入库

                Integer palletHeight = null;
                if (status[7]) {
                    palletHeight = 1;//低
                }
                if (status2[0]) {
                    palletHeight = 2;//中
                }
                if (status[6]) {
                    palletHeight = 3;//高
                }
                statusEntity.setPalletHeight(palletHeight);//高低信号

                statusEntity.setError(0);//默认无报警
            }
        }

        // æ¡ç æ‰«æå™¨
        OperateResultExOne<byte[]> result2 = siemensNet.Read("DB101.0", (short) (statusList.size() * 10));
        OperateResultExOne<byte[]> result2 = siemensNet.Read("DB101.0", (short) (barcodeOriginList.size() * 16));
        if (result2.IsSuccess) {
            for (int i = 0; i < barcodeStatusList.size(); i++) {
                ZyStationStatusEntity barcodeEntity = barcodeStatusList.get(i);
                ZyStationStatusEntity statusEntity = findStatusEntity(barcodeEntity.getStationId());
                if (statusEntity == null) {
            for (int i = 0; i < barcodeOriginList.size(); i++) {
                ZyStationStatusEntity barcodeEntity = findStatusEntityByBarcodeIdx(i + 1);
                if (barcodeEntity == null) {
                    continue;
                }
                String barcode = siemensNet.getByteTransform().TransString(result2.Content, i * 10 + 2, 8, "UTF-8");
                String barcode = siemensNet.getByteTransform().TransString(result2.Content, i * 16 + 2, 14, "UTF-8");
                barcode = barcode.trim();
                barcodeEntity.setBarcode(barcode);
            }
        }

        // ç§°é‡
        OperateResultExOne<byte[]> result3 = siemensNet.Read("DB102.0", (short) (barcodeOriginList.size() * 4));
        if (result3.IsSuccess) {
            for (int i = 0; i < barcodeOriginList.size(); i++) {
                ZyStationStatusEntity barcodeEntity = findStatusEntityByBarcodeIdx(i + 1);
                if (barcodeEntity == null) {
                    continue;
                }
                double weight = (double) siemensNet.getByteTransform().TransSingle(result3.Content, i * 4);
                barcodeEntity.setWeight(weight);
            }
        }

        // æŠ¥è­¦ä¿¡æ¯
        OperateResultExOne<byte[]> result4 = siemensNet.Read("DB103.0", (short) (barcodeOriginList.size() * 2));
        if (result4.IsSuccess) {
            for (int i = 0; i < barcodeOriginList.size(); i++) {
                ZyStationStatusEntity barcodeEntity = findStatusEntityByBarcodeIdx(i + 1);
                if (barcodeEntity == null) {
                    continue;
                }

                StringBuilder sb = new StringBuilder();
                boolean[] status1 = siemensNet.getByteTransform().TransBool(result4.Content, i * 2, 1);
                boolean[] status2 = siemensNet.getByteTransform().TransBool(result4.Content, i * 2 + 1, 1);

                if(status1[0]){
                    sb.append("左超宽报警;");
                }
                if(status1[1]) {
                    sb.append("右超宽报警;");
                }
                if(status1[2]) {
                    sb.append("前超长报警;");
                }
                if(status1[3]) {
                    sb.append("后超长报警;");
                }
                if(status1[4]) {
                    sb.append("超高报警;");
                }
                if(status1[5]) {
                    sb.append("有货报警，空托入库时检测托盘上有无货物;");
                }
                if(status1[6]) {
                    sb.append("重量异常报警;");
                }
                if(status1[7]) {
                    sb.append("扫码异常;");
                }

                if(sb.length() > 0) {
                    barcodeEntity.setError(1);
                }else {
                    barcodeEntity.setError(0);
                }
                barcodeEntity.setErrorMsg(sb.toString());
            }
        }

@@ -199,6 +270,46 @@
                log.error("写入输送线命令失败。站点编号={}，站点数据={}", command.getTaskNo(), JSON.toJSON(command));
                commandResponse.setResult(false);
            }
        } else if (command.getCommandType().equals(StationCommandType.WRITE_INFO)) {
            int enableCommandIdx = -1;
            while (true) {
                enableCommandIdx = getEnableCommandIdx(command.getTaskNo());
                if(enableCommandIdx == -1) {
                    try {
                        Thread.sleep(300);
                    }catch (Exception e) {}
                }else {
                    break;
                }
                tryCount++;
                if (tryCount > maxTryCount) {
                    commandResponse.setMessage("命令下发超时，无法找到可用下发区域");
                    return commandResponse;
                }
            }

            short[] data = new short[21];
            data[0] = command.getTargetStaNo().shortValue();
            data[1] = command.getTargetStaNo().shortValue();

            OperateResult writeTask = siemensNet.Write("DB23." + (enableCommandIdx * taskAddressLength), command.getTaskNo());
            try {
                Thread.sleep(50);
            }catch (Exception e) {}

            OperateResult writeData = siemensNet.Write("DB23." + (enableCommandIdx * taskAddressLength + 4), data);
            try {
                Thread.sleep(200);
            }catch (Exception e) {}
            OperateResult writeConfirm = siemensNet.Write("DB23." + (enableCommandIdx * taskAddressLength + 46), (short) 1);

            if(writeTask.IsSuccess &&  writeData.IsSuccess &&  writeConfirm.IsSuccess) {
                log.error("写入输送线命令成功。任务号={}，站点数据={}", command.getTaskNo(), JSON.toJSON(command));
                commandResponse.setResult(true);
            }else {
                log.error("写入输送线命令失败。站点编号={}，站点数据={}", command.getTaskNo(), JSON.toJSON(command));
                commandResponse.setResult(false);
            }
        }
        return commandResponse;
    }
@@ -231,10 +342,18 @@
        return new byte[0];
    }

    private ZyStationStatusEntity findStatusEntity(Integer stationId) {
        for (ZyStationStatusEntity statusEntity : statusList) {
            if (statusEntity.getStationId().equals(stationId)) {
                return statusEntity;
    private ZyStationStatusEntity findStatusEntityByBarcodeIdx(Integer barcodeIdx) {
        Integer stationId = null;
        for (StationObjModel stationObjModel : barcodeOriginList) {
            if (stationObjModel.getBarcodeIdx().equals(barcodeIdx)) {
                stationId = stationObjModel.getStationId();
                break;
            }
        }

        for (ZyStationStatusEntity zyStationStatusEntity : statusList) {
            if(zyStationStatusEntity.getStationId().equals(stationId)) {
                return zyStationStatusEntity;
            }
        }
        return null;
@@ -243,9 +362,9 @@
    private int getEnableCommandIdx(int taskNo) {
        int useIdx = -1;
        for (int i = 0; i < taskAddressLimit; i++) {
            OperateResultExOne<byte[]> resultTask = siemensNet.Read("DB23." + (i * taskAddressLength + 0), (short) 2);
            OperateResultExOne<byte[]> resultTask = siemensNet.Read("DB23." + (i * taskAddressLength + 0), (short) 4);
            OperateResultExOne<byte[]> resultStatus = siemensNet.Read("DB23." + (i * taskAddressLength + 46), (short) 2);
            if(resultTask.IsSuccess && resultStatus.IsSuccess) {
            if(!resultTask.IsSuccess || !resultStatus.IsSuccess) {
                continue;
            }


 src/main/java/com/zy/core/plugin/NormalProcess.java

@@ -56,10 +56,10 @@

    @Override
    public void run() {
        //请求生成入库任务
        generateStoreWrkFile();
        //检测入库站是否有任务生成，并启动入库
        checkInStationHasTask();
        //请求生成入库任务
        generateStoreWrkFile();

        //执行堆垛机任务
        crnOperateUtils.crnIoExecute();
@@ -71,6 +71,9 @@
        stationOperateProcessUtils.stationOutExecute();
        //检测输送站点出库任务执行完成
        stationOperateProcessUtils.stationOutExecuteFinish();

        //检测输送站点是否运行堵塞
        stationOperateProcessUtils.checkStationRunBlock();
    }

    /**
@@ -102,8 +105,23 @@
                //满足自动、有物、有工作号，生成入库数据
                if (stationProtocol.isAutoing()
                        && stationProtocol.isLoading()
                        && stationProtocol.isInEnable()
                        && stationProtocol.getTaskNo() > 0
                ) {
                    if (stationProtocol.getError() > 0) {
                        Object backLock = redisUtil.get(RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + stationId);
                        if (backLock != null) {
                            continue;
                        }

                        //报警回退
                        StationCommand command = stationThread.getCommand(StationCommandType.MOVE, commonService.getWorkNo(WrkIoType.STATION_BACK.id), stationId, entity.getBackStation().getStationId(), 0);
                        MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
                        redisUtil.set(RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + stationId, "lock", 15);
                        News.info("{}站点报警回退成功，数据包:{}", stationId, JSON.toJSONString(command));
                        continue;
                    }

                    if (Cools.isEmpty(stationProtocol.getBarcode())) {
                        continue;
                    }
@@ -135,13 +153,6 @@
                        taskParam.setTaskPri(dto.getTaskPri());
                        taskParam.setBarcode(stationProtocol.getBarcode());
                        WrkMast wrkMast = commonService.createInTask(taskParam);

                        StationCommand command = stationThread.getCommand(StationCommandType.WRITE_INFO, wrkMast.getWrkNo(), stationId, stationId, 0);
                        if(command == null){
                            News.taskInfo(wrkMast.getWrkNo(), "获取输送线命令失败");
                            continue;
                        }
                        MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
                    }
                }
            }
@@ -182,9 +193,10 @@
                        && stationProtocol.getTaskNo() == 0
                        && stationProtocol.isEnableIn()
                ) {
                    StationCommand command = stationThread.getCommand(StationCommandType.MOVE, commonService.getWorkNo(WrkIoType.FAKE_TASK_NO.id), stationId, entity.getBarcodeStation().getStationId(), 0);
                    StationCommand command = stationThread.getCommand(StationCommandType.MOVE, commonService.getWorkNo(WrkIoType.ENABLE_IN.id), stationId, entity.getBarcodeStation().getStationId(), 0);
                    MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
                    redisUtil.set(RedisKeyType.GENERATE_ENABLE_IN_STATION_DATA_LIMIT.key + stationId, "lock", 10);
                    redisUtil.set(RedisKeyType.GENERATE_ENABLE_IN_STATION_DATA_LIMIT.key + stationId, "lock", 15);
                    News.info("{}站点启动入库成功，数据包:{}", stationId, JSON.toJSONString(command));
                }
            }
        }

 src/main/java/com/zy/core/thread/impl/ZyStationThread.java

@@ -136,8 +136,11 @@
                    stationProtocol.setFullPlt(statusEntity.isFullPlt());
                    stationProtocol.setPalletHeight(statusEntity.getPalletHeight());
                    stationProtocol.setError(statusEntity.getError());
                    stationProtocol.setErrorMsg(statusEntity.getErrorMsg());
                    stationProtocol.setBarcode(statusEntity.getBarcode());
                    stationProtocol.setRunBlock(statusEntity.isRunBlock());
                    stationProtocol.setEnableIn(statusEntity.isEnableIn());
                    stationProtocol.setWeight(statusEntity.getWeight());
                }
            }
        }

 src/main/java/com/zy/core/thread/impl/ZyStationV3Thread.java

@@ -140,9 +140,11 @@
                    stationProtocol.setFullPlt(statusEntity.isFullPlt());
                    stationProtocol.setPalletHeight(statusEntity.getPalletHeight());
                    stationProtocol.setError(statusEntity.getError());
                    stationProtocol.setErrorMsg(statusEntity.getErrorMsg());
                    stationProtocol.setBarcode(statusEntity.getBarcode());
                    stationProtocol.setRunBlock(statusEntity.isRunBlock());
                    stationProtocol.setEnableIn(statusEntity.isEnableIn());
                    stationProtocol.setWeight(statusEntity.getWeight());
                }
            }
        }
@@ -294,7 +296,7 @@
            List<Integer> segmentEndIndices = new ArrayList<>();
            int idx = 0;
            while (idx < total) {
                int end = Math.min(idx + 20, total) - 1;
                int end = Math.min(idx + 3, total) - 1;
                segmentTargets.add(path.get(end));
                segmentEndIndices.add(end);
                idx = end + 1;
@@ -314,22 +316,29 @@
            segCmd.setNavigatePath(new ArrayList<>(path.subList(0, currentEndIdx + 1)));
            sendCommand(segCmd);

            boolean finished = false;
            while (!finished) {
            long runTime = System.currentTimeMillis();
            while (true) {
                try {
                    Integer currentStationId = findCurrentStationByTask(original.getTaskNo());
                    if (currentStationId == null) {
                    StationProtocol currentStation = findCurrentStationByTask(original.getTaskNo());
                    if (currentStation == null) {
                        if(System.currentTimeMillis() - runTime > 1000 * 60){
                            break;
                        }
                        Thread.sleep(500);
                        continue;
                    }
                    int currentIndex = path.indexOf(currentStationId);

                    runTime = System.currentTimeMillis();
                    if (currentStation.isRunBlock()) {
                        break;
                    }
                    int currentIndex = path.indexOf(currentStation.getStationId());
                    if (currentIndex < 0) {
                        Thread.sleep(500);
                        continue;
                    }
                    int remaining = total - currentIndex - 1;
                    if (remaining <= 0) {
                        finished = true;
                        break;
                    }
                    int currentSegEndIndex = path.indexOf(segmentTargets.get(segCursor));
@@ -361,7 +370,7 @@
        }
    }

    private Integer findCurrentStationByTask(Integer taskNo) {
    private StationProtocol findCurrentStationByTask(Integer taskNo) {
        try {
            com.zy.asrs.service.DeviceConfigService deviceConfigService = SpringUtils.getBean(com.zy.asrs.service.DeviceConfigService.class);
            if (deviceConfigService == null) {
@@ -380,7 +389,7 @@
                }
                for (StationProtocol sp : m.values()) {
                    if (sp.getTaskNo() != null && sp.getTaskNo().equals(taskNo) && sp.isLoading()) {
                        return sp.getStationId();
                        return sp;
                    }
                }
            }

 src/main/java/com/zy/core/utils/StationOperateProcessUtils.java

@@ -90,11 +90,6 @@
                        continue;
                    }

                    if (!wrkMast.getWrkNo().equals(stationProtocol.getTaskNo())) {
                        News.taskInfo(stationProtocol.getStationId(), "输送站点工作号:{}与条码搜索到的任务工作号:{}不一致", stationProtocol.getTaskNo(), wrkMast.getWrkNo());
                        continue;
                    }

                    String locNo = wrkMast.getLocNo();
                    FindCrnNoResult findCrnNoResult = commonService.findCrnNoByLocNo(locNo);
                    if (findCrnNoResult == null) {

 src/main/resources/docs/µØͼ²Ù×÷˵Ã÷Êé.pdf

Binary files differ

 src/main/resources/sql/20251219153026.nb3

Binary files differ

 src/main/resources/sql/20260109084743.nb3

Binary files differ

 src/main/webapp/components/DevpCard.js

@@ -43,10 +43,12 @@
                <el-descriptions-item label="启动入库">{{ item.enableIn ? 'Y' : 'N' }}</el-descriptions-item>
                <el-descriptions-item label="托盘高度">{{ item.palletHeight }}</el-descriptions-item>
                <el-descriptions-item label="条码">{{ item.barcode }}</el-descriptions-item>
                <el-descriptions-item label="重量">{{ item.weight }}</el-descriptions-item>
                <el-descriptions-item label="故障代码">{{ item.error }}</el-descriptions-item>
                <el-descriptions-item label="故障信息">{{ item.errorMsg }}</el-descriptions-item>
                <el-descriptions-item label="扩展数据">{{ item.extend }}</el-descriptions-item>
            </el-descriptions>
            </el-collapse-item>
            </el-collapse-item>                                                   
          </el-collapse>
        </div>
        <div style="display:flex; justify-content:flex-end; margin-top:8px;">

 src/main/webapp/components/MapCanvas.js

@@ -539,7 +539,7 @@
        }
        if (status === "site-auto") {
          this.updateColor(sta, 0x78ff81);
        } else if (status === "site-auto-run" || status === "site-auto-run-id") {
        } else if (status === "site-auto-run" || status === "site-auto-id" || status === "site-auto-run-id") {
          this.updateColor(sta, 0xfa51f6);
        } else if (status === "site-unauto") {
          this.updateColor(sta, 0xb8b8b8);