#

zzgtfwq

4 天以前 d854c87dcb5dfc629a7e1e3e8d693271908e592f

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

@@ -256,8 +256,7 @@
        }
        return workNo;
    }
    @PostMapping("/auto/、" +
            "TransplantingOut/v1")
    @PostMapping("/auto/TransplantingOut/v1")
    @ResponseBody
    public R autoTransplantingOut(@RequestBody TransplantWork transplantWork){
        // 源站点状态检测
@@ -369,6 +368,9 @@
        StartupDto dto = commonService.getLocNo( 1, devpNo,findLocNoAttributeVo, locTypeDto);
        // 更新目标库位状态
        Date now = new Date();
        if(dto == null){
            throw new CoolException("未找到库位");
        }
        LocMast locMast = locMastService.selectById(dto.getLocNo());
        if (locMast.getLocSts().equals("O")){
            locMast.setLocSts("S"); // S.入库预约
@@ -396,7 +398,16 @@
        List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(matnrs.get(0), batchs.get(0));
//        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(waitPakins.get(0));
        StartupDto dto = commonService.getLocNo( 1, devpNo,findLocNoAttributeVo, locTypeDto);
        StartupDto dto = null;
        try{
            dto = commonService.getLocNo( 1, devpNo,findLocNoAttributeVo, locTypeDto);
        } catch (Exception e){
            throw new CoolException("查询库位失败！！==》"+e.getMessage());
        }
        if (Cools.isEmpty(dto)){
            throw new CoolException("查询库位失败！！==》startupFullPutStore ==》 commonService.getLocNo");
        }

        int workNo = dto.getWorkNo();
        Date now = new Date();
        // 生成工作档
@@ -472,8 +483,15 @@
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();

        StartupDto dto = commonService.getLocNo( 10, devpNo, findLocNoAttributeVo, locTypeDto);
        StartupDto dto = null;
        try{
            dto = commonService.getLocNo( 10, devpNo, findLocNoAttributeVo, locTypeDto);
        } catch (Exception e){
            throw new CoolException("查询库位失败！！==》"+e.getMessage());
        }
        if (Cools.isEmpty(dto)){
            throw new CoolException("查询库位失败！！==》startupFullPutStore ==》 commonService.getLocNo");
        }
        int workNo = dto.getWorkNo();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();