fix:入库审批

liding

3 天以前 d9a10bd4084b406c40fcbb94c816cffd6e68d031

fix:入库审批

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

@@ -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;

 src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java

@@ -136,7 +136,7 @@
        } catch (Exception e) {
            e.printStackTrace();
        }
        stockInRecordDto.setApproveStatus(2);
        stockInRecordDto.setApproveStatus(1);
        return stockInRecordMapper.updateById(stockInRecordDto);
    }
}

 src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java

@@ -77,6 +77,7 @@
        stockInRecordDto.setRemark(stockInventoryDto.getRemark());
        stockInRecordDto.setWarnNum(stockInventoryDto.getWarnNum());
        stockInRecordDto.setLockedQuantity(stockInventoryDto.getLockedQuantity());
        stockInRecordDto.setApproveStatus(0);
        stockInRecordDto.setType("0");
        Long id = stockInRecordService.add(stockInRecordDto);
        LoginUser loginUser = SecurityUtils.getLoginUser();

 src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java

@@ -63,6 +63,7 @@
        stockInRecordDto.setStockInNum(stockUninventoryDto.getQualitity());
        stockInRecordDto.setProductModelId(stockUninventoryDto.getProductModelId());
        stockInRecordDto.setRemark(stockUninventoryDto.getRemark());
        stockInRecordDto.setApproveStatus(0);
        stockInRecordDto.setType("1");
        Long id = stockInRecordService.add(stockInRecordDto);


 src/main/resources/mapper/stock/StockInRecordMapper.xml

@@ -75,7 +75,7 @@
                LEFT JOIN product_work_order pwo ON pwo.id = ppm.work_order_id
                LEFT JOIN product_order po ON po.id = pwo.product_order_id
        WHERE
            sir.id = 233
            sir.id = #{id}
        ORDER BY
            sir.id DESC
    </select>