no message

skyouc

21 小时以前 c528736e1c65a8a49277efeefeca257efddeb34a

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

@@ -7,12 +7,14 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.api.enums.LocAreaType;
import com.zy.api.enums.MatLocType;
import com.zy.asrs.entity.*;
import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.BasAreasServiceImpl;
import com.zy.asrs.service.impl.BasStationServiceImpl;
import com.zy.asrs.service.impl.LocCacheServiceImpl;
import com.zy.asrs.service.impl.MatServiceImpl;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
@@ -61,6 +63,8 @@
    private LocCacheServiceImpl locCacheService;
    @Autowired
    private BasStationServiceImpl basStationService;
    @Autowired
    private MatService matService;


    @PostMapping("/out/pakout/orderDetlIds/auth")
@@ -146,24 +150,43 @@
            List<Long> areaIds = basAreas.stream()
                    .map(BasAreas::getId)
                    .collect(Collectors.toList());
            Map<Long, Double> locDetlUsage = new HashMap<>();
            for (OrderDetlPakout orderDetl : orderDetlPakouts) {
                double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
                if (issued <= 0.0D) {
                    continue;
                }
                List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(),
                List<LocDetl> locDetls = locDetlService.queryStockAll(null, null,orderDetl.getMatnr(), orderDetl.getBatch(),
                        orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(),areaIds);
                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);
                        Long detlId = locDetl.getId();
                        Double used = locDetlUsage.getOrDefault(detlId, 0.0);
                        Double available = locDetl.getAnfme() - used;
                        if (available <= 0.000001) {
                            continue;
                        }

                        Double currentIssue = (issued >= available) ? available : issued;

                        LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(), currentIssue);
                        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
                        locDto.setFrozen(locDetl.getFrozen());
                        locDto.setFrozenLoc(locMast.getFrozen());
                        List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
                        locDto.setStaNos(staNos);
                        locDto.setBrand(orderDetl.getBrand());

                        Mat mat = matService.selectOne(new EntityWrapper<Mat>()
                                .eq("matnr", locDetl.getMatnr())
                                .eq("supp_code", locDetl.getSuppCode()));
                        if (Objects.isNull(mat)) {
                            throw new CoolException("物料基础信息不存在！！");
                        }
                        if (!Objects.isNull(mat.getLocType()) && mat.getLocType().equals(Long.parseLong(MatLocType.EO_HOLDING.type))) {
                            locDto.setStaNos(Arrays.asList(240));
                        } else {
                            List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), currentIssue >= available ? 101 : 103);
                            locDto.setStaNos(staNos);
                        }
                        locDto.setBrand(orderDetl.getBrand());
                        locDto.setStandby1(orderDetl.getStandby1());
                        locDto.setStandby2(orderDetl.getStandby2());
                        locDto.setStandby3(orderDetl.getStandby3());
@@ -171,9 +194,10 @@
                        locDto.setBoxType2(orderDetl.getBoxType2());
                        locDto.setBoxType3(orderDetl.getBoxType3());
                        locDtos.add(locDto);
                        exist.add(locDetl.getLocNo());
                        
                        locDetlUsage.put(detlId, used + currentIssue);
                        // 剩余待出数量递减
                        issued = issued - locDetl.getAnfme();
                        issued = issued - currentIssue;
                    } else {
                        break;
                    }