product-inventory-management-after.git

			@@ -9,9 +9,16 @@
			<select id="listPage" resultType="com.ruoyi.basic.vo.CustomerVo">
			select
			c.*,
			u.user_name usage_user_name,
			<choose>
			<when test="isAdmin">
			u.nick_name usage_user_name,
			</when>
			<otherwise>
			CASE WHEN c.usage_user = #{loginUserId} OR c.create_user = #{loginUserId} THEN u.nick_name ELSE '' END as usage_user_name,
			</otherwise>
			</choose>
			(
			select group_concat(u2.user_name separator ', ')
			select group_concat(u2.nick_name separator ', ')
			from customer_user cu
			left join sys_user u2 on cu.user_id = u2.user_id
			where cu.customer_id = c.id
			@@ -65,9 +72,16 @@
			<select id="list" resultType="com.ruoyi.basic.vo.CustomerVo">
			select
			c.*,
			u.user_name usage_user_name,
			<choose>
			<when test="isAdmin">
			u.nick_name usage_user_name,
			</when>
			<otherwise>
			CASE WHEN c.usage_user = #{loginUserId} OR c.create_user = #{loginUserId} THEN u.nick_name ELSE '' END as usage_user_name,
			</otherwise>
			</choose>
			(
			select group_concat(u2.user_name separator ', ')
			select group_concat(u2.nick_name separator ', ')
			from customer_user cu
			left join sys_user u2 on cu.user_id = u2.user_id
			where cu.customer_id = c.id
			@@ -128,7 +142,7 @@
			c.customer_name,
			T1.contractAmounts AS contractAmounts,
			IFNULL(T2.receiptPaymentAmount, 0) AS receiptPaymentAmount,
			T1.contractAmounts - (IFNULL(T2.receiptPaymentAmount, 0) - IFNULL(T4.returnAmount, 0)) AS receiptableAmount,
			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
			@@ -157,20 +171,26 @@
			sl.execution_date,
			sl.contract_amount AS contract_amount,
			IFNULL(T1.receiptPaymentAmount, 0) AS receiptPaymentAmount,
			sl.contract_amount - (IFNULL(T1.receiptPaymentAmount, 0) - IFNULL(T3.returnAmount, 0)) AS receiptableAmount,
			sl.contract_amount - IFNULL(T1.receiptPaymentAmount, 0) - IFNULL(T3.returnAmount, 0) AS receiptableAmount,
			IFNULL(T3.returnAmount, 0) AS returnAmount
			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 sl.id,