完善bug

zss

2026-04-23 7ca47e4546957645179a13351e7dfd74667b3c19

完善bug

 src/main/java/com/ruoyi/sales/vo/ShippingInfoVo.java

@@ -13,4 +13,8 @@
     * 数量
     */
    private BigDecimal quantity;


    private String productCategory;
    private String specificationModel;
}

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

@@ -54,7 +54,7 @@
        t1.create_time,
        t1.update_time,
        t1.create_by,
        t2.warn_num,
         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
@@ -131,8 +131,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

 src/main/resources/mapper/sales/ShippingInfoMapper.xml

@@ -25,9 +25,6 @@
        <if test="req.salesContractNo != null and req.salesContractNo != ''">
            AND sl.sales_contract_no LIKE CONCAT('%',#{req.salesContractNo},'%')
        </if>
          <if test="req.productCategory != null and req.productCategory != ''">
            AND slp.product_category LIKE CONCAT('%',#{req.productCategory},'%')
        </if>
        <if test="req.shippingCarNumber != null and req.shippingCarNumber != ''">
            AND s.shipping_car_number LIKE CONCAT('%',#{req.shippingCarNumber},'%')
        </if>