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

zss

18 小时以前 afacb4a693c3b7e40ccdd55bc403850709ff8a34

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

@@ -137,6 +137,7 @@
        sum(t1.total_price) as totalPrice,
        sum(t1.inbound_num) as inboundNum,
        sum(t1.inbound_num) as inboundNum0,
        t1.inbound_num as totalInboundNum,
        t1.create_time,
        t1.update_time,
        t1.create_by,
@@ -171,7 +172,7 @@
                and t1.create_time <= #{req.endDate}
            </if>
        </where>
        group by t2.product_category,t2.specification_model,t1.unit_price
        group by t3.supplier_name,t2.product_category,t2.specification_model,t1.unit_price
        order by t1.create_time desc
    </select>
    <select id="listCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
@@ -254,12 +255,13 @@
        t1.create_time,
        t1.update_time,
        t1.create_by,
        t2.warn_num
        t2.warn_num,
        t2.product_id
        from  procurement_record_storage t1
        left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id and t2.type = 1
        left join sales_ledger t3 on t3.id = t2.sales_ledger_id
        <where>
            t1.type = 2
            t1.type = 2 and t1.sales_ledger_product_id != 0
            <if test="req.customerName != null and req.customerName != ''">
                and t3.customer_name like  concat('%',#{req.customerName},'%')
            </if>
@@ -296,7 +298,8 @@
        t1.create_time,
        t1.update_time,
        t1.create_by,
        t2.warn_num
        t2.warn_num,
        t2.product_id
        from  procurement_record_storage t1
        left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id and t2.type = 1
        left join sales_ledger t3 on t3.id = t2.sales_ledger_id
@@ -310,6 +313,9 @@
            </if>
            <if test="req.timeStr != null and req.timeStr != ''">
                and t1.create_time like  concat('%',#{req.timeStr},'%')
            </if>
            <if test="req.salesLedgerProductId != null and req.salesLedgerProductId != ''">
                and t1.sales_ledger_product_id = #{req.salesLedgerProductId}
            </if>
            <if test="req.reportDate != null">
                and t1.create_time >= #{req.reportDate} and t1.create_time &lt; DATE_ADD(#{req.reportDate}, INTERVAL 1 DAY)
@@ -330,4 +336,47 @@
        group by t2.product_category,t2.specification_model,t1.unit_price
        order by t1.create_time desc
    </select>
    <select id="listPagePRS" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
        select *
        from  procurement_record_storage t1
        left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
          <where>
              1=1
              <if test="req.productCategory != null and req.productCategory != ''">
                  and t2.product_category like  concat('%',#{req.productCategory},'%')
              </if>
              <if test="req.timeStr != null and req.timeStr != ''">
                  and t1.create_time like  concat('%',#{req.timeStr},'%')
              </if>
              <if test="req.salesLedgerProductId != null and req.salesLedgerProductId != ''">
                  and t1.sales_ledger_product_id = #{req.salesLedgerProductId}
              </if>
          </where>
    </select>
    <select id="getSumQuantity" resultType="BigDecimal">
        select COALESCE(sum(inbound_num), 0)
        from procurement_record_storage
        where product_model_id = #{productModelId}
    </select>
    <select id="listPageByProductProduction" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
        select
        t1.*,
        t2.model as specification_model  ,
        t2.unit,
        t3.product_name as product_category
        from  procurement_record_storage t1
        left  join product_model t2 on t1.product_model_id = t2.id
        left join product t3 on t2.product_id = t3.id
        <where>
            t1.type = 2 and t1.sales_ledger_product_id  = 0
            <if test="req.productCategory != null and req.productCategory != ''">
                and t3.product_name like  concat('%',#{req.productCategory},'%')
            </if>

            <if test="req.timeStr != null and req.timeStr != ''">
                and t1.create_time like  concat('%',#{req.timeStr},'%')
            </if>
        </where>
        order by t1.create_time desc
    </select>
</mapper>