Merge remote-tracking branch 'origin/qlasrs-sxk' into qlasrs-sxk

zhou zhou

2025-09-27 df908abc9be603406c67d1474d160e3144da38cd

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

@@ -1,29 +1,34 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.result.StoPreTab;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
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;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.util.*;
import java.util.stream.Collectors;

/**
 * Created by vincent on 2022/3/26
 */

@Slf4j
@RestController
public class OutController extends BaseController {

@@ -37,39 +42,20 @@
    private LocMastService locMastService;
    @Autowired
    private StaDescService staDescService;
    @Autowired
    private WorkService workService;
    @Autowired
    private BasDevpService basDevpService;
    @Autowired
    private SlaveProperties slaveProperties;

//    @PostMapping("/out/pakout/preview/auth")
//    public R pakoutPreview(@RequestBody List<Long> ids) {
//        if (Cools.isEmpty(ids)) {
//            return R.parse(BaseRes.PARAM);
//        }
//        List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
//        Set<DetlDto> detlDtos = new HashSet<>();
//        for (OrderDetl orderDetl : orderDetls) {
//            if (DetlDto.hasList(detlDtos, orderDetl)) {
//                DetlDto detlDto = DetlDto.find(detlDtos, orderDetl.getMatnr(), orderDetl.getBatch());
//                assert detlDto != null;
//                detlDto.setAnfme(detlDto.getAnfme() + orderDetl.getAnfme());
//            } else {
//                detlDtos.add(new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getAnfme()));
//            }
//        }
//        List<LocDto> locDtos = new ArrayList<>();
//        for (DetlDto detlDto : detlDtos) {
//            double issued = Optional.ofNullable(detlDto.getAnfme()).orElse(0.0D) ;
//            List<LocDetl> locDetls = locDetlService.queryStock(detlDto.getMatnr(), detlDto.getBatch(), null);
//            for (LocDetl locDetl : locDetls) {
//                if (issued > 0) {
//                    locDtos.add(new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), issued>=locDetl.getAnfme()?locDetl.getAnfme():issued));
//                    // 剩余待出数量递减
//                    issued = issued - locDetl.getAnfme();
//                } else {
//                    break;
//                }
//            }
//        }
//        return R.ok().add(locDtos);
//    }

    @PostMapping("/out/pakout/orderDetlIds/auth")
    @ManagerAuth
    public R pakoutOrderDetlIds(@RequestParam Long orderId) throws InterruptedException {
        Thread.sleep(200);
        return R.ok().add(orderDetlService.selectByOrderId(orderId).stream().map(OrderDetl::getId).distinct().collect(Collectors.toList()));
    }

    @PostMapping("/out/pakout/preview/auth")
    @ManagerAuth
@@ -79,20 +65,52 @@
        }
        List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
        List<LocDto> locDtos = new ArrayList<>();

        Set<String> exist = new HashSet<>();

        for (OrderDetl orderDetl : orderDetls) {
            double issued = Optional.ofNullable(orderDetl.getAnfme()).orElse(0.0D) ;
            List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null);
            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
            if (issued <= 0.0D) { continue; }
            List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
            for (LocDetl locDetl : locDetls) {
                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);
                    locDtos.add(locDto);
                    // 剩余待出数量递减
                    issued = issued - locDetl.getAnfme();
                } else {
                    break;
                String locNo = locDetl.getLocNo();
                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locNo));
                if (locMast == null) {
                    R.error("没有找到该库位：" + locDetl.getLocNo());
                }

                //获取通道组
                List<Integer> locRowGroupAsc = Utils.getLocRowGroupAsc(slaveProperties, Utils.getRow(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;
                        }
                    }
                }
            }
            if (issued > 0) {
@@ -106,11 +124,25 @@

    @PostMapping("/out/pakout/auth")
    @ManagerAuth(memo = "订单出库")
    public R pakout(@RequestBody List<LocDto> locDtos) {
    public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {
        if (Cools.isEmpty(locDtos)) {
            return R.parse(BaseRes.PARAM);
        }
        boolean lack = true;
        for (LocDto locDto : locDtos) {
            if (!locDto.isLack()) {
                lack = false;
                break;
            }
        }
        if (lack) {
            return R.error("库存不足");
        }

        Thread.sleep(1000L);

        List<TaskDto> taskDtos = new ArrayList<>();
        // 根据 （库位 & 出库站） 分组； 理想状态：一组为一次出库任务
        for (LocDto locDto : locDtos) {
            if (locDto.isLack()) { continue; }
            TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
@@ -124,9 +156,8 @@
        }
        // -----------------------------------------------------------------------------------------------
        for (TaskDto taskDto : taskDtos) {



            BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
            workService.stockOut(staNo, taskDto, getUserId());
        }
        return R.ok();
    }