Merge remote-tracking branch 'origin/hxsj' into hxsj

云

2 天以前 b701cf0331e91900bf8055009a745d4953a6c510

Merge remote-tracking branch 'origin/hxsj' into hxsj

 src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java

@@ -44,6 +44,13 @@
        return AjaxResult.success(procurementRecordService.add(procurementDto));
    }

    @PostMapping("/addProduct")
    @Log(title = "入库管理-产品入库", businessType = BusinessType.INSERT)
    @Transactional
    public AjaxResult addProduct(@RequestBody Details detail) {
        return AjaxResult.success(procurementRecordService.addProduct(detail));
    }

    @PostMapping("/update")
    @Log(title = "采购入库-入库管理-修改入库", businessType = BusinessType.UPDATE)
    @Transactional

 src/main/java/com/ruoyi/procurementrecord/service/ProcurementRecordService.java

@@ -18,6 +18,7 @@
    List<ProcurementDto> listProcurementBySalesLedgerId(ProcurementDto procurementDto);

    int add(ProcurementAddDto procurementDto);
    int addProduct(Details detail);

    IPage<ProcurementPageDto> listPage(Page page, ProcurementPageDto procurementDto);


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

@@ -438,6 +438,25 @@
    }

    @Override
    public int addProduct(Details detail) {
        LoginUser loginUser = SecurityUtils.getLoginUser();
        ProcurementRecordStorage.ProcurementRecordStorageBuilder procurementRecordBuilder = ProcurementRecordStorage.builder()
                .inboundBatches("第1批次")
                .inboundNum(detail.getInboundQuantity())
                .warnNum(detail.getWarnNum())
                .outStockQuantity(detail.getOutStockQuantity())
                .shortageDescription(detail.getShortageDescription())
                .createTime(LocalDateTime.now())
                .createUser(loginUser.getUserId())
                .updateTime(LocalDateTime.now())
                .updateUser(loginUser.getUserId())
                .createBy(loginUser.getNickName())
                .productModelId(detail.getProductModelId());
        this.save(procurementRecordBuilder.build());
        return 1;
    }

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

 src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml

@@ -33,13 +33,16 @@
        select
        t3.supplier_name,
        t3.purchase_contract_number,
        t2.product_category,
        case when t2.product_category is null then t5.product_name
            else t2.product_category end as productCategory,
        t1.id,
        t1.sales_ledger_product_id,
        t1.product_model_id,
        t1.create_user,
        t2.specification_model,
        t2.unit,
        case when t2.specification_model is null then t4.model
            else t2.specification_model end as specificationModel,
        case when t2.unit is null then t4.unit
            else t2.unit end as unit,
        t2.tax_rate,
        t2.tax_inclusive_unit_price,
        (t1.inbound_num * t2.tax_inclusive_unit_price) as taxInclusiveTotalPrice,
@@ -56,6 +59,8 @@
        from  procurement_record_storage t1
                  left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
                  left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
                  left join product_model t4 on t4.id = t1.product_model_id
                  left join product t5 on t5.id = t4.product_id
        <where>
            1 = 1
            <if test="req.supplierName != null and req.supplierName != ''">
@@ -70,10 +75,13 @@
        select
            t3.supplier_name,
            t3.purchase_contract_number,
            t2.product_category,
            case when t2.product_category is null then t5.product_name
                 else t2.product_category end as productCategory,
            t1.id,
            t2.specification_model,
            t2.unit,
            case when t2.specification_model is null then t4.model
                 else t2.specification_model end as specificationModel,
            case when t2.unit is null then t4.unit
                 else t2.unit end as unit,
            t2.quantity,
            t2.quantity as quantity0,
            t2.tax_rate,
@@ -88,17 +96,22 @@
        from  procurement_record_storage t1
                  left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
                  left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
                  left join product_model t4 on t4.id = t1.product_model_id
                  left join product t5 on t5.id = t4.product_id
    </select>
    <select id="listPageCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
        select
        t3.supplier_name,
        t3.purchase_contract_number,
        t2.product_category,
        case when t2.product_category is null then t5.product_name
                 else t2.product_category end as productCategory,
        t1.id,
        t1.sales_ledger_product_id,
        t1.create_user,
        t2.specification_model,
        t2.unit,
        case when t2.specification_model is null then t4.model
                 else t2.specification_model end as specificationModel,
            case when t2.unit is null then t4.unit
                 else t2.unit end as unit,
        t2.min_stock,
        t2.tax_rate,
        t2.tax_inclusive_unit_price,
@@ -115,6 +128,8 @@
        from  procurement_record_storage t1
        left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
        left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
        left join product_model t4 on t4.id = t1.product_model_id
        left join product t5 on t5.id = t4.product_id
        <where>
            1 = 1
            <if test="req.supplierName != null and req.supplierName != ''">
@@ -145,12 +160,15 @@
        select
            t3.supplier_name,
            t3.purchase_contract_number,
            t2.product_category,
            case when t2.product_category is null then t5.product_name
                 else t2.product_category end as productCategory,
            t1.id,
            t1.sales_ledger_product_id,
            t1.create_user,
            t2.specification_model,
            t2.unit,
            case when t2.specification_model is null then t4.model
                 else t2.specification_model end as specificationModel,
            case when t2.unit is null then t4.unit
                 else t2.unit end as unit,
            t2.tax_rate,
            t2.tax_inclusive_unit_price,
            t2.tax_inclusive_total_price,
@@ -166,6 +184,8 @@
        from  procurement_record_storage t1
                  left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
                  left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
                  left join product_model t4 on t4.id = t1.product_model_id
                  left join product t5 on t5.id = t4.product_id
    </select>
    <select id="getSumQuantity" resultType="BigDecimal">
        select COALESCE(sum(inbound_num), 0)