product-inventory-management-after.git

			@@ -128,10 +128,12 @@
			c.customer_name,
			T1.contractAmounts AS contractAmounts,
			IFNULL(T2.receiptPaymentAmount, 0) AS receiptPaymentAmount,
			IFNULL(T5.receiptRecordAmount, 0) AS receiptRecordAmount,
			T1.contractAmounts - IFNULL(T2.receiptPaymentAmount, 0) - IFNULL(T4.returnAmount, 0) AS receiptableAmount,
			IFNULL(T4.returnAmount, 0) AS returnAmount
			from (select customer_id, sum(contract_amount) as contractAmounts from sales_ledger group by customer_id) T1
			left join (select customer_id, sum(collection_amount) as receiptPaymentAmount from account_sales_collection group by customer_id) T2 on T1.customer_id = T2.customer_id
			left join (select party_id, sum(amount) as receiptRecordAmount from payment_record where party_type = 1 and direction = 1 group by party_id) T5 on T5.party_id = T1.customer_id
			left join (
			select
			sl.customer_id,
			@@ -142,7 +144,7 @@
			where rm.status=1
			group by sl.customer_id
			) T4 on T4.customer_id=T1.customer_id
			left join customer c on T1.customer_id = c.id
			inner join customer c on T1.customer_id = c.id
			<where>
			<if test="customerName!=null and customerName!=''">
			AND c.customer_name LIKE CONCAT('%', #{customerName}, '%')
			@@ -157,6 +159,7 @@
			sl.execution_date,
			sl.contract_amount AS contract_amount,
			IFNULL(T1.receiptPaymentAmount, 0) AS receiptPaymentAmount,
			IFNULL(T5.receiptRecordAmount, 0) AS receiptRecordAmount,
			sl.contract_amount - IFNULL(T1.receiptPaymentAmount, 0) - IFNULL(T3.returnAmount, 0) AS receiptableAmount,
			IFNULL(T3.returnAmount, 0) AS returnAmount
			from sales_ledger sl
			@@ -181,6 +184,12 @@
			where rm.status=1
			group by sl.id
			)T3 on T3.id = sl.id
			left join (
			select party_id, sum(amount) as receiptRecordAmount
			from payment_record
			where party_type = 1 and direction = 1
			group by party_id
			)T5 on T5.party_id = sl.customer_id
			where sl.customer_id = #{customerId}
			order by sl.id desc
			</select>