1.生产成品添加审核流程，半成品不审核

liding

2 天以前 b28173836631e9ecb1aafbaa5786c0383462208e

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

@@ -217,7 +217,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 +264,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 +295,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 +312,7 @@
                            }
                            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());
                    }
                }
                break;