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

liding

4 天以前 5bd9a135bae4ed6c57950cf0a160f471bc99d645

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

@@ -64,12 +64,12 @@
        stockInRecordDto.setProductModelId(stockUninventoryDto.getProductModelId());
        stockInRecordDto.setRemark(stockUninventoryDto.getRemark());
        stockInRecordDto.setType("1");
        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();
            }
@@ -78,7 +78,7 @@
        return 1;
    }

    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());
@@ -88,12 +88,13 @@
        approveProcessVO.setApproveTime(LocalDate.now().toString());
        approveProcessVO.setInventoryReview(false);
        approveProcessVO.setStorageType("不合格入库");
        approveProcessVO.setRecordId(stockInRecordDto.getId());
        approveProcessVO.setRecordId(id);
        approveProcessService.addApprove(approveProcessVO);
    }

    /**
     * 更新或创建非良品库存信息
     *
     * @param stockInRecord 非良品库存DTO对象
     */
    public void updateOrCreateStockUninventory(StockInRecord stockInRecord) {