1

zhang

4 天以前 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;

/**
@@ -66,7 +70,13 @@
            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())) {