#

Junjie

1 天以前 bcd8d392d27ae13ed21fc1c96920a37544992d04

 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,7 +193,7 @@
    }

    @Transactional
    public void startupPickPutStore(SearchLocParam param) {
    public StartupDto startupPickPutStore(SearchLocParam param) {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.selectById(param.getSourceStaNo());
        sourceStaNo.setLocType1(param.getLocType1());
@@ -214,7 +214,10 @@
        }

        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) {
@@ -267,13 +270,13 @@
            throw new CoolException(locMast.getLocNo() + "库位状态不处于空库位");
        }

        locMast.setLocSts("S");
        // 修改库位状态 Q.拣料/盘点/并板再入库
        locMast.setLocSts("Q");
        locMast.setModiTime(new Date());
        if (!locMastService.updateById(locMast)) {
            throw new CoolException("修改库位状态失败");
        }

        // 修改库位状态 Q.拣料/盘点/并板再入库
        LocMast sourceLocMast = locMastService.selectById(wrkMast.getSourceLocNo());
        if (!sourceLocMast.getLocSts().equals("P")) {
            throw new CoolException(sourceLocMast.getLocNo() + "库位状态不处于P.拣料盘点出库");
@@ -311,6 +314,7 @@
            }
        }

        return dto;
    }

    /**