界面翻译为俄语

pang.jiabao

2025-04-14 13f3721a678782cfa042acca5208644e8f32dcfb

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

@@ -26,7 +26,6 @@
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CrnLiftPosType;
import com.zy.core.enums.CrnModeType;
import com.zy.core.enums.CrnTaskModeType;
import com.zy.core.enums.SlaveType;
@@ -118,36 +117,20 @@
                continue;
            }
            vo.setWorkNo(crnProtocol.getTaskNo());  //  任务号
//            if (crnProtocol.getTaskNo()>0) {
//                WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
//                if (wrkMast != null) {
//                    vo.setStatusType(CrnStatusType.process(wrkMast.getIoType()).getDesc());   //  模式状态
//                }
//            } else {
//
//            }
            vo.setStatusType(crnProtocol.modeType.desc);   //  模式状态
            if (crnProtocol.statusType == com.zy.core.enums.CrnStatusType.WAITING) {
                vo.setStatus("等待确认");
            } else {
                vo.setStatus(crnProtocol.getStatusType().desc);     //  状态
            }
            vo.setLoading(crnProtocol.getLoaded()==1?"有物":"无物");  //  有物
            vo.setStatus(crnProtocol.getStatusType().desc);     //  状态
            vo.setLoading(crnProtocol.getLoaded()==1?"Есть товар":"Без товара");  //  有物
            vo.setBay(crnProtocol.getBay());    //  列
            vo.setLev(crnProtocol.getLevel());  //  层
            vo.setLiftPos(crnProtocol.getLiftPosType().desc);

            vo.setForkOffset(crnProtocol.getForkPosType().desc);    // 货叉位置
            vo.setXLocation(crnProtocol.getWalkPos() == 1?"是":"否");      // 走行定位
            vo.setYLocation(crnProtocol.getLiftPosType().equals(CrnLiftPosType.NONE)?"否":"是");      // 升降定位
            vo.setLiftPos(crnProtocol.getLiftPosType().desc);
            vo.setWalkPos(crnProtocol.getWalkPos()==1?"Не в позиции":"в позиции");
            vo.setWarnCode(String.valueOf(crnProtocol.getAlarm()));
            if (crnProtocol.getAlarm() > 0) {
                BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
                vo.setAlarm1(crnError==null?"未知异常":crnError.getErrName());
                vo.setAlarm(crnError==null?"未知异常":crnError.getErrName());
            }
//            vo.setAlarm1(String.valueOf(crnProtocol.getAlarm1()));
//            vo.setAlarm2(String.valueOf(crnProtocol.getAlarm2()));
//            vo.setAlarm3(String.valueOf(crnProtocol.getAlarm3()));
//            vo.setAlarm4(String.valueOf(crnProtocol.getAlarm4()));

        }
        return R.ok().add(list);
    }
@@ -411,8 +394,18 @@
        if (param.getCrnNo() == null) {
            throw new CoolException("请选择堆垛机");
        }
        MessageQueue.clear(SlaveType.Crn, param.getCrnNo());
        return R.ok("清除命令成功");
        CrnCommand command = new CrnCommand();
        command.setCrnNo(param.getCrnNo()); // 堆垛机编号
        command.setTaskNo((short) 0); // 工作号
        command.setAckFinish((short) 0);  // 任务完成确认位
        command.setTaskMode(CrnTaskModeType.NONE); // 任务模式
        command.setSourcePosX((short) 0);     // 源库位排
        command.setSourcePosY((short) 0);     // 源库位列
        command.setSourcePosZ((short) 0);     // 源库位层
        command.setDestinationPosX((short) 0);     // 目标库位排
        command.setDestinationPosY((short) 0);     // 目标库位列
        command.setDestinationPosZ((short) 0);     // 目标库位层
        return crnControl(command)?R.ok():R.error();
    }

    @ManagerAuth(memo = "手动复位")
@@ -437,6 +430,7 @@
                crnCommand.setCrnNo(crn.getId()); // 堆垛机编号
                crnCommand.setTaskMode(CrnTaskModeType.CLEAR);
                crnCommand.setAckFinish((short) 0);  // 任务完成确认位
                crnCommand.setCommand((short) 0);  // 任务完成确认位
                // 延时发送
                Thread.sleep(1000L);
                if (MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, crnCommand))) {