1

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseBaseInfoMapper.xml

@@ -706,13 +706,13 @@
 --         LEFT JOIN stock_sale_receipt_report ssrr ON ssrr.contract_no = iowt.contract_no
 --         AND ssrr.warehouse_record_id = wioi1.id
 --         AND ssrr.delete_flag = 0
-        LEFT JOIN expense_info ei ON ei.warehouse_id = w.id and ei.delete_flag = '0'
-        AND ei.expenses_type = '2'
-        AND ei.expenses_purpose = '3'
-        AND (DATE_FORMAT(ei.create_date,"%Y%m%d") >=
-        DATE_FORMAT(#{startDate},"%Y%m%d"))
-        AND (DATE_FORMAT(ei.create_date,"%Y%m%d") <=
-        DATE_FORMAT(#{endDate},"%Y%m%d"))
+--         LEFT JOIN expense_info ei ON ei.warehouse_id = w.id and ei.delete_flag = '0'
+--         AND ei.expenses_type = '2'
+--         AND ei.expenses_purpose = '3'
+--         AND (DATE_FORMAT(ei.create_date,"%Y%m%d") >=
+--         DATE_FORMAT(#{startDate},"%Y%m%d"))
+--         AND (DATE_FORMAT(ei.create_date,"%Y%m%d") <=
+--         DATE_FORMAT(#{endDate},"%Y%m%d"))
         WHERE
         w.comp_id = #{compId}
         AND w.warehouse_type = '1'
@@ -771,7 +771,21 @@
         LEFT JOIN stock_sale_receipt_report ssrr ON ssrr.contract_no = iowt.contract_no
         AND ssrr.warehouse_record_id = wioi1.id
         where wbi.id=w.id) as salesVolume,
-        IFNULL(SUM(ei.amount_money),0) as cost
+        (
+        SELECT
+        IFNULL( SUM( ei.amount_money ), 0 )
+        FROM
+        expense_info ei
+        WHERE
+        ei.warehouse_id = w.id
+        AND ei.delete_flag = '0'
+        AND ei.expenses_type = '2'
+        AND ei.expenses_purpose = '3'
+        AND (DATE_FORMAT(ei.create_date,"%Y%m%d") >=
+        DATE_FORMAT(#{startDate},"%Y%m%d"))
+        AND (DATE_FORMAT(ei.create_date,"%Y%m%d") <=
+        DATE_FORMAT(#{endDate},"%Y%m%d"))
+        ) AS cost
         FROM
         warehouse_base_info w
         LEFT JOIN warehousing_order war ON war.base_id = w.id  AND war.in_type = '收购入库'
@@ -789,13 +803,9 @@
 --         LEFT JOIN stock_sale_receipt_report ssrr ON ssrr.contract_no = iowt.contract_no
 --         AND ssrr.warehouse_record_id = wioi1.id
 --         AND ssrr.delete_flag = 0
-        LEFT JOIN expense_info ei ON ei.warehouse_id = w.id and ei.delete_flag = '0'
-        AND ei.expenses_type = '2'
-        AND ei.expenses_purpose = '3'
-        AND (DATE_FORMAT(ei.create_date,"%Y%m%d") >=
-        DATE_FORMAT(#{startDate},"%Y%m%d"))
-        AND (DATE_FORMAT(ei.create_date,"%Y%m%d") <=
-        DATE_FORMAT(#{endDate},"%Y%m%d"))
+--         LEFT JOIN expense_info ei ON ei.warehouse_id = w.id and ei.delete_flag = '0'
+--         AND ei.expenses_type = '2'
+--         AND ei.expenses_purpose = '3'
         WHERE
         w.comp_id = #{compId}
         AND w.warehouse_type = '1'