product-inventory-management-after.git

			@@ -9,7 +9,7 @@
			<select id="listPage" resultType="com.ruoyi.basic.vo.CustomerVo">
			select
			c.*,
			u.user_name usage_user_name,
			u.nick_name usage_user_name,
			(
			select group_concat(u2.user_name separator ', ')
			from customer_user cu
			@@ -167,21 +167,27 @@
			select sl.id salesLedgerId,
			sl.sales_contract_no,
			sl.execution_date,
			sl.contract_amount,
			sl.contract_amount - IFNULL(T3.returnAmount, 0) AS contract_amount,
			IFNULL(T1.receiptPaymentAmount, 0) AS receiptPaymentAmount,
			IFNULL(T2.outboundAmount, 0) - IFNULL(T3.returnAmount, 0) AS receiptableAmount
			from sales_ledger sl
			left join (
			select
			sl.id,
			sum(ascc.collection_amount) as receiptPaymentAmount
			from account_sales_collection ascc
			left join stock_out_record sor on FIND_IN_SET(sor.id, ascc.stock_out_record_ids) > 0
			left join shipping_info s on sor.record_id = s.id
			LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
			WHERE sor.record_type='13'
			and sor.approval_status=1
			group by sl.id
			sum(t.collection_amount) as receiptPaymentAmount
			from (
			select
			ascc.collection_amount,
			s.sales_ledger_id
			from account_sales_collection ascc
			left join stock_out_record sor on FIND_IN_SET(sor.id, ascc.stock_out_record_ids) > 0
			left join shipping_info s on sor.record_id = s.id
			where sor.record_type='13'
			and sor.approval_status=1
			group by ascc.id, s.sales_ledger_id
			) t
			left join sales_ledger sl on t.sales_ledger_id = sl.id
			group by sl.id
			)T1 on T1.id = sl.id
			left join (
			SELECT