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

liding

2 天以前 c94ab7a91bfb3015d929a94837f3a45289e8bbf1

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

@@ -120,8 +120,8 @@
                .getNickName());
        approveProcess.setStorageType(approveProcessVO.getStorageType());
        approveProcess.setInventoryReview(approveProcessVO.isInventoryReview());
        approveProcess.setInventoryReview(approveProcessVO.isInventoryReview());
        approveProcess.setRecordId(approveProcessVO.getRecordId());
        approveProcess.setPurchaseLedgerId(approveProcessVO.getPurchaseLedgerId());
        // 设置状态为重新提交
        if (approveProcessVO.getId() != null) {
            ApproveProcess approveProcess1 = approveProcessMapper.selectById(approveProcessVO.getId());
@@ -130,7 +130,7 @@
        }
        save(approveProcess);
        //初始化审批节点
        approveNodeService.initApproveNodes(approveProcessVO.getApproveUserIds(), approveID, approveProcessVO.getApproveDeptId());
        approveNodeService.initApproveNodes(approveProcessVO.getApproveUserIds(), approveID, approveProcessVO.getApproveDeptId(),approveProcess.getId());
        // 附件绑定
        tempFileService.migrateTempFilesToFormal(approveProcess.getId(), approveProcessVO.getTempFileIds(), FileNameType.ApproveProcess.getValue());
        /*消息通知*/
@@ -336,7 +336,7 @@
//                .eq(ApproveNode::getTenantId, SecurityUtils.getLoginUser().getTenantId())
                .orderByAsc(ApproveNode::getApproveNodeOrder);
        approveNodeMapper.delete(approveNodeLambdaQueryWrapper);
        approveNodeService.initApproveNodes(approveGetAndUpdateVo.getApproveUserIds(), approveProcess.getApproveId(), approveProcess.getTenantId());
        approveNodeService.initApproveNodes(approveGetAndUpdateVo.getApproveUserIds(), approveProcess.getApproveId(), approveProcess.getTenantId(),null);
        /*消息通知*/
        String id = approveProcess.getApproveUserIds().split(",")[0];
        if (approveProcess.getApproveType() == 8) {
@@ -383,7 +383,7 @@
//                .eq(ApproveNode::getTenantId, SecurityUtils.getLoginUser().getTenantId())
                .orderByAsc(ApproveNode::getApproveNodeOrder);
        approveNodeMapper.delete(approveNodeLambdaQueryWrapper);
        approveNodeService.initApproveNodes(approveGetAndUpdateVo.getApproveUserIds(), approve.getApproveId(), approve.getTenantId());
        approveNodeService.initApproveNodes(approveGetAndUpdateVo.getApproveUserIds(), approve.getApproveId(), approve.getTenantId(),approve.getId());

//        int i = 0;
//        for (ApproveNode approveNode : list) {