fix:入库前需审批,审批后入库

liding

4 天以前 5bd9a135bae4ed6c57950cf0a160f471bc99d645

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

@@ -78,11 +78,11 @@
        stockInRecordDto.setWarnNum(stockInventoryDto.getWarnNum());
        stockInRecordDto.setLockedQuantity(stockInventoryDto.getLockedQuantity());
        stockInRecordDto.setType("0");
        int add = stockInRecordService.add(stockInRecordDto);
        Long id = stockInRecordService.add(stockInRecordDto);
        LoginUser loginUser = SecurityUtils.getLoginUser();
        if (add > 0) {
        if (id != null) {
            try {
                addApproveByPurchase(loginUser, stockInRecordDto);
                addApproveByPurchase(loginUser, stockInRecordDto,id);
            } catch (Exception e) {
                e.printStackTrace();
            }
@@ -90,7 +90,7 @@
        return true;
    }

    public void addApproveByPurchase(LoginUser loginUser, StockInRecordDto stockInRecordDto) throws Exception {
    public void addApproveByPurchase(LoginUser loginUser, StockInRecordDto stockInRecordDto,Long id) throws Exception {
        ApproveProcessVO approveProcessVO = new ApproveProcessVO();
        approveProcessVO.setApproveType(9);
        approveProcessVO.setApproveDeptId(loginUser.getCurrentDeptId());
@@ -100,7 +100,7 @@
        approveProcessVO.setApproveTime(LocalDate.now().toString());
        approveProcessVO.setInventoryReview(false);
        approveProcessVO.setStorageType("合格入库");
        approveProcessVO.setRecordId(stockInRecordDto.getId());
        approveProcessVO.setRecordId(id);
        approveProcessService.addApprove(approveProcessVO);
    }