#

Junjie

2025-10-16 2f8dcd296b25a93b6dd2e5f98d1455883db1f57c

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

@@ -10,8 +10,10 @@
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
import com.zy.common.properties.SlaveProperties;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +46,8 @@
    private WorkService workService;
    @Autowired
    private BasDevpService basDevpService;
    @Autowired
    private SlaveProperties slaveProperties;


    @PostMapping("/out/pakout/orderDetlIds/auth")
@@ -69,36 +73,43 @@
            if (issued <= 0.0D) { continue; }
            List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
            for (LocDetl locDetl : locDetls) {
                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
                if(locMast==null){
                    R.error("没有找到该库位："+locDetl.getLocNo());
                String locNo = locDetl.getLocNo();
                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locNo));
                if (locMast == null) {
                    R.error("没有找到该库位：" + locDetl.getLocNo());
                }
                List<LocMast> locMasts=locMastService.selectList(new EntityWrapper<LocMast>()
                        .eq("group1",locMast.getGroup1())
                        .eq("loc_sts","F")
                        .orderBy("loc_attribute",false));
                for (LocMast locMast1 : locMasts) {
                    LocDetl locDetl1 = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast1.getLocNo()));
                    if(locDetl1==null){
                        return R.error(locMast1.getLocNo()+"没有找到物料");
                    }
                    if (!locDetl1.getMatnr().equals(locDetl.getMatnr())) {
                        log.error(locMast1.getGroup1()+"巷道的第"+locMast1.getLocAttribute()+"深浅库位号和同巷道物料不同");
                        break;
                    }
                    if (issued > 0) {
                        LocDto locDto = new LocDto(locDetl1.getLocNo(), locDetl1.getMatnr(), locDetl1.getMaktx(), locDetl1.getBatch(), orderDetl.getOrderNo(),
                                issued >= locDetl1.getAnfme() ? locDetl1.getAnfme() : issued);
                        List<Integer> staNos = new ArrayList<>();
                        staNos.add(100);
                        staNos.add(200);
                        locDto.setStaNos(staNos);
                        locDtos.add(locDto);
                        exist.add(locDetl.getLocNo());
                        // 剩余待出数量递减
                        issued = issued - locDetl.getAnfme();
                    } else {
                        break;

                //获取通道组
                List<Integer> locRowGroupAsc = Utils.getLocGroupAsc(slaveProperties, locNo);
                for (Integer row : locRowGroupAsc) {
                    String shallow = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
                    LocMast shallowLoc = locMastService.selectById(shallow);
                    if (shallowLoc.getLocSts().equals("F")) {
                        LocDetl locDetl1 = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", shallowLoc.getLocNo()));
                        if (locDetl1 == null) {
                            log.error(shallowLoc.getLocNo() + "没有找到物料");
                            break;
                        }
                        if (!locDetl1.getMatnr().equals(locDetl.getMatnr())) {
                            log.error(shallowLoc.getLocNo() + "库位与" + locNo + "库位同巷道物料不同");
                            break;
                        }
                        if (issued > 0) {
                            if(exist.contains(locDetl1.getLocNo())) {
                                continue;
                            }
                            LocDto locDto = new LocDto(locDetl1.getLocNo(), locDetl1.getMatnr(), locDetl1.getMaktx(), locDetl1.getBatch(), orderDetl.getOrderNo(),
                                    issued >= locDetl1.getAnfme() ? locDetl1.getAnfme() : issued);
                            int ioType = (issued >= locDetl1.getAnfme() && locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locDto.getLocNo())) == 1) ? 101 : 103;
                            List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl1.getLocNo(), ioType);
                            locDto.setStaNos(staNos);
                            locDtos.add(locDto);
                            exist.add(locDetl1.getLocNo());
                            // 剩余待出数量递减
                            issued = issued - locDetl1.getAnfme();
                        } else {
                            break;
                        }
                    }
                }
            }