#

Junjie

昨天 177188e74cbb15581132578b7b2857957b667a94

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

@@ -135,9 +135,9 @@
            return R.error("托盘码不存在");
        }

        startupPickPutStore(param);
        StartupDto dto = startupPickPutStore(param);
        log.info("WCS拣料盘点入库接口,托盘码:{}", param.getBarcode());
        return R.ok();
        return R.ok().add(dto);
    }

    @PostMapping("/auto/emptyIn/v1")
@@ -193,9 +193,9 @@
    }

    @Transactional
    public void startupPickPutStore(SearchLocParam param) {
    public StartupDto startupPickPutStore(SearchLocParam param) {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
        BasDevp sourceStaNo = basDevpService.selectById(param.getSourceStaNo());
        sourceStaNo.setLocType1(param.getLocType1());
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
        if (param.getBarcode().startsWith("11")) {
@@ -214,10 +214,13 @@
        }

        if (wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57) {
            throw new CoolException(wrkMast.getWrkNo() + "工作号，任务已经拣选盘点");
            StartupDto dto = new StartupDto();
            dto.setWorkNo(wrkMast.getWrkNo());
            dto.setStaNo(wrkMast.getStaNo());
            return dto;
        }

        if (wrkMast.getIoType() != 103 || wrkMast.getIoType() != 107) {
        if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 107) {
            throw new CoolException(wrkMast.getWrkNo() + "工作号，任务不属于拣选盘点");
        }

@@ -230,7 +233,9 @@
        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
        findLocNoAttributeVo.setMatnr(wrkDetl.getMatnr());

        StartupDto dto = commonService.getLocNo(1, param.getSourceStaNo(), findLocNoAttributeVo, locTypeDto, param.getBarcode());
        int ioType = wrkMast.getIoType() - 50; // 入出库类型: 103->53,104->54,107->57

        StartupDto dto = commonService.getLocNo(ioType, param.getSourceStaNo(), findLocNoAttributeVo, locTypeDto, param.getBarcode());
        if (dto == null) {
            throw new CoolException("找不到空库位");
        }
@@ -247,7 +252,7 @@

        Date now = new Date();
        // 更新工作档数据状态
        wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57
        wrkMast.setIoType(ioType); // 入出库类型: 103->53,104->54,107->57
        wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
        wrkMast.setCrnNo(dto.getCrnNo());
        wrkMast.setSourceStaNo(dto.getSourceStaNo());
@@ -265,7 +270,7 @@
            throw new CoolException(locMast.getLocNo() + "库位状态不处于空库位");
        }

        locMast.setLocSts("S");
        locMast.setLocSts("Q");
        locMast.setModiTime(new Date());
        if (!locMastService.updateById(locMast)) {
            throw new CoolException("修改库位状态失败");
@@ -309,6 +314,7 @@
            }
        }

        return dto;
    }

    /**