1.更换订单出库策略，走托盘多的物料先出 2.完善出库作业工作档丢失导致出库站电视机不显示

cp

2025-08-02 083841bb6c40097e19b17022454fcc7f12b7f092

1.更换订单出库策略，走托盘多的物料先出
2.完善出库作业工作档丢失导致出库站电视机不显示

 zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml

@@ -74,7 +74,7 @@
        and b.host_id = #{hostId}
        and b.loc_sts = 'F'
        and b.row1 in (1,2,3,4)
        order by b.row1
        order by  a.modi_time ,b.row1
    </select>

    <select id="selectItem" resultType="com.zy.asrs.common.wms.entity.LocDetl">

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java

@@ -72,54 +72,110 @@
        //对物料数进行排序
        List<ReportStockDto> stock = locDetlService.getStock(matnrs);

        Boolean boo1 = false;
        //判断是否有多物料托盘，没有的话进行先进先出。有的话进行多物料托盘出库
        Boolean boo2 = false;
        for (ReportStockDto reportStockDto : stock) {
            List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
                    .eq(LocDetl::getLocNo, reportStockDto.getLocNo())
                    .eq(LocDetl::getHostId, hostId));
            LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>()
                    .eq(LocMast::getHostId, hostId)
                    .eq(LocMast::getLocNo, reportStockDto.getLocNo()));
            if (Cools.isEmpty(locDetls)||Cools.isEmpty(locMast)||!locMast.getLocSts().equals("F")) {
                continue;
            }
            for (LocDetl locDetl : locDetls) {
                if(Cools.isEmpty(locDtoss)){
                    boo1=true;
                    break;
                }
                for (LocDto locDto1 : locDtoss) {
                    if (locDto1.getMatnr().equals(locDetl.getMatnr())) {
                        if (locDto1.getAnfme() <= 0.0D) {
                            continue;
                        }
                        LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), locDto1.getOrderNo(),
                                locDto1.getAnfme() >= locDetl.getAnfme() ? locDetl.getAnfme() : locDto1.getAnfme());
                        List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ((locDto1.getAnfme() >= locDetl.getAnfme()) && (locDetls.size() == 1)) ? 101 : 103, hostId);
                        locDto.setStaNos(staNos);
                        locDtos.add(locDto);
                        exist.add(locDetl.getLocNo());
                        // 剩余待出数量递减
                        if(locDto1.getAnfme()  - locDetl.getAnfme()==0){
                            locDtoss.remove(locDto1);
                        }else{
                            locDto1.setAnfme(locDto1.getAnfme()  - locDetl.getAnfme());
                        }
                        break;
                    }
                }
            }
            if(boo1){
            if (reportStockDto.getAnfme() != 1) {
                boo2 = true;
                break;
            }
        }
        if (!boo1) {
            for(LocDto locDto : locDtoss){
                if (locDto.getAnfme() > 0) {


        if (!boo2) {
            //标记库位
            HashMap<String, Integer> hm = new HashMap<>();

            for (OrderDetl orderDetl : orderDetls) {
                double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
                if (issued <= 0.0D) {
                    continue;
                }
                if (!Cools.isEmpty(hm)) {
                    for (HashMap.Entry<String, Integer> entry : hm.entrySet()) {
                        List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
                                .eq(LocDetl::getHostId, hostId)
                                .eq(LocDetl::getLocNo, entry.getKey())
                                .eq(LocDetl::getMatnr, orderDetl.getMatnr()));
                        for (LocDetl locDetl : locDetls) {
                            List<LocDetl> locMats = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
                                    .eq(LocDetl::getLocNo, locDetl.getLocNo())
                                    .eq(LocDetl::getHostId, hostId));
                            if (issued > 0) {
                                LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
                                        issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
                                List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ((issued >= locDetl.getAnfme()) && (locMats.size() == 1)) ? 101 : 103, hostId);
                                locDto.setStaNos(staNos);
                                locDtos.add(locDto);
                                exist.add(locDetl.getLocNo());
                                // 剩余待出数量递减
                                issued = issued - locDetl.getAnfme();
                                hm.put(locDetl.getLocNo(), 1);
                            } else {
                                break;
                            }
                        }
                    }
                    if (issued > 0) {
                        List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), hostId);
                        for (LocDetl locDetl : locDetls) {
                            //过滤掉在已被标记的库位号
                            boolean boo = false;
                            for (HashMap.Entry<String, Integer> entry : hm.entrySet()) {
                                if (locDetl.getLocNo().equals(entry.getKey())) {
                                    boo = true;
                                    break;
                                }
                            }
                            if (boo) {
                                continue;
                            }
                            List<LocDetl> locMats = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
                                    .eq(LocDetl::getLocNo, locDetl.getLocNo())
                                    .eq(LocDetl::getHostId, hostId));
                            if (issued > 0) {
                                LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
                                        issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
                                List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ((issued >= locDetl.getAnfme()) && (locMats.size() == 1)) ? 101 : 103, hostId);
                                locDto.setStaNos(staNos);
                                locDtos.add(locDto);
                                exist.add(locDetl.getLocNo());
                                // 剩余待出数量递减
                                issued = issued - locDetl.getAnfme();
                                hm.put(locDetl.getLocNo(), 1);
                            } else {
                                break;
                            }
                        }
                    }
                } else {
                    List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), hostId);
                    for (LocDetl locDetl : locDetls) {
                        List<LocDetl> locMats = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
                                .eq(LocDetl::getLocNo, locDetl.getLocNo())
                                .eq(LocDetl::getHostId, hostId));
                        if (issued > 0) {
                            LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
                                    issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
                            List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ((issued >= locDetl.getAnfme()) && (locMats.size() == 1)) ? 101 : 103, hostId);
                            locDto.setStaNos(staNos);
                            locDtos.add(locDto);
                            exist.add(locDetl.getLocNo());
                            // 剩余待出数量递减
                            issued = issued - locDetl.getAnfme();
                            hm.put(locDetl.getLocNo(), 1);
                        } else {
                            break;
                        }
                    }
                }

                if (issued > 0) {
                    List<LocDetl> locDetls1 = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
                            .eq(LocDetl::getMatnr, locDto.getMatnr()).eq(LocDetl::getHostId, hostId));
                            .eq(LocDetl::getMatnr, orderDetl.getMatnr()).eq(LocDetl::getHostId, hostId));
                    boolean boo = false;
                    if (Cools.isEmpty(locDetls1)) {
                        LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                        locDto.setLack(Boolean.TRUE);
                        locDtos.add(locDto);
                    } else {
@@ -128,18 +184,90 @@
                            String locNo = locDetl.getLocNo().substring(1, 2);
                            if (Integer.valueOf(locNo) > 4) {
                                boo = true;
//                                LocDto locDto = new LocDto("在平库", orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                                LocDto locDto = new LocDto("在平库", orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                                locDto.setLack(Boolean.TRUE);
                                locDto.setLocNo("在平库");
                                locDtos.add(locDto);
                                break;
                            }
                        }
                        if (!boo) {
//                            LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                            locDto.setLocNo(null);
                            LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                            locDto.setLack(Boolean.TRUE);
                            locDtos.add(locDto);
                        }
                    }
                }
            }
        }else{
            Boolean boo1 = false;
            for (ReportStockDto reportStockDto : stock) {
                List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
                        .eq(LocDetl::getLocNo, reportStockDto.getLocNo())
                        .eq(LocDetl::getHostId, hostId));
                LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>()
                        .eq(LocMast::getHostId, hostId)
                        .eq(LocMast::getLocNo, reportStockDto.getLocNo()));
                if (Cools.isEmpty(locDetls) || Cools.isEmpty(locMast) || !locMast.getLocSts().equals("F")) {
                    continue;
                }
                for (LocDetl locDetl : locDetls) {
                    if (Cools.isEmpty(locDtoss)) {
                        boo1 = true;
                        break;
                    }
                    for (LocDto locDto1 : locDtoss) {
                        if (locDto1.getMatnr().equals(locDetl.getMatnr())) {
                            if (locDto1.getAnfme() <= 0.0D) {
                                continue;
                            }
                            LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), locDto1.getOrderNo(),
                                    locDto1.getAnfme() >= locDetl.getAnfme() ? locDetl.getAnfme() : locDto1.getAnfme());
                            List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ((locDto1.getAnfme() >= locDetl.getAnfme()) && (locDetls.size() == 1)) ? 101 : 103, hostId);
                            locDto.setStaNos(staNos);
                            locDtos.add(locDto);
                            exist.add(locDetl.getLocNo());
                            // 剩余待出数量递减
                            if (locDto1.getAnfme() - locDetl.getAnfme() == 0) {
                                locDtoss.remove(locDto1);
                            } else {
                                locDto1.setAnfme(locDto1.getAnfme() - locDetl.getAnfme());
                            }
                            break;
                        }
                    }
                }
                if (boo1) {
                    break;
                }
            }
            if (!boo1) {
                for (LocDto locDto : locDtoss) {
                    if (locDto.getAnfme() > 0) {
                        List<LocDetl> locDetls1 = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
                                .eq(LocDetl::getMatnr, locDto.getMatnr()).eq(LocDetl::getHostId, hostId));
                        boolean boo = false;
                        if (Cools.isEmpty(locDetls1)) {
                            locDto.setLack(Boolean.TRUE);
                            locDtos.add(locDto);
                        } else {
                            for (LocDetl locDetl : locDetls1
                            ) {
                                String locNo = locDetl.getLocNo().substring(1, 2);
                                if (Integer.valueOf(locNo) > 4) {
                                    boo = true;
//                                LocDto locDto = new LocDto("在平库", orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                                    locDto.setLack(Boolean.TRUE);
                                    locDto.setLocNo("在平库");
                                    locDtos.add(locDto);
                                    break;
                                }
                            }
                            if (!boo) {
//                            LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                                locDto.setLocNo(null);
                                locDto.setLack(Boolean.TRUE);
                                locDtos.add(locDto);
                            }
                        }
                    }
                }
@@ -160,121 +288,6 @@
//
//        Set<String> exist = new HashSet<>();
//
//        //标记库位
//        HashMap<String,Integer> hm = new HashMap<>();
//
//        for (OrderDetl orderDetl : orderDetls) {
//            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
//            if (issued <= 0.0D) {
//                continue;
//            }
//            if(!Cools.isEmpty(hm)){
//                for(HashMap.Entry<String,Integer> entry:hm.entrySet()){
//                    List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
//                            .eq(LocDetl::getHostId, hostId)
//                            .eq(LocDetl::getLocNo, entry.getKey())
//                            .eq(LocDetl::getMatnr, orderDetl.getMatnr()));
//                    for (LocDetl locDetl : locDetls) {
//                        List<LocDetl> locMats = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
//                                .eq(LocDetl::getLocNo, locDetl.getLocNo())
//                                .eq(LocDetl::getHostId, hostId));
//                        if (issued > 0) {
//                            LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
//                                    issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
//                            List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ((issued >= locDetl.getAnfme()) && (locMats.size() == 1)) ? 101 : 103, hostId);
//                            locDto.setStaNos(staNos);
//                            locDtos.add(locDto);
//                            exist.add(locDetl.getLocNo());
//                            // 剩余待出数量递减
//                            issued = issued - locDetl.getAnfme();
//                            hm.put(locDetl.getLocNo(), 1);
//                        } else {
//                            break;
//                        }
//                    }
//                }
//                if (issued >0){
//                    List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), hostId);
//                    for (LocDetl locDetl : locDetls) {
//                        //过滤掉在已被标记的库位号
//                        boolean boo=false;
//                        for (HashMap.Entry<String,Integer> entry:hm.entrySet()) {
//                            if(locDetl.getLocNo().equals(entry.getKey())){
//                                boo=true;
//                                break;
//                            }
//                        }
//                        if (boo){
//                            continue;
//                        }
//                        List<LocDetl> locMats = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
//                                .eq(LocDetl::getLocNo, locDetl.getLocNo())
//                                .eq(LocDetl::getHostId, hostId));
//                        if (issued > 0) {
//                            LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
//                                    issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
//                            List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ((issued >= locDetl.getAnfme()) && (locMats.size() == 1)) ? 101 : 103, hostId);
//                            locDto.setStaNos(staNos);
//                            locDtos.add(locDto);
//                            exist.add(locDetl.getLocNo());
//                            // 剩余待出数量递减
//                            issued = issued - locDetl.getAnfme();
//                            hm.put(locDetl.getLocNo(), 1);
//                        } else {
//                            break;
//                        }
//                    }
//                }
//            }else{
//                List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), hostId);
//                for (LocDetl locDetl : locDetls) {
//                    List<LocDetl> locMats = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
//                            .eq(LocDetl::getLocNo, locDetl.getLocNo())
//                            .eq(LocDetl::getHostId, hostId));
//                    if (issued > 0) {
//                        LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
//                                issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
//                        List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ((issued >= locDetl.getAnfme()) && (locMats.size() == 1)) ? 101 : 103, hostId);
//                        locDto.setStaNos(staNos);
//                        locDtos.add(locDto);
//                        exist.add(locDetl.getLocNo());
//                        // 剩余待出数量递减
//                        issued = issued - locDetl.getAnfme();
//                        hm.put(locDetl.getLocNo(), 1);
//                    } else {
//                        break;
//                    }
//                }
//            }
//
//            if (issued > 0) {
//                List<LocDetl> locDetls1 = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
//                        .eq(LocDetl::getMatnr, orderDetl.getMatnr()).eq(LocDetl::getHostId, hostId));
//                boolean boo = false;
//                if (Cools.isEmpty(locDetls1)) {
//                    LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
//                    locDto.setLack(Boolean.TRUE);
//                    locDtos.add(locDto);
//                } else {
//                    for (LocDetl locDetl : locDetls1
//                    ) {
//                        String locNo = locDetl.getLocNo().substring(1, 2);
//                        if (Integer.valueOf(locNo) > 4) {
//                            boo = true;
//                            LocDto locDto = new LocDto("在平库", orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
//                            locDto.setLack(Boolean.TRUE);
//                            locDtos.add(locDto);
//                            break;
//                        }
//                    }
//                    if (!boo) {
//                        LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
//                        locDto.setLack(Boolean.TRUE);
//                        locDtos.add(locDto);
//                    }
//                }
//            }
//        }
//        return R.ok().add(locDtos);
//    }


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/WorkLogScheduler.java

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

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.wms.entity.WrkMast;
import com.zy.asrs.common.wms.service.WrkMastService;
import com.zy.asrs.framework.common.Cools;
@@ -31,6 +32,10 @@
            return;
        }
        for (WrkMast wrkMast : wrkMasts) {
            WrkMast wrkMast1= wrkMastService.getOne(new LambdaQueryWrapper<WrkMast>().eq(WrkMast::getMemo,wrkMast.getWrkNo()));
            if(!Cools.isEmpty(wrkMast1)){
                continue;
            }
            if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 110) {
                if (Cools.isEmpty(wrkMast.getExitMk())) {
                    continue;