#

Junjie

2024-07-17 1b230d7961b2d5068298f0cba13287cabd2fd649

 src/main/java/com/zy/common/web/WcsController.java

@@ -576,9 +576,8 @@
    @PostMapping("/start")
    @ResponseBody
    @Transactional
    @Synchronized
    public R start(@RequestBody ReplenishmentParam param){
        log.info("start param: " + param.toString());
    public synchronized R start(@RequestBody ReplenishmentParam param){
        log.info("agv start param: " + param.toString());
        String containerCode = param.getContainerCode();
        if(Cools.isEmpty(containerCode)){
            throw new CoolException("料箱码为空");
@@ -613,7 +612,7 @@
        }

        //入库任务
        if (!Cools.isEmpty(agvWaitPakinService.selectByContainerCode(containerCode))){
        if (!Cools.isEmpty(agvWaitPakinService.selectByContainerCode(containerCode)) && Cools.isEmpty(agvWrkMast)){
            //绑定站点
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);
            //生成工作档
@@ -687,11 +686,20 @@
    @ResponseBody
    public R containerMove(@RequestBody ReplenishmentParam param){

        String devNo = param.getDevNo();
        if(Cools.isEmpty(currentContainerMap)){
            currentContainerMap = new HashMap<>();
        String devNo = Cools.eq("CS-310",param.getDevNo()) ? "310-1" : Cools.eq("CS-311",param.getDevNo()) ? "312-2" : Cools.eq("CS-312",param.getDevNo()) ? "314-1" : Cools.eq("CS-313",param.getDevNo()) ? "316-1" : null;

        if(Cools.isEmpty(devNo)){
            return R.error("站点有误");
        }
        String containerCode = currentContainerMap.get(devNo);

        AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
        String containerCode = agvBasDevp.getBarcode();

//        String devNo = param.getDevNo();
//        if(Cools.isEmpty(currentContainerMap)){
//            currentContainerMap = new HashMap<>();
//        }
//        String containerCode = currentContainerMap.get(devNo);

        AgvBasDevpDto agvBasDevpDto = new AgvBasDevpDto();