#

TQS

2023-06-27 da8e0338292e8c104f65415e24345e3d583e051e

#

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

@@ -3908,18 +3908,24 @@
                ledCommand.setBarcode(wrkMast.getBarcode());
                if (wrkMast.getIoType() != 110) {
                    List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
                    EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
                    wrkDetls.forEach(wrkDetl -> {

                    wrkDetls.forEach(wrkDetl -> {
                        Double total = 0.0;
                        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
                        LocDetl locDetl = locDetlService.selectOne(wrapper.eq("zpallet", wrkDetl.getZpallet()).eq("matnr", wrkDetl.getMatnr()));
                        if (Cools.isEmpty(locDetl)) {
                            total = wrkDetl.getAnfme();
                        } else {
                            total = locDetl.getAnfme();
                        }
                        if (wrkMast.getIoType() == 101) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),locDetl.getAnfme()));
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
                        }
                        if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),locDetl.getAnfme()));
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
                        }
                        if (wrkMast.getIoType() == 107) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),locDetl.getAnfme()));
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
                        }
                    });
                }
@@ -4367,9 +4373,15 @@
                        continue;
                    }

                    //检测当前库位内侧其他库位是否为D、F、X
                    if (Utils.checkInsideLocIsDFX(one.getLocNo())) {
                        //内侧其他库位不是D、F、X。不能选取该库位
//                    //检测当前库位内侧其他库位是否为D、F、X
//                    if (Utils.checkInsideLocIsDFX(one.getLocNo())) {
//                        //内侧其他库位不是D、F、X。不能选取该库位
//                        continue;
//                    }

                    //检测当前库位内侧其他库位是否为D、F、X、O
                    if (Utils.checkInsideLocIsDFXO(one.getLocNo())) {
                        //内侧其他库位不是D、F、X、O。不能选取该库位
                        continue;
                    }


 src/main/java/com/zy/asrs/utils/Utils.java

@@ -1,5 +1,6 @@
package com.zy.asrs.utils;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.SpringUtils;
@@ -604,6 +605,27 @@
            for (LocMast mast : insideLocMast) {
                if (!mast.getLocSts().equals("D")
                        && !mast.getLocSts().equals("F")
                        && !mast.getLocSts().equals("X")) {
                    //D、F、X(不能选定这个外侧库位)
                    return true;
                }
            }
        }
        return false;
    }

    /**
     * 检测当前库位内侧其他库位是否为D、F、X、O
     * 返回true表示内侧库位不是DFXO，返回false表示内侧库位是DFXO
     */
    public static boolean checkInsideLocIsDFXO(String locNo) {
        LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
        List<String> insideLoc = Utils.getGroupInsideLoc(locNo);
        if (insideLoc.size() > 0) {
            List<LocMast> insideLocMast = locMastService.selectByLocNos(insideLoc);
            for (LocMast mast : insideLocMast) {
                if (!mast.getLocSts().equals("D")
                        && !mast.getLocSts().equals("F")
                        && !mast.getLocSts().equals("X")
                && !mast.getLocSts().equals("O")) {
                    //D、F、X(不能选定这个外侧库位)
@@ -611,7 +633,105 @@
                }
            }
        }
        Integer row = selectInSide(Utils.getRow(locNo));
        if (row==0){
            return true;
        }
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", row).eq("bay1", Utils.getBay(locNo)).eq("lev1", Utils.getLev(locNo)));
        if (Cools.isEmpty(locMast)) {
            if (row==7 && Utils.getBay(locNo)<4){
                locMast =  locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", 6).eq("bay1", Utils.getBay(locNo)).eq("lev1", Utils.getLev(locNo)));
                if (Cools.isEmpty(locMast)) {
                    return false;
                }
            }else {
                return false;
            }
        }
        if (!locMast.getLocSts().equals("F") && !locMast.getLocSts().equals("D") ){
            if (locMast.getLocSts().equals("X")){
                row = selectInSide2(row);
                if (row==0){
                    return true;
                }
                LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", row).eq("bay1", Utils.getBay(locNo)).eq("lev1", Utils.getLev(locNo)));
                if (!locMast1.getLocSts().equals("F") && !locMast1.getLocSts().equals("D") ){
                    return true;
                }
            } else {
                return true;
            }
        }

        return false;
    }

    public static Integer selectInSide(Integer row){
        switch (row){
            case 1:
            case 2:
            case 3:
                row = 1;
                break;
            case 4:
            case 5:
            case 6:
            case 7:
                row = 7;
                break;
            case 8:
            case 9:
            case 10:
            case 11:
                row = 8;
                break;
            case 12:
            case 13:
            case 14:
                row = 14;
                break;
            case 15:
            case 16:
            case 17:
            case 18:
                row = 15;
                break;
            case 19:
            case 20:
            case 21:
                row = 21;
                break;
            default:
                row = 0;
                break;
        }
        return row;
    }
    public static Integer selectInSide2(Integer row){
        switch (row){
            case 1:
                row = 2;
                break;
            case 7:
                row = 6;
                break;
            case 8:
                row = 9;
                break;
            case 14:
                row = 13;
                break;
            case 15:
                row = 16;
                break;
            case 21:
                row = 20;
                break;
            default:
                row = 0;
                break;
        }
        return row;
    }

}

 src/main/resources/mapper/WrkDetlMapper.xml

@@ -48,7 +48,7 @@
    </resultMap>

    <select id="findByWorkNo" resultMap="BaseResultMap">
        select wrk_no, matnr, maktx, specs, anfme, manu, memo from asr_wrk_detl where 1=1 and wrk_no = #{workNo}
        select wrk_no, matnr, maktx, specs, anfme, manu, memo ,zpallet from asr_wrk_detl where 1=1 and wrk_no = #{workNo}
    </select>

</mapper>