Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

zhou zhou

13 小时以前 10776dd6f7f9ef9e47419427fcb1b692ed73d54d

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

@@ -501,6 +501,11 @@
            return LocUtils.isShallowLoc(item.getLocCode()) ? 1 : 0;
        }).reversed()).collect(Collectors.toList());

        WkOrder wkOrder = outStockService.getById(outId);
        if (Cools.isEmpty(wkOrder)) {
            throw new CoolException("单据不存在！！");
        }

        for (OutStockToTaskParams param : Items) {
            if (Objects.isNull(param) || StringUtils.isBlank(param.getLocCode())) {
                continue;
@@ -513,8 +518,8 @@
                WkOrderItem orderItem = outStockItemService.getOne(new LambdaQueryWrapper<WkOrderItem>()
                        .eq(WkOrderItem::getOrderId, outId)
                        .eq(StringUtils.isNotBlank(locItem.getBatch()), WkOrderItem::getSplrBatch, locItem.getBatch())
                        .eq(StringUtils.isNotBlank(locItem.getFieldsIndex()), WkOrderItem::getFieldsIndex, locItem.getFieldsIndex())
                        .eq(WkOrderItem::getMatnrId, locItem.getMatnrId()));
//                        .eq(StringUtils.isNotBlank(locItem.getFieldsIndex()), WkOrderItem::getFieldsIndex, locItem.getFieldsIndex())

                if (Objects.isNull(orderItem)) {
                    throw new CoolException("单据明细不存在！！");
@@ -533,9 +538,13 @@
                        .setItems(locItems)
                        .setSourceId(outId)
                        .setSiteNo(param.getSiteNo());
                //增加备货出库类型判断
                Short type = wkOrder.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.type)
                        ?TaskResouceType.TASK_RESOUCE_STOCK_UP.val
                        :TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val;
                try {
                    //生成出库任务
                    locItemService.generateTask(TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val, taskParams, loginUserId);
                    locItemService.generateTask(type, taskParams, loginUserId);
                } catch (Exception e) {
                    logger.error("UNK", e);
                    throw new CoolException(e.getMessage());