feat:采购/库存入库添加批号

liding

3 天以前 c94ab7a91bfb3015d929a94837f3a45289e8bbf1

 src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java

@@ -95,7 +95,6 @@
    private StockInventoryService stockInventoryService;



    public ApproveProcess getApproveById(String id) {
        LambdaQueryWrapper<ApproveProcess> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(ApproveProcess::getApproveId, id);
@@ -107,7 +106,7 @@
    }

    @Override
    public void initApproveNodes(String approveUserIds, String approveID, Long tenantId) {
    public void initApproveNodes(String approveUserIds, String approveID, Long tenantId, Long approveProcessId) {
        Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
        String[] names = approveUserIds.split(",");
        for (int i = 0; i < names.length; i++) {
@@ -126,6 +125,9 @@
            approveNode.setUpdateUser(userId);
            approveNode.setCreateTime(LocalDateTime.now());
            approveNode.setUpdateTime(LocalDateTime.now());
            if (approveProcessId != null) {
                approveNode.setProcessId(approveProcessId);
            }
            approveNodeMapper.insert(approveNode);
        }
    }
@@ -217,7 +219,7 @@
                            purchaseLedgerServiceImpl.addQualityInspect(purchaseLedger, salesLedgerProduct);
                        } else {
                            //直接入库
                            stockUtils.addStock(salesLedgerProduct.getProductModelId(), salesLedgerProduct.getQuantity(), StockInQualifiedRecordTypeEnum.PURCHASE_STOCK_IN.getCode(), purchaseLedger.getId());
                            stockUtils.addStockNoReview(salesLedgerProduct.getProductModelId(), salesLedgerProduct.getQuantity(), StockInQualifiedRecordTypeEnum.PURCHASE_STOCK_IN.getCode(), purchaseLedger.getId());
                        }
                    }
                } else if (status.equals(3)) {
@@ -264,6 +266,14 @@
            }

        }
        // 入库审核
        if (approveProcess.getApproveType().equals(9)) {
            StockInRecord stockInRecord = stockInRecordService.getById(approveNode.getRecordId());
            if (!approveNode.isInventoryReview()) {
                stockInRecord.setApproveStatus(3);
                stockInRecordService.updateById(stockInRecord);
            }
        }
        // 绑定附件
        if (!CollectionUtils.isEmpty(approveNode.getTempFileIds()) && approveNode.getApproveNodeStatus() == 1) {
            tempFileService.migrateTempFilesToFormal(approveNode.getId(), approveNode.getTempFileIds(), FileNameType.ApproveNode.getValue());
@@ -287,7 +297,14 @@
                                approveProcess.getApproveId() + "流程编号的审批需要您审核!!!!!",
                                Arrays.asList(Long.valueOf(id)),
                                "/safeProduction/safeWorkApproval?approveType=" + approveProcess.getApproveType() + "&approveId=" + approveProcess.getApproveId());
                    } else if (approveProcess.getApproveType() == 9) {
                    } else {
                        sysNoticeService.simpleNoticeByUser(approveProcessType(approveProcess.getApproveType()),
                                approveProcess.getApproveId() + "流程编号的审批需要您审核!!!!!",
                                Arrays.asList(Long.valueOf(id)),
                                "/collaborativeApproval/approvalProcess?approveType=" + approveProcess.getApproveType() + "&approveId=" + approveProcess.getApproveId());
                    }
                } else {
                    if (approveProcess.getApproveType() == 9) {
                        StockInRecord stockInRecord = stockInRecordService.getById(approveNode.getRecordId());
                        if (approveNode.isInventoryReview()) {
                            if ("不合格入库".equals(approveNode.getStorageType())) {
@@ -297,22 +314,21 @@
                            }
                            stockInRecord.setApproveStatus(2);
                            stockInRecordService.updateById(stockInRecord);
                            sysNoticeService.simpleNoticeByUser(
                                    approveProcessType(approveProcess.getApproveType()),
                                    approveProcess.getApproveId() + "流程编号的审批需要您审核!!!!!",
                                    Arrays.asList(Long.valueOf(id)),
                                    "/collaborativeApproval/approvalProcess?approveType=" + approveProcess.getApproveType()
                                            + "&approveId=" + approveProcess.getApproveId()
                            );
                        }else {
                            stockInRecord.setApproveStatus(3);
                            stockInRecordService.updateById(stockInRecord);
                        }
                    } else {
                        sysNoticeService.simpleNoticeByUser(approveProcessType(approveProcess.getApproveType()),
                                approveProcess.getApproveId() + "流程编号的审批需要您审核!!!!!",
                                Arrays.asList(Long.valueOf(id)),
                                "/collaborativeApproval/approvalProcess?approveType=" + approveProcess.getApproveType() + "&approveId=" + approveProcess.getApproveId());
                    }
                    if (approveProcess.getApproveType() == 5) {
                        //采购入库
                        ApproveProcess process = approveProcessMapper.selectById(approveNode.getProcessId());
                        List<SalesLedgerProduct> salesLedgerProductList = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>().in(SalesLedgerProduct::getSalesLedgerId, process.getPurchaseLedgerId())
                                .eq(SalesLedgerProduct::getType, 2));
                        for (SalesLedgerProduct salesLedgerProduct : salesLedgerProductList) {
                            StockInRecord stockInRecord = new StockInRecord();
                            stockInRecord.setStockInNum(salesLedgerProduct.getQuantity());
                            stockInRecord.setProductModelId(salesLedgerProduct.getProductModelId());
                            stockInRecord.setWarnNum(salesLedgerProduct.getWarnNum());
                            stockInRecord.setBatchNo(salesLedgerProduct.getBatchNo());
                            stockInventoryService.updateOrCreateStockInventory(stockInRecord);
                        }
                    }
                }
                break;