| | |
| | | |
| | | // 按包装组号分组处理 |
| | | Map<String, List<OrderDetl>> brandGroup = orderDetls.stream() |
| | | .collect(Collectors.groupingBy(OrderDetl::getBrand)); |
| | | .collect(Collectors.groupingBy(o -> { |
| | | String brand = o.getBrand(); |
| | | return brand != null ? brand : "跨巷道"; |
| | | })); |
| | | |
| | | |
| | | List<LocDto> locDtos = new ArrayList<>(); |
| | | |
| | |
| | | .eq("model", paramLocDetl.getModel())); |
| | | |
| | | if (one != null) { |
| | | if (!"合格".equals(one.getThreeCode())) { |
| | | throw new CoolException(one.getModel() + "卷不合格: " + one.getThreeCode()); |
| | | // 判断是否为盘点单(docType == 23),如果不是则校验合格性 |
| | | Order order = orderService.selectByNo(stockOutParam.getOrderNo()); |
| | | if ( order.getDocType() != 23) { |
| | | if (!"合格".equals(one.getThreeCode())) { |
| | | throw new CoolException(one.getModel() + "卷不合格: " + one.getThreeCode()); |
| | | } |
| | | } |
| | | |
| | | locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), stockOutParam.getOrderNo())); |
| | | } |
| | | |
| | | } |
| | | |
| | | if (!locDetlDtos.isEmpty()) { |