fix: 产品入库的库存返回产品大类、规则型号、单位

gongchunyi

2 天以前 593379b64d440c06887e8fbfa2803c70463dba19

 src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java

@@ -181,11 +181,13 @@
        String entryDateStr = procurementDto.getEntryDate() + " 00:00:00";
        String createTimeStr = procurementDto.getCreateTime() + " 00:00:00";
        SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(procurementDto.getSalesLedgerProductId());
        if(salesLedgerProduct == null){
        if (procurementDto.getSalesLedgerProductId() != null && salesLedgerProduct == null) {
            throw new RuntimeException("销售台账产品不存在");
        }
        if (procurementDto.getSalesLedgerProductId() != null && salesLedgerProduct != null) {
        salesLedgerProduct.setMinStock(procurementDto.getMinStock());
        salesLedgerProductMapper.updateById(salesLedgerProduct);
        }
        ProcurementRecordStorage procurementRecordStorageById = getProcurementRecordById(procurementDto.getId());
        procurementRecordStorageById.setCreateBy(sysUser.getNickName());
        procurementRecordStorageById.setCreateUser(sysUser.getUserId());
@@ -375,6 +377,30 @@
    }

    @Override
    public int addProduct(Details detail) {
        LoginUser loginUser = SecurityUtils.getLoginUser();

        ProcurementRecordStorage.ProcurementRecordStorageBuilder builder = ProcurementRecordStorage.builder()
                .id(detail.getId())
                .inboundBatches("第1批次")
                .inboundNum(detail.getInboundQuantity())
                .warnNum(detail.getWarnNum())
                .outStockQuantity(detail.getOutStockQuantity())
                .shortageDescription(detail.getShortageDescription())
                .productModelId(detail.getProductModelId())
                .updateTime(LocalDateTime.now())
                .updateUser(loginUser.getUserId());
        if (detail.getId() == null) {
            builder.createTime(LocalDateTime.now())
                    .createUser(loginUser.getUserId())
                    .createBy(loginUser.getNickName());
        }

        boolean success = this.saveOrUpdate(builder.build());
        return success ? 1 : 0;
    }

    @Override
    public IPage<ProcurementPageDto> listPage(Page page, ProcurementPageDto procurementDto) {
        IPage<ProcurementPageDto> procurementPageDtoIPage = procurementRecordMapper.listPage(page, procurementDto);
        List<ProcurementPageDto> procurementPageDtos = procurementPageDtoIPage.getRecords();