8 小时以前 361f5449f46da1fe7f4cef954dbf25bbe8b8101d
src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -8,6 +8,7 @@
        s.sales_ledger_id,
        s.shipping_date,
        s.shipping_car_number,
        s.shipping_address,
        s.express_number,
        s.express_company,
        s.shipping_no,
@@ -56,6 +57,7 @@
            s.sales_ledger_id,
            s.shipping_date,
            s.shipping_car_number,
            s.shipping_address,
            s.create_time,
            s.update_time,
            s.create_user,
@@ -78,7 +80,8 @@
            sor.batch_no,
            slp.tax_inclusive_unit_price,
            GREATEST(sor.stock_out_num - COALESCE(rs.total_return_num, 0), 0) AS un_quantity,
            COALESCE(rs.total_return_num, 0) AS total_return_num
            COALESCE(rs.return_num, 0) AS total_return_num,
            COALESCE(rs.pending_return_num, 0) AS pending_return_num
        FROM shipping_info si
        LEFT JOIN shipping_product_detail spd ON spd.shipping_info_id = si.id
        LEFT JOIN stock_out_record sor ON sor.record_id = si.id and sor.record_type = '13'
@@ -86,7 +89,9 @@
        LEFT JOIN (
        SELECT
        stock_out_record_id,
        SUM(num) AS total_return_num
        SUM(num) AS total_return_num,
        SUM( CASE WHEN rsp.STATUS = 0 THEN rsp.num ELSE 0 END ) AS pending_return_num ,
        SUM( CASE WHEN rsp.STATUS = 1 THEN rsp.num ELSE 0 END ) AS return_num
        FROM return_sale_product rsp
        left join return_management rm on rm.id = rsp.return_management_id
        left join shipping_info si on si.id = rm.shipping_id