1

zhang

6 天以前 71ca7c6fb00de749b2ba2180f1cc04e35574eb19

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

@@ -1,11 +1,13 @@
package com.zy.asrs.controller;

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.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.*;
import com.zy.common.model.LocDto;
@@ -17,7 +19,9 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.util.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;

/**
@@ -53,42 +57,26 @@
    @PostMapping("/out/pakout/preview/auth")
    @ManagerAuth
    public R pakoutPreview(@RequestBody List<Long> ids) {
//        if (Cools.isEmpty(ids)) {
//            return R.parse(BaseRes.PARAM);
//        }
//        List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
//        //用户确认出入库都以pgno为准，那么不考虑数量了
//        List<LocDto> locDtos = new ArrayList<>();
//        if (orderDetls != null && !orderDetls.isEmpty()) {
//            List<LocDetl> locDetls = locDetlService.queryStock(orderDetls.get(0).getSPgNO());
//            for (LocDetl locDetl : locDetls) {
//                LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetls.get(0).getOrderNo(),
//                        locDetl.getAnfme());
//                List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), 101);
//                locDto.setStaNos(staNos);
//                locDto.setZpallet(locDetl.getZpallet());
//                locDto.setSPgNO(orderDetls.get(0).getSPgNO());
//                locDtos.add(locDto);
//            }
//        }
//        return R.ok().add(locDtos);

        if (Cools.isEmpty(ids)) {
            return R.parse(BaseRes.PARAM);
        }
        List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
        List<LocDto> locDtos = new ArrayList<>();
//        orderDetls = orderDetls.stream()
//                .sorted(Comparator.comparing(OrderDetl::getMatnr).thenComparing(OrderDetl::getBatch))
//                .collect(Collectors.toList());
//        Set<String> exist = new HashSet<>();


        for (OrderDetl orderDetl : orderDetls) {
            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
            if (issued <= 0.0D) {
                continue;
            }
            List<LocDetl> locDetls = locDetlService.queryStock(orderDetl);
            List<LocDetl> locDetls;
            Order order = orderService.selectByNo(orderDetl.getOrderNo());
            if (order != null && !Cools.isEmpty(order.getTemp3())) {
                locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("zpallet", order.getTemp3()));
            } else {
                locDetls = locDetlService.queryStock(orderDetl);
            }

            for (LocDetl locDetl : locDetls) {
                if (locDetl.getMatnr().equals(orderDetl.getMatnr())) {