1

zhangc

8 天以前 2e2be15548552e9d7ecac1489a86060108f073a5

 src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java

@@ -33,8 +33,38 @@
    }

    @Override
    public List<Integer> getCrnAvailableOutSite(Integer typeNo) {
        return this.baseMapper.getCrnAvailableOutSite(typeNo);
    }

    @Override
    public List<Integer> getShuttleAvailableOutSite(Integer typeNo) {
        return this.baseMapper.getShuttleAvailableOutSite(typeNo);
    }

    @Override
    public List<Integer> getCtuAvailableOutSite(Integer typeNo) {
        return this.baseMapper.getCtuAvailableOutSite(typeNo);
    }

    @Override
    public List<Integer> getAvailableEmptyOutSite() {
        return this.baseMapper.getAvailableOutSite(110);
    }

    @Override
    public List<Integer> getCrnAvailableEmptyOutSite() {
        return this.baseMapper.getCrnAvailableOutSite(110);
    }

    @Override
    public List<Integer> getShuttleAvailableEmptyOutSite() {
        return this.baseMapper.getShuttleAvailableOutSite(110);
    }

    @Override
    public List<Integer> getCtuAvailableEmptyOutSite() {
        return this.baseMapper.getCtuAvailableOutSite(110);
    }

    @Override
@@ -43,26 +73,32 @@
    }

    @Override
    public BasDevp checkSiteStatus(Integer devpNo, boolean put) {
    public BasDevp checkSiteStatus(Integer devpNo, boolean pakin) {
        BasDevp station = selectById(devpNo);
        if (station == null){
            throw new CoolException(devpNo+"站点不存在");
        if (station == null) {
            throw new CoolException(devpNo + "站点不存在");
        }
        if (put) {
            if(station.getAutoing()==null || !station.getAutoing().equals("Y")) {
                throw new CoolException(devpNo+"站点不是自动状态");
        if (pakin) {
            if (devpNo < 1100) {
//                if (station.getWrkNo() != null && station.getWrkNo() > 0 && station.getWrkNo() < 9990) {
//                    throw new CoolException(devpNo + "站点已有工作号");
//                }
//                if (!station.getInEnable().equals("Y")) {
//                    throw new CoolException(devpNo + "站点不是可入状态");
//                }
                if (!station.getCanining().equals("Y")) {
                    throw new CoolException(devpNo + "站点不是能入状态");
                }
            } else {
                if (station.getAutoing() == null || !station.getAutoing().equals("Y")) {
                    throw new CoolException(devpNo + "站点不是自动状态");
                }
                if (station.getLoading() == null || !station.getLoading().equals("Y")) {
                    throw new CoolException(devpNo + "站点无物");
                }
            }
            if(station.getLoading()==null || !station.getLoading().equals("Y")) {
                throw new CoolException(devpNo+"站点无物");
            }
            if(station.getWrkNo()!=null && station.getWrkNo()>0) {
                throw new CoolException(devpNo+"站点已有工作号");
            }
//            if(!station.getInEnable().equals("Y")) {
//                throw new CoolException(devpNo+"站点不是可入状态");
//            }
            if(wrkMastService.getWorkingMast(devpNo)>0){
                throw new CoolException(devpNo+"站点不能同时生成两笔入库工作档");
            if (wrkMastService.getWorkingMast(devpNo) > 0) {
                throw new CoolException(devpNo + "站点不能同时生成两笔入库工作档");
            }
        }
        return station;