#车锁

zjj

2024-03-02 e1e86c9e9f640c9950928429b7f402ba39beaca4

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

@@ -35,6 +35,7 @@
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
import com.zy.core.thread.RgvThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -293,6 +294,7 @@
        if (sourceLoc.getLocType1() != loc.getLocType1()){
            return R.error("库位类型不一致");
        }
        command.setTraySize(loc.getLocType1() == 2);
//        VersionUtils.locMoveCheckLocType(sourceLoc, loc);
        return crnControl(command)?R.ok():R.error();
    }
@@ -383,6 +385,14 @@
        return crnControl(command)?R.ok():R.error();
    }

    @ManagerAuth(memo = "解锁小车")
    @PostMapping("/lock")
    public R lock(CrnOperatorParam param){
        RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, param.getCrnNo());
        rgvThread.setPakMk(true);
        return R.ok();
    }

//    @ManagerAuth(memo = "暂停")
//    @PostMapping("/operator/pause")
//    public R crnPause(CrnOperatorParam param){