初步改完，接下来进行测试

ZY

2024-09-20 9ef9076a630ead624c2c24bee28454836eb25b84

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

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

import com.alibaba.fastjson.JSON;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -89,45 +88,27 @@
            if (issued <= 0.0D) {
                continue;
            }
            List<LocDetl> locDetls;
            if (Cools.isEmpty(orderDetls.get(0).getSPgNO())) {
                locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, null);
            } else {
                locDetls = locDetlService.queryStock(orderDetl.getSPgNO());
            }
            List<LocDetl> locDetls = locDetlService.queryStock(orderDetl);

            for (LocDetl locDetl : locDetls) {
                if (Cools.isEmpty(locDetl.getBatch()) || Cools.isEmpty(orderDetl.getBatch())) {
                    if (locDetl.getMatnr().equals(orderDetl.getMatnr())) {
                        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() ? 101 : 103);
                            locDto.setStaNos(staNos);
                            locDto.setModel(locDetl.getModel());
                            locDtos.add(locDto);
                            exist.add(locDetl.getLocNo());
                            // 剩余待出数量递减
                            issued = issued - locDetl.getAnfme();
                        } else {
                            break;
                        }
                    }
                } else {
                    if (locDetl.getMatnr().equals(orderDetl.getMatnr()) && locDetl.getBatch().equals(orderDetl.getBatch())) {
                        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() ? 101 : 103);
                            locDto.setStaNos(staNos);
                            locDto.setModel(locDetl.getModel());
                            locDtos.add(locDto);
                            exist.add(locDetl.getLocNo());
                            // 剩余待出数量递减
                            issued = issued - locDetl.getAnfme();
                        } else {
                            break;
                        }
                if (locDetl.getMatnr().equals(orderDetl.getMatnr())) {
                    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() ? 101 : 103);
                        locDto.setStaNos(staNos);
                        locDto.setModel(locDetl.getModel());
                        locDto.setOutOrderNo(locDetl.getOutOrderNo());
                        locDto.setLuHao(locDetl.getLuHao());
                        locDto.setPacking(locDetl.getPacking());
                        locDto.setProType(locDetl.getProType());
                        locDto.setSPgNO(locDetl.getSPgNO());
                        locDtos.add(locDto);
                        exist.add(locDetl.getLocNo());
                        // 剩余待出数量递减
                        issued = issued - locDetl.getAnfme();
                    } else {
                        break;
                    }
                }
            }
@@ -135,6 +116,11 @@
                LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                locDto.setLack(Boolean.TRUE);
                locDto.setModel(orderDetl.getModel());
                locDto.setOutOrderNo(orderDetl.getOutOrderNo());
                locDto.setLuHao(orderDetl.getLuHao());
                locDto.setPacking(orderDetl.getPacking());
                locDto.setProType(orderDetl.getProType());
                locDto.setSPgNO(orderDetl.getSPgNO());
                locDtos.add(locDto);
            }
        }