#

1

2 天以前 68242c8f3acc051368eeb1246b2fb6327a783bfc

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

@@ -11,8 +11,10 @@
import com.zy.asrs.domain.vo.RgvStateTableVo;
import com.zy.asrs.entity.BasRgv;
import com.zy.asrs.entity.BasRgvErr;
import com.zy.asrs.entity.BasRgvMap;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.BasRgvErrMapper;
import com.zy.asrs.mapper.BasRgvMapMapper;
import com.zy.asrs.service.BasRgvService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
@@ -62,7 +64,8 @@
    private MainServiceImpl mainService;
    @Autowired
    private LocMastService locMastService;

    @Autowired
    private BasRgvMapMapper basRgvMapMapper;
    @ManagerAuth(memo = "解锁小车")
    @PostMapping("/lock")
    public R lock(CrnOperatorParam param){
@@ -88,16 +91,25 @@

            RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
            if (rgvProtocol == null) continue;
            BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());

            vo.setStatusType(rgvProtocol.modeType.desc);   // 模式状态
            vo.setStatus(String.valueOf(rgvProtocol.getMode())); // 状态
            vo.setWorkNo1(rgvProtocol.getTaskNo1());      // 工位1任务号
            vo.setStatus1(rgvProtocol.getStatusType1().desc); // 工位1状态
            vo.setLoading1(rgvProtocol.getLoaded1() ? "有物" : "无物"); // 工位1有物
            vo.setRgvPos(rgvProtocol.getRgvPos());
            vo.setRgvPos(basRgvMap != null?basRgvMap.getNowRoute():0);
            vo.setRgvPos1(rgvProtocol.getRgvPosI2());
            vo.setWalkPos(Objects.equals(rgvProtocol.getWalkPos(), 1) ? "在定位" : "不在定位");
            vo.setPakMk(rgvThread.isPakMk() ? "无锁" : "锁定");
//            vo.setPakIn(rgvThread.isPakIn() ? "可入" : "不可入");
//            vo.setPakOut(rgvThread.isPakOut() ? "可出" : "不可出");
//            vo.setPakRgv(rgvThread.isPakRgv() ? "无锁" : "锁定");
            vo.setPaking(rgvThread.isPaking()? "无锁" : "锁定");
//            vo.setPakAll(rgvThread.isPakAll() ? "无锁" : "锁定");
//            vo.setPakToCrn(rgvThread.isPakToCrn() ? "无锁" : "锁定");


            vo.setWorkNo2(rgvProtocol.getTaskNo2());      // 工位2任务号
//            vo.setStatus2(rgvProtocol.getStatusType2().desc); // 工位2状态
            vo.setLoading2(rgvProtocol.getLoaded2() ? "有物" : "无物"); // 工位2有物