#当前本版十分完美、冻结

luxiaotao1123

2020-07-27 fba1d7c01607270707f6bdd5cd255bea0e141cf3

#当前本版十分完美、冻结

 src/main/java/com/zy/asrs/service/BasDevpService.java

@@ -37,4 +37,11 @@
     */
    BasDevp checkSiteStatus(Integer devpNo);

    /**
     * 目标站点状态检测
     * @param devpNo
     * @param put 是否入库操作 true 是 ； false 不是
     */
    BasDevp checkSiteStatus(Integer devpNo, boolean put);

}

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

@@ -39,21 +39,28 @@

    @Override
    public BasDevp checkSiteStatus(Integer devpNo) {
        return checkSiteStatus(devpNo, false);
    }

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

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

@@ -62,7 +62,7 @@
            throw new CoolException(BaseRes.PARAM);
        }
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getDevpNo());
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getDevpNo(), true);
        // 生成工作号
        int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);
        // 检索库位
@@ -244,7 +244,7 @@
    @Transactional
    public String emptyPlateIn(Integer devpNo, Long userId) {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo);
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 生成工作号
        int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);
        // 检索库位