基础数据err

Junjie

2023-06-03 ef811df34e156ea6d253fbfa12c76b4c0a593840

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

@@ -162,45 +162,47 @@
    public void startupFullTakeStore(StockOutParam param, Long userId) {
        ArrayList<String> locNos = new ArrayList<>();
        for (StockOutParam.LocDetl locDetl:param.getLocDetls()){
            locNos.add(locDetl.getLocNo());
            if (!locNos.contains(locDetl.getLocNo())){
                locNos.add(locDetl.getLocNo());
            }
        }
        //检测是否为浅库位
        List<LocMast> locMasts = null;
        boolean sign=false;
        String th = "";
        for (StockOutParam.LocDetl locDetl:param.getLocDetls()){
            int row = getRow(locDetl.getLocNo());
            int bay = getBay(locDetl.getLocNo());
            int lev = getLev(locDetl.getLocNo());
            if (!(row==4 || row==5)){
                if (row>5){
                    locMasts=locMastService.selectList(new EntityWrapper<LocMast>().ge("row1", 5).le("row1", row)
                            .eq("bay1",bay).eq("lev1",lev));
                    for (LocMast locMast1:locMasts){
                        if (locNos.contains(locMast1.getLocNo())){
                            continue;
                        }
                        if (locMast1.getRow1()<row){
                            if (!locMast1.getLocSts().equals("O")){
                                sign=true;
                                th="库位号："+locDetl.getLocNo()+" 浅库位有非空库位！";
                                break;
                            }
                        }
        for (String locNo:locNos){
            if (sign){
                break;
            }

            //检测出库的货物中是否有状态为禁止的货物。
            for (LocDetl locDetl : locDetlService.selectByLocNo(locNo)) {
                if (locDetl.getStockFreeze() == 0) {
                    th="库位号："+locNo+" 有禁止出库的货物！";
                    throw new CoolException("出库失败；"+th);
                }

                Mat mat = matService.selectByMatnr(locDetl.getMatnr());
                if (mat == null) {
                    continue;
                }
                if (mat.getStatus() == 0) {
                    th="库位号："+locNo+" 有禁止出库的货物！";
                    throw new CoolException("出库失败；"+th);
                }
            }

            List<String> groupInsideLoc = Utils.getGroupInsideLoc(locNo);
            if (!Cools.isEmpty(groupInsideLoc)) {
                for (String insideLoc : groupInsideLoc) {
                    if (locNos.contains(insideLoc)){
                        continue;
                    }
                }else {
                    locMasts=locMastService.selectList(new EntityWrapper<LocMast>().le("row1", 4).ge("row1", row)
                            .eq("bay1",bay).eq("lev1",lev));
                    for (LocMast locMast1:locMasts){
                        if (locNos.contains(locMast1.getLocNo())){
                            continue;
                        }
                        if (locMast1.getRow1()>row){
                            if (!locMast1.getLocSts().equals("O")){
                                sign=true;
                                th="库位号："+locDetl.getLocNo()+" 浅库位有非空库位！";
                                break;
                            }
                    LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", insideLoc));
                    if (locMast != null) {
                        if (!locMast.getLocSts().equals("O") && !locMast.getLocSts().equals("R")){
                            sign=true;
                            th="库位号："+locNo+" 浅库位有非空库位！";
                            break;
                        }
                    }
                }
@@ -306,7 +308,7 @@
            WrkMast wrkMast = new WrkMast();
            wrkMast.setWrkNo(workNo);
            wrkMast.setIoTime(now);
            wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
            wrkMast.setWrkSts(21L); // 工作状态：21.生成出库任务
            wrkMast.setIoType(ioType); // 入出库状态
            Double ioPri = wrkMastService.getIoPri(ioType, dto.getLocNo());
            wrkMast.setIoPri(ioPri); // 优先级：13
@@ -385,7 +387,7 @@
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setIoTime(now);
        wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
        wrkMast.setWrkSts(21L); // 工作状态：21.生成出库任务
        wrkMast.setIoType(ioType); // 入出库状态
        Double ioPri = wrkMastService.getIoPri(ioType, taskDto.getLocNo());
        wrkMast.setIoPri(ioPri); // 优先级：13
@@ -532,15 +534,30 @@
    @Override
    @Transactional
    public void emptyPlateOut(EmptyPlateOutParam param, Long userId) {
        List<String> locNos = param.getLocNos();
        //检测是否为浅库位
        List<LocMast> locMasts = null;
        boolean sign=false;
        String th = "";
        for (String locNoKong: param.getLocNos()){
            int row = getRow(locNoKong);
            int bay = getBay(locNoKong);
            int lev = getLev(locNoKong);

        for (String locNo:locNos){
            if (sign){
                break;
            }
            List<String> groupInsideLoc = Utils.getGroupInsideLoc(locNo);
            if (!Cools.isEmpty(groupInsideLoc)) {
                for (String insideLoc : groupInsideLoc) {
                    if (locNos.contains(insideLoc)){
                        continue;
                    }
                    LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", insideLoc));
                    if (locMast != null) {
                        if (!locMast.getLocSts().equals("O") && !locMast.getLocSts().equals("R")){
                            sign=true;
                            th="库位号："+locNo+" 浅库位有非空库位！";
                            break;
                        }
                    }
                }
            }
        }
        if (sign){
            throw new CoolException("出库失败；"+th);
@@ -582,7 +599,7 @@
            WrkMast wrkMast = new WrkMast();
            wrkMast.setWrkNo(workNo);
            wrkMast.setIoTime(new Date());
            wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
            wrkMast.setWrkSts(21L); // 工作状态：21.生成出库任务
            wrkMast.setIoType(110); // 入出库状态： 110.空板出库
            Double ioPri = wrkMastService.getIoPri(110, locNo);
            wrkMast.setIoPri(ioPri);
@@ -659,7 +676,7 @@
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setIoTime(now);
        wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
        wrkMast.setWrkSts(21L); // 工作状态：21.生成出库任务
        wrkMast.setIoType(11); // 入出库状态： 11.库格移载
        wrkMast.setIoPri(10D);
        wrkMast.setOutMost(locMastService.isOutMost(locNo, false)?1:0);;
@@ -1105,7 +1122,7 @@
                WrkMast wrkMast = new WrkMast();
                wrkMast.setWrkNo(workNo);
                wrkMast.setIoTime(now);
                wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
                wrkMast.setWrkSts(21L); // 工作状态：21.生成出库任务
                wrkMast.setIoType(11); // 入出库状态： 11.库格移载
                wrkMast.setIoPri(15D);
                wrkMast.setOutMost(locMastService.isOutMost(loc.getLocNo(), false)?1:0);;