#

Junjie

4 天以前 28e6395846e2aaa1903b421ee544cd38c27c0a6d

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

@@ -195,7 +195,7 @@
    @Transactional
    public void 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")) {
@@ -217,7 +217,7 @@
            throw new CoolException(wrkMast.getWrkNo() + "工作号，任务已经拣选盘点");
        }

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

@@ -230,7 +230,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 +249,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());