#3.5

zhou zhou

22 小时以前 cfe049492f81d2c650a2b17348593edbc5054498

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java

@@ -67,8 +67,6 @@
    @Autowired
    private OutStockItemService outStockItemService;
    @Autowired
    private OutStockService outStockService;
    @Autowired
    private WaveRuleService waveRuleService;
    @Autowired
    private LocItemService locItemService;
@@ -78,6 +76,8 @@
    private LocService locService;
    @Autowired
    private WaveOrderRelaServiceImpl waveOrderRelaService;
    @Autowired
    private AsnOrderService asnOrderService;


    /**
@@ -631,7 +631,7 @@
            return LocUtils.isShallowLoc(item.getLocCode()) ? 1 : 0;
        }).reversed()).collect(Collectors.toList());

        WkOrder wkOrder = outStockService.getById(outId);
        WkOrder wkOrder = this.getById(outId);
        if (Cools.isEmpty(wkOrder)) {
            throw new CoolException("单据不存在！！");
        }
@@ -727,7 +727,7 @@

        Double sum = itemList.stream().mapToDouble(OutStockToTaskParams::getOutQty).sum();
        //更新出库单明细及主单
        WkOrder outOrder = outStockService.getById(outId);
        WkOrder outOrder = this.getById(outId);
        if (Objects.isNull(outOrder)) {
            throw new CoolException("出库单据不存在！！");
        }
@@ -735,7 +735,7 @@

        outOrder.setWorkQty(workQty).setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_CREATE.val);

        if (!outStockService.updateById(outOrder)) {
        if (!this.updateById(outOrder)) {
            throw new CoolException("出库单状态修改失败！！");
        }

@@ -878,6 +878,15 @@
    }

    private List<OrderOutItemDto> getOutOrderList(Long orderId, WaveRule waveRule,List<Long> orderItemIdList) {
        WkOrder wkOrder = asnOrderService.getById(orderId);
        if (Cools.isEmpty(wkOrder)) {
            throw new CoolException("未查询到相关单据，单号ID："+orderId);
        }
        boolean sign = false;
        if (wkOrder.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_NORMAL_MATERIAL_PREPARATION.type)
                || wkOrder.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_FEED_IN_MATERIAL_PREPARATION.type)){
            sign = true;
        }
        List<WkOrderItem> wkOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
                        .in(WkOrderItem::getId, orderItemIdList).eq(WkOrderItem::getOrderId, orderId));
        List<OrderOutItemDto> list = new ArrayList<>();
@@ -898,6 +907,11 @@
                locItems = LocManageUtil.getFirstInFirstOutItemList(wkOrderItem.getMatnrCode(), wkOrderItem.getSplrBatch(), wkOrderItem.getAnfme());
            }
            for (LocItem locItem : locItems) {
                if (sign){
                    if (locItem.getType().equals(OrderType.ORDER_PRE.type) || locItem.getType().equals(OrderType.ORDER_PRE_NOT_OUT.type)) {
                        continue;
                    }
                }
                Loc loc = locService.getById(locItem.getLocId());
                List<LocItem> itemList = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocCode, locItem.getLocCode()));
                if (issued.doubleValue() > 0) {