Merge remote-tracking branch 'origin/master'

luqingyang

2023-10-30 dd570625f2d784f94f78b70c508cc1dd39128f1f

 consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java

@@ -54,14 +54,22 @@
        Long outWarehouseFormId = null;
        try {
            // 根据调拨单 生成 出库单
            outWarehouseFormId = lWhFormOutputCoreService.createOutFormByTransId(whFormTransferId, currentUser);
            outWarehouseFormId = lWhFormOutputCoreService.createOutFormByTransId(whFormTransferId, currentUser, dealTime);
        } catch (Exception e) {
            log.error(e.getMessage());
            return;
        }
        // 出库单 出库
        Long aLong = lWhFormOutputCoreService.outFormByTransId(whFormTransferId, currentUser);
        // 出库单 出库，返回 出库单流水Id
        Long outFormByTransId = lWhFormOutputCoreService.outFormByTransId(whFormTransferId, currentUser, dealTime);

        // 更新调拨单
        lWhFormTransfer = new LWhFormTransfer(whFormTransferId);
        lWhFormTransfer.setOutWarehouseFormId(outWarehouseFormId);
        lWhFormTransfer.setStates(1);
        lWhFormTransfer.setOutOperatorId(userId);
        lWhFormTransfer.setOutOperatorName(nickName);
        lWhFormTransfer.setOutputTime(dealTime);
        lWhFormTransferService.update(lWhFormTransfer);

        log.info("调拨单：{} 出库完成", whFormTransferId);
        return;