|
@@ -1366,7 +1366,7 @@
|
|
|
AND exi.comp_id = cmi.comp_id
|
|
AND exi.comp_id = cmi.comp_id
|
|
|
AND exi.expenses_type = '2'
|
|
AND exi.expenses_type = '2'
|
|
|
AND exi.expenses_purpose = '1'
|
|
AND exi.expenses_purpose = '1'
|
|
|
- AND exi.status = '已付款'
|
|
|
|
|
|
|
+ AND (exi.status = '已付款' or exi.status = '已完成')
|
|
|
AND exi.delete_flag = '0'
|
|
AND exi.delete_flag = '0'
|
|
|
)- (
|
|
)- (
|
|
|
SELECT
|
|
SELECT
|
|
@@ -1436,7 +1436,7 @@
|
|
|
AND exi.comp_id = cmi.comp_id
|
|
AND exi.comp_id = cmi.comp_id
|
|
|
AND exi.expenses_type = '2'
|
|
AND exi.expenses_type = '2'
|
|
|
AND exi.expenses_purpose = '1'
|
|
AND exi.expenses_purpose = '1'
|
|
|
- AND exi.status = '已付款'
|
|
|
|
|
|
|
+ AND (exi.status = '已付款' or exi.status = '已完成')
|
|
|
AND exi.delete_flag = '0'
|
|
AND exi.delete_flag = '0'
|
|
|
)- (
|
|
)- (
|
|
|
SELECT
|
|
SELECT
|
|
@@ -1447,7 +1447,7 @@
|
|
|
exi.contract_no = cmi.contract_no
|
|
exi.contract_no = cmi.contract_no
|
|
|
AND exi.comp_id = cmi.comp_id
|
|
AND exi.comp_id = cmi.comp_id
|
|
|
AND exi.expense_name = '运费'
|
|
AND exi.expense_name = '运费'
|
|
|
- AND exi.status = '已付款'
|
|
|
|
|
|
|
+ AND (exi.status = '已付款' or exi.status = '已完成')
|
|
|
AND exi.delete_flag = '0'
|
|
AND exi.delete_flag = '0'
|
|
|
))/(
|
|
))/(
|
|
|
(
|
|
(
|
|
@@ -1489,7 +1489,7 @@
|
|
|
AND exi.comp_id = cmi.comp_id
|
|
AND exi.comp_id = cmi.comp_id
|
|
|
AND exi.expenses_type = '2'
|
|
AND exi.expenses_type = '2'
|
|
|
AND exi.expenses_purpose = '1'
|
|
AND exi.expenses_purpose = '1'
|
|
|
- AND exi.status = '已付款'
|
|
|
|
|
|
|
+ AND (exi.status = '已付款' or exi.status = '已完成')
|
|
|
AND exi.delete_flag = '0'
|
|
AND exi.delete_flag = '0'
|
|
|
)- (
|
|
)- (
|
|
|
SELECT
|
|
SELECT
|
zhangyuewww