#

Junjie

2025-07-15 3536629992d020f689b3726925155a3fd662f442

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

@@ -7,6 +7,7 @@
import com.core.common.R;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
@@ -17,6 +18,7 @@
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;

@@ -76,7 +78,8 @@
        // 盘点单出库
        if (orderPakOut.getDocType() == 8) {
            for (OrderDetlPakout orderDetl : orderDetlPakouts) {
                double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
                BigDecimal issuedBigDecimal = Optional.of(BigDecimal.valueOf(orderDetl.getAnfme()).subtract(BigDecimal.valueOf(orderDetl.getWorkQty()))).orElse(new BigDecimal(0));
                double issued = issuedBigDecimal.doubleValue();
                if (issued <= 0.0D) {
                    continue;
                }
@@ -98,10 +101,17 @@
                        locDto.setBoxType2(orderDetl.getBoxType2());
                        locDto.setBoxType3(orderDetl.getBoxType3());

                        //计算辅单位
                        Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme());
                        locDto.setWeight(weight);

                        locDto.setUnit(orderDetl.getUnit());

                        locDto.setStaNos(staNos);
                        locDtos.add(locDto);
                        // 剩余待出数量递减
                        issued = issued - locDetl.getAnfme();
                        issuedBigDecimal = issuedBigDecimal.subtract(BigDecimal.valueOf(locDetl.getAnfme()));
                        issued = issuedBigDecimal.doubleValue();
                    } else {
                        break;
                    }
@@ -116,26 +126,67 @@
                    locDto.setBoxType1(orderDetl.getBoxType1());
                    locDto.setBoxType2(orderDetl.getBoxType2());
                    locDto.setBoxType3(orderDetl.getBoxType3());

                    //计算辅单位
                    Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme());
                    locDto.setWeight(weight);

                    locDto.setUnit(orderDetl.getUnit());
                    locDto.setLack(Boolean.TRUE);
                    locDtos.add(locDto);
                }
            }
        } else {
            for (OrderDetlPakout orderDetl : orderDetlPakouts) {
                double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
                BigDecimal issuedBigDecimal = Optional.of(BigDecimal.valueOf(orderDetl.getAnfme()).subtract(BigDecimal.valueOf(orderDetl.getWorkQty()))).orElse(new BigDecimal(0));
                double issued = issuedBigDecimal.doubleValue();
                if (issued <= 0.0D) {
                    continue;
                }

                //第一次搜索，主要搜索可全板出库的托盘
                List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(),
                        orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
                //根据排序结果获取库位号
                List<String> locList = new ArrayList<>();
                for (LocDetl locDetl : locDetls) {
                    if (issued > 0) {
                    if (locList.contains(locDetl.getLocNo())) {
                        continue;
                    }
                    locList.add(locDetl.getLocNo());
                }

                List<String> containLocList = new ArrayList<>();
                for (String locNo : locList) {
                    BigDecimal allStockDecimal = new BigDecimal(0);
                    List<LocDetl> locDetls1 = locDetlService.selectList(new EntityWrapper<LocDetl>()
                            .eq("loc_no", locNo));
                    for (LocDetl locDetl : locDetls1) {
                        allStockDecimal = allStockDecimal.add(BigDecimal.valueOf(locDetl.getAnfme()));
                    }

                    //此库位总库存
                    double allStock = allStockDecimal.doubleValue();
                    if (issued <= 0) {
                        break;
                    }

                    //库存过大，无法全板出库，搜索下一条
                    if(allStock > issued) {
                        continue;
                    }

                    containLocList.add(locNo);

                    for (LocDetl locDetl : locDetls1) {
                        LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
                                issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
                        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
                        locDto.setFrozen(locDetl.getFrozen());
                        locDto.setFrozenLoc(locMast.getFrozen());
                        List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
//                        int ioType = (issued >= locDetl.getAnfme() && locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locDto.getLocNo())) == 1) ? 101 : 103;
                        int ioType = 101;
                        List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ioType);
                        locDto.setStaNos(staNos);
                        locDto.setBrand(orderDetl.getBrand());

@@ -145,14 +196,62 @@
                        locDto.setBoxType1(orderDetl.getBoxType1());
                        locDto.setBoxType2(orderDetl.getBoxType2());
                        locDto.setBoxType3(orderDetl.getBoxType3());
                        locDto.setUnit(orderDetl.getUnit());

                        //计算辅单位
                        Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme());
                        locDto.setWeight(weight);

                        locDtos.add(locDto);
                        exist.add(locDetl.getLocNo());
                        // 剩余待出数量递减
                        issued = issued - locDetl.getAnfme();
                    } else {
                        break;
                        issuedBigDecimal = issuedBigDecimal.subtract(BigDecimal.valueOf(locDetl.getAnfme()));
                        issued = issuedBigDecimal.doubleValue();
                    }
                }

                //全板搜索结束后，还有未出数量，则搜索拣选出库
                if(issued > 0) {
                    for (LocDetl locDetl : locDetls) {
                        if (issued <= 0) {
                            break;
                        }

                        if(containLocList.contains(locDetl.getLocNo())) {
                            continue;
                        }

                        LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
                                issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
                        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
                        locDto.setFrozen(locDetl.getFrozen());
                        locDto.setFrozenLoc(locMast.getFrozen());
//                        int ioType = (issued >= locDetl.getAnfme() && locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locDto.getLocNo())) == 1) ? 101 : 103;
                        int ioType = 103;
                        List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ioType);
                        locDto.setStaNos(staNos);
                        locDto.setBrand(orderDetl.getBrand());

                        locDto.setStandby1(orderDetl.getStandby1());
                        locDto.setStandby2(orderDetl.getStandby2());
                        locDto.setStandby3(orderDetl.getStandby3());
                        locDto.setBoxType1(orderDetl.getBoxType1());
                        locDto.setBoxType2(orderDetl.getBoxType2());
                        locDto.setBoxType3(orderDetl.getBoxType3());
                        locDto.setUnit(orderDetl.getUnit());

                        //计算辅单位
                        Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme());
                        locDto.setWeight(weight);

                        locDtos.add(locDto);
                        exist.add(locDetl.getLocNo());
                        // 剩余待出数量递减
                        issuedBigDecimal = issuedBigDecimal.subtract(BigDecimal.valueOf(locDetl.getAnfme()));
                        issued = issuedBigDecimal.doubleValue();
                    }
                }

                if (issued > 0) {
                    LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                    locDto.setBrand(orderDetl.getBrand());
@@ -162,11 +261,56 @@
                    locDto.setBoxType1(orderDetl.getBoxType1());
                    locDto.setBoxType2(orderDetl.getBoxType2());
                    locDto.setBoxType3(orderDetl.getBoxType3());

                    //计算辅单位
                    Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme());
                    locDto.setWeight(weight);

                    locDto.setUnit(orderDetl.getUnit());
                    locDto.setLack(Boolean.TRUE);
                    locDtos.add(locDto);
                }
            }

//            // 重新计算出库站点，可能存在一个托盘多条明细，多条明细统计下来可全板出库，但实际给出的站点只能拣选出库
//            HashMap<String, Double> locAnfmeMap = new HashMap<>();
//            for (LocDto locDto : locDtos) {
//                if(locAnfmeMap.containsKey(locDto.getLocNo())) {
//                    Double anfme = locAnfmeMap.get(locDto.getLocNo());
//                    BigDecimal decimal = BigDecimal.valueOf(locDto.getAnfme()).add(BigDecimal.valueOf(anfme));
//                    locAnfmeMap.put(locDto.getLocNo(), decimal.doubleValue());
//                }else {
//                    locAnfmeMap.put(locDto.getLocNo(), locDto.getAnfme());
//                }
//            }
//
//            HashMap<String, List<Integer>> locStaNosMap = new HashMap<>();
//            for (Map.Entry<String, Double> entry : locAnfmeMap.entrySet()) {
//                String locNo = entry.getKey();
//                Double realAnfme = entry.getValue();
//
//                double stockAnfme = 0D;
//                List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
//                for (LocDetl locDetl : locDetls) {
//                    BigDecimal decimal = BigDecimal.valueOf(stockAnfme).add(BigDecimal.valueOf(locDetl.getAnfme()));
//                    stockAnfme = decimal.doubleValue();
//                }
//
//                int ioType = 103;
//                if(stockAnfme == realAnfme) {
//                    ioType = 101;
//                }
//
//                List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locNo, ioType);
//                locStaNosMap.put(locNo, staNos);
//            }
//
//            for (LocDto locDto : locDtos) {
//                List<Integer> staNos = locStaNosMap.get(locDto.getLocNo());
//                locDto.setStaNos(staNos);
//            }
        }

        return R.ok().add(locDtos);
    }