#

tzsk

2024-02-20 ef1a6adb261a5c30fed6361676dcd54cbbda02e4

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

@@ -497,21 +497,21 @@
            throw new CoolException(dto.getLocNo() + "目标库位已被占用");
        }

        Date now = new Date();
        for (LocDetl locDetl : locDetls) {
            locDetl.setLocNo(dto.getLocNo());//修改目标库位
            locDetl.setAppeTime(now);
            locDetl.setModiTime(now);
            if (!locDetlService.insert(locDetl)) {
                throw new CoolException("库存明细更新失败");
            }
        }
//        Date now = new Date();
//        for (LocDetl locDetl : locDetls) {
//            locDetl.setLocNo(dto.getLocNo());//修改目标库位
//            locDetl.setAppeTime(now);
//            locDetl.setModiTime(now);
//            if (!locDetlService.insert(locDetl)) {
//                throw new CoolException("库存明细更新失败");
//            }
//        }

        //检查目标库位，库存明细是否添加成功
        List<LocDetl> checkLocDetls = locDetlService.selectByLocNo(dto.getLocNo());
        if (checkLocDetls.isEmpty()) {
            throw new CoolException("库存明细迁移失败");
        }
//        //检查目标库位，库存明细是否添加成功
//        List<LocDetl> checkLocDetls = locDetlService.selectByLocNo(dto.getLocNo());
//        if (checkLocDetls.isEmpty()) {
//            throw new CoolException("库存明细迁移失败");
//        }

//        //清空源库位数据
        LocMast locMast1 = locMastService.selectByLoc(wrkMast.getSourceLocNo());
@@ -578,7 +578,7 @@
    @PostMapping("/start")
    @ResponseBody
    public R start(@RequestBody ReplenishmentParam param){

        log.info("start param: " + param.toString());
        String containerCode = param.getContainerCode();
        if(Cools.isEmpty(containerCode)){
            throw new CoolException("料箱码为空");
@@ -686,6 +686,9 @@
    public R containerMove(@RequestBody ReplenishmentParam param){

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

        AgvBasDevpDto agvBasDevpDto = new AgvBasDevpDto();
@@ -723,10 +726,10 @@
            agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList);
        }

        System.out.println("currentContainerMap: " + currentContainerMap);
        //System.out.println("currentContainerMap: " + currentContainerMap);


        System.out.println("agvBasDevpDto: " + agvBasDevpDto);
        //System.out.println("agvBasDevpDto: " + agvBasDevpDto);

        return R.ok(agvBasDevpDto);
    }