冲突解决

zss

昨天 ecd6e50d0bb2c74e4b3f7a23e0d44f5e001987ea

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

@@ -54,7 +54,7 @@
        t1.create_time as createTime,
        t1.update_time as updateTime,
        t1.create_by as createBy,
        t2.warn_num as warnNum,
        ifnull(t1.warn_num, t2.warn_num) as warnNum,
        t1.out_stock_quantity as outStockQuantity,
        t1.shortage_description as shortageDescription
        from procurement_record_storage t1
@@ -70,12 +70,15 @@
            <if test="req.timeStr != null and req.timeStr != ''">
                and t1.create_time like concat('%',#{req.timeStr},'%')
            </if>
            <if test="req.productModelId != null">
                and t1.product_model_id = #{req.productModelId}
            </if>
        </where>
    </select>

    <select id="list" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
        select t3.supplier_name as supplierName,
               t3.purchase_contract_number as purchaseContractNumber,
        select t3.supplier_name                    as supplierName,
               t3.purchase_contract_number         as purchaseContractNumber,
               case
                   when t2.product_category is null then t5.product_name
                   else t2.product_category end    as productCategory,
@@ -106,7 +109,7 @@

    <select id="listPageCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
        select
        t3.supplier_name,
        t3.supplier_name as supplierName,
        t3.purchase_contract_number,
        case when t2.product_category is null then t5.product_name
        else t2.product_category end as productCategory,
@@ -129,8 +132,8 @@
        max(t1.create_time) as create_time,
        max(t1.update_time) as update_time,
        t1.create_by,
        t2.warn_num
        from procurement_record_storage t1
        ifnull(t1.warn_num, t2.warn_num) as warnNum
        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
@@ -161,11 +164,14 @@
            </if>
        </where>
        group by
            t3.supplier_name,
            t3.purchase_contract_number,
            productCategory,
            specificationModel,
            unit
        t3.supplier_name,
        t3.purchase_contract_number,
        productCategory,
        specificationModel,
        unit
        order by
        (t3.supplier_name IS NULL) DESC,
        t3.supplier_name ASC
    </select>

    <select id="listCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">