Merge branch 'hxsj' of http://114.132.189.42:9002/r/product-inventory-manag...

huminmin

4 天以前 771dbd46e99b0a5db639a9029bf401626699af85

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

@@ -4,22 +4,23 @@

    <select id="listProcurementBySalesLedgerId" resultType="com.ruoyi.procurementrecord.dto.ProcurementDto">
        select
            t1.supplier_name,
            t2.product_category,
            t2.id,
            t3.id as recordId,
            t2.specification_model,
            t2.unit,
            t2.quantity,
            t2.min_stock,
            t2.warn_num,
            t2.quantity as quantity0,
            t2.tax_rate,
            t2.tax_inclusive_unit_price,
            t2.tax_inclusive_total_price,
            t2.tax_exclusive_total_price,
            t3.inbound_num as quantityStock
        from  purchase_ledger t1
        t1.supplier_name,
        t2.product_category,
        t2.id,
        t3.id as recordId,
        t2.specification_model,
        t2.unit,
        t2.quantity,
        t2.min_stock,
        t2.warn_num,
        t2.quantity as quantity0,
        t2.tax_rate,
        t2.tax_inclusive_unit_price,
        t2.tax_inclusive_total_price,
        t2.tax_exclusive_total_price,
        t3.inbound_num as quantityStock,
        t2.product_model_id
        from purchase_ledger t1
        left join sales_ledger_product t2 on t1.id = t2.sales_ledger_id
        left join procurement_record_storage t3 on t2.id = t3.sales_ledger_product_id
        where t1.purchase_contract_number = #{req.purchaseContractNumber}
@@ -48,7 +49,9 @@
        t1.create_time,
        t1.update_time,
        t1.create_by,
        t2.warn_num
        t2.warn_num,
        t1.out_stock_quantity as outStockQuantity,
        t1.shortage_description as shortageDescription
        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