|
@@ -79,8 +79,7 @@
|
|
|
i.bank_deposit as bankDeposit,
|
|
i.bank_deposit as bankDeposit,
|
|
|
i.bank_deposit_branch as bankDepositBranch
|
|
i.bank_deposit_branch as bankDepositBranch
|
|
|
FROM payment_management a
|
|
FROM payment_management a
|
|
|
- left join quality_inspection_management q on q.relation_id = a.relation_id and q.comp_id = a.comp_id and
|
|
|
|
|
- q.delete_flag = 0
|
|
|
|
|
|
|
+ left join quality_inspection_management q on q.relation_id = a.relation_id and q.comp_id = a.comp_id and q.delete_flag = 0
|
|
|
left join weighing_management w on w.relation_id = a.relation_id and w.comp_id = a.comp_id and w.delete_flag = 0
|
|
left join weighing_management w on w.relation_id = a.relation_id and w.comp_id = a.comp_id and w.delete_flag = 0
|
|
|
left join common_company c on c.comp_id = a.comp_id and c.delete_flag = 0
|
|
left join common_company c on c.comp_id = a.comp_id and c.delete_flag = 0
|
|
|
left join identity_authentication_info i on i.customer_name = a.customer_name
|
|
left join identity_authentication_info i on i.customer_name = a.customer_name
|
|
@@ -91,6 +90,7 @@
|
|
|
AND a.comp_id = #{compId}
|
|
AND a.comp_id = #{compId}
|
|
|
AND a.management_type = '1'
|
|
AND a.management_type = '1'
|
|
|
AND a.contract_no is not null
|
|
AND a.contract_no is not null
|
|
|
|
|
+ AND q.warehouse_in_out_id is not null
|
|
|
<if test="warehouseName != null and warehouseName != ''">
|
|
<if test="warehouseName != null and warehouseName != ''">
|
|
|
AND a.warehouse_name= #{warehouseName}
|
|
AND a.warehouse_name= #{warehouseName}
|
|
|
</if>
|
|
</if>
|
