1

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

@@ -220,6 +220,7 @@
         AND ei.expenses_type = '1'
         AND ei.expenses_purpose = '1'
         AND ei.cost_type = '1'
+        and ei.warehouse_name=iowt.warehouse_name
         AND ( ei.STATUS = '已收款' OR ei.STATUS = '已完成' )) -
         (
         SELECT
@@ -233,6 +234,7 @@
         AND ei.expenses_type = '2'
         AND ei.expenses_purpose = '1'
         AND ei.cost_type = '1'
+        and ei.warehouse_name=iowt.warehouse_name
         AND ( ei.STATUS = '已付款' OR ei.STATUS = '已完成' )) AS ContractCollection,
         (
         SELECT
@@ -246,6 +248,7 @@
         AND ei.expenses_type = '1'
         AND ei.expenses_purpose = '1'
         AND ei.cost_type = '3'
+        and ei.warehouse_name=iowt.warehouse_name
         AND ( ei.STATUS = '已收款' OR ei.STATUS = '已完成' )) -
         (
         SELECT
@@ -259,6 +262,7 @@
         AND ei.expenses_type = '2'
         AND ei.expenses_purpose = '1'
         AND ei.cost_type = '3'
+        and ei.warehouse_name=iowt.warehouse_name
         AND ( ei.STATUS = '已付款' OR ei.STATUS = '已完成' ))AS nonGrainCollection,
         (
         SELECT
@@ -272,6 +276,7 @@
         AND ei.expenses_type = '1'
         AND ei.expenses_purpose = '1'
         AND ei.cost_type = '5'
+        and ei.warehouse_name=iowt.warehouse_name
         AND ( ei.STATUS = '已收款' OR ei.STATUS = '已完成' )) -
         (
         SELECT
@@ -285,6 +290,7 @@
         AND ei.expenses_type = '2'
         AND ei.expenses_purpose = '1'
         AND ei.cost_type = '5'
+        and ei.warehouse_name=iowt.warehouse_name
         AND ( ei.STATUS = '已付款' OR ei.STATUS = '已完成' ))AS bond,
         (
         SELECT
@@ -295,6 +301,7 @@
         s.delete_flag = '0'
         AND s.contract_no = iowt.contract_no
         AND s.comp_id = iowt.comp_id
+        and s.warehouse_name=iowt.warehouse_name
         )- (
         SELECT
         IFNULL( sum( ei.amount_money ), 0 )
@@ -307,6 +314,7 @@
         AND ei.expenses_type = '1'
         AND ei.expenses_purpose = '1'
         AND ei.cost_type = '1'
+        and ei.warehouse_name=iowt.warehouse_name
         AND ( ei.STATUS = '已收款' OR ei.STATUS = '已完成' )) +
         (
         SELECT
@@ -320,6 +328,7 @@
         AND ei.expenses_type = '2'
         AND ei.expenses_purpose = '1'
         AND ei.cost_type = '1'
+        and ei.warehouse_name=iowt.warehouse_name
         AND ( ei.STATUS = '已付款' OR ei.STATUS = '已完成' ))AS uncollectedPayment
         FROM
             in_out_warehouse_task iowt