From 61f1de60e6f58dd8e19f01c56f2e56e40885d65b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 23 六月 2026 17:39:58 +0800
Subject: [PATCH] 点击发货-》发货审核-》出厂质检-》出库审核-》出库通过
---
src/main/resources/mapper/basic/CustomerMapper.xml | 327 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 322 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/basic/CustomerMapper.xml b/src/main/resources/mapper/basic/CustomerMapper.xml
index 1e7df5c..7f429cd 100644
--- a/src/main/resources/mapper/basic/CustomerMapper.xml
+++ b/src/main/resources/mapper/basic/CustomerMapper.xml
@@ -6,7 +6,7 @@
<resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.Customer">
<id column="id" property="id" />
</resultMap>
- <select id="listPage" resultType="com.ruoyi.basic.dto.CustomerDto">
+ <select id="listPage" resultType="com.ruoyi.basic.vo.CustomerVo">
select
c.*,
u.user_name usage_user_name,
@@ -16,7 +16,13 @@
left join sys_user u2 on cu.user_id = u2.user_id
where cu.customer_id = c.id
and cu.user_id != c.usage_user
- ) as together_user_names
+ ) as together_user_names,
+ (
+ select group_concat(cu.user_id separator ',')
+ from customer_user cu
+ where cu.customer_id = c.id
+ and cu.user_id != c.usage_user
+ ) as user_ids_str
from customer c
left join sys_user u on c.usage_user = u.user_id
<where>
@@ -26,16 +32,327 @@
<if test="c.customerType != null and c.customerType != ''">
and customer_type = #{c.customerType}
</if>
- <!-- 绉佹捣鏌ヨ锛歵ype = 0锛堢娴峰鎴凤級鎴栬�� type = 1锛堝叕娴峰鎴凤級涓斿凡琚垎閰� -->
+ <!-- 鍏捣鏌ヨ锛歵ype = 1锛堝叕娴峰鎴凤級-->
+ <if test="c.type != null and c.type == 1">
+ and type = #{c.type}
+ </if>
+ <!-- 绉佹捣鏌ヨ锛歵ype = 0锛堢娴峰鎴凤級鎴栬�� type = 1锛堝叕娴峰鎴凤級涓斿凡琚垎閰嶏紝骞朵笖鏄嚜宸遍鐢ㄣ�佽嚜宸卞垱寤烘垨鑰呭叡浜粰鑷繁鐨勫鎴� -->
<if test="c.type != null and c.type == 0">
- and type = #{c.type} or (type = 1 and is_assigned = 1)
+ and (
+ (type = #{c.type} or (type = 1 and is_assigned = 1))
+ and (
+ c.usage_user = #{loginUserId}
+ or c.create_user = #{loginUserId}
+ or exists (
+ select 1 from customer_user cu
+ where cu.customer_id = c.id
+ and cu.user_id = #{loginUserId}
+ )
+ )
+ )
+ </if>
+ </where>
+ order by c.id desc
+ </select>
+
+ <select id="list" resultType="com.ruoyi.basic.vo.CustomerVo">
+ select
+ c.*,
+ u.user_name usage_user_name,
+ (
+ select group_concat(u2.user_name separator ', ')
+ from customer_user cu
+ left join sys_user u2 on cu.user_id = u2.user_id
+ where cu.customer_id = c.id
+ and cu.user_id != c.usage_user
+ ) as together_user_names,
+ (
+ select group_concat(cu.user_id separator ',')
+ from customer_user cu
+ where cu.customer_id = c.id
+ and cu.user_id != c.usage_user
+ ) as user_ids_str
+ from customer c
+ left join sys_user u on c.usage_user = u.user_id
+ <where>
+ <if test="c.ids != null and c.ids.length > 0">
+ and c.id in
+ <foreach collection="c.ids" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+ <if test="c.customerName != null and c.customerName != ''">
+ and customer_name like concat('%', #{c.customerName}, '%')
+ </if>
+ <if test="c.customerType != null and c.customerType != ''">
+ and customer_type = #{c.customerType}
</if>
<!-- 鍏捣鏌ヨ锛歵ype = 1锛堝叕娴峰鎴凤級-->
<if test="c.type != null and c.type == 1">
and type = #{c.type}
</if>
+ <!-- 绉佹捣鏌ヨ锛歵ype = 0锛堢娴峰鎴凤級鎴栬�� type = 1锛堝叕娴峰鎴凤級涓斿凡琚垎閰嶏紝骞朵笖鏄嚜宸遍鐢ㄣ�佽嚜宸卞垱寤烘垨鑰呭叡浜粰鑷繁鐨勫鎴� -->
+ <if test="c.type != null and c.type == 0">
+ and (
+ (type = #{c.type} or (type = 1 and is_assigned = 1))
+ and (
+ c.usage_user = #{loginUserId}
+ or c.create_user = #{loginUserId}
+ or exists (
+ select 1 from customer_user cu
+ where cu.customer_id = c.id
+ and cu.user_id = #{loginUserId}
+ )
+ )
+ )
+ </if>
</where>
+ order by c.id desc
+ </select>
+ <select id="customewTransactions" resultType="com.ruoyi.sales.vo.CustomerTransactionsVo">
+ select T1.customer_id,
+ c.customer_name,
+ T1.contractAmounts,
+ IFNULL(T2.receiptPaymentAmount, 0) AS receiptPaymentAmount,
+ IFNULL(T3.outboundAmount, 0) - IFNULL(T4.returnAmount, 0) AS receiptableAmount
+ 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
+ sl.customer_id,
+ sum(sor.stock_out_num * slp.tax_inclusive_unit_price) as outboundAmount
+ FROM stock_out_record sor
+ LEFT join shipping_info s on sor.record_id = s.id
+ LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
+ LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id
+ WHERE sor.record_type='13'
+ and sor.approval_status=1
+ and slp.type = 1
+ group by sl.customer_id
+ ) T3 on T3.customer_id=T1.customer_id
+ left join (
+ select
+ sl.customer_id,
+ sum(rm.refund_amount) as returnAmount
+ from return_management rm
+ left join shipping_info si on rm.shipping_id = si.id
+ left join sales_ledger sl on si.sales_ledger_id = sl.id
+ 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
+ <where>
+ <if test="customerName!=null and customerName!=''">
+ AND c.customer_name LIKE CONCAT('%', #{customerName}, '%')
+ </if>
+ </where>
+ order by T1.customer_id desc
+ </select>
+ <select id="customewTransactionsDetails"
+ resultType="com.ruoyi.sales.vo.CustomerTransactionsDetailsVo">
+ select sl.id salesLedgerId,
+ sl.sales_contract_no,
+ sl.execution_date,
+ sl.contract_amount,
+ T4.productNames,
+ 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
+ )T1 on T1.id = sl.id
+ left join (
+ SELECT
+ sl.id,
+ sum(sor.stock_out_num * slp.tax_inclusive_unit_price) as outboundAmount
+ FROM stock_out_record sor
+ left join shipping_info s on sor.record_id = s.id
+ LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
+ LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id
+ WHERE sor.record_type='13'
+ and sor.approval_status=1
+ and slp.type = 1
+ group by sl.id
+ )T2 on T2.id = sl.id
+ left join (
+ select sl.id,
+ sum(rm.refund_amount) as returnAmount
+ from return_management rm
+ left join shipping_info si on rm.shipping_id = si.id
+ left join sales_ledger sl on si.sales_ledger_id = sl.id
+ where rm.status=1
+ group by sl.id
+ )T3 on T3.id = sl.id
+ left join (
+ select slp.sales_ledger_id, GROUP_CONCAT(p.product_name) as productNames
+ from sales_ledger_product slp
+ left join product p on slp.product_id = p.id
+ where slp.type = 1
+ group by slp.sales_ledger_id
+ ) T4 on T4.sales_ledger_id = sl.id
+ where sl.customer_id = #{customerId}
+ order by sl.id desc
</select>
+ <!-- 瀹㈡埛寰�鏉ョ粺璁℃眹鎬� -->
+ <select id="getCustomerTransactionsSummary" resultType="com.ruoyi.sales.vo.CustomerTransactionsSummaryVo">
+ SELECT
+ c.id AS customerId,
+ c.customer_name AS customerName,
+ IFNULL(T1.contractAmounts, 0) AS contractAmounts,
+ IFNULL(T1.contractCount, 0) AS contractCount,
+ IFNULL(T5.productCount, 0) AS productCount,
+ IFNULL(T2.shippedAmounts, 0) AS shippedAmounts,
+ IFNULL(T2.shippedQuantity, 0) AS shippedQuantity,
+ IFNULL(T3.receivedAmounts, 0) AS receivedAmounts,
+ IFNULL(T2.shippedAmounts, 0) - IFNULL(T3.receivedAmounts, 0) AS receivableAmounts,
+ IFNULL(T4.returnAmounts, 0) AS returnAmounts,
+ IFNULL(T1.contractAmounts, 0) - IFNULL(T2.shippedAmounts, 0) AS unshippedAmounts,
+ CASE WHEN IFNULL(T2.shippedAmounts, 0) > 0
+ THEN ROUND(IFNULL(T3.receivedAmounts, 0) / T2.shippedAmounts * 100, 2)
+ ELSE 0 END AS receivedRate,
+ CASE WHEN IFNULL(T1.contractAmounts, 0) > 0
+ THEN ROUND(IFNULL(T2.shippedAmounts, 0) / T1.contractAmounts * 100, 2)
+ ELSE 0 END AS shippedRate
+ FROM customer c
+ LEFT JOIN (
+ SELECT customer_id, SUM(contract_amount) AS contractAmounts, COUNT(*) AS contractCount
+ FROM sales_ledger WHERE customer_id = #{customerId}
+ GROUP BY customer_id
+ ) T1 ON T1.customer_id = c.id
+ LEFT JOIN (
+ SELECT
+ sl.customer_id,
+ SUM(sor.stock_out_num) AS shippedQuantity,
+ SUM(sor.stock_out_num * slp.tax_inclusive_unit_price) AS shippedAmounts
+ FROM stock_out_record sor
+ LEFT JOIN shipping_info s ON sor.record_id = s.id
+ LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
+ LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id
+ WHERE sor.record_type = '13' AND sor.approval_status = 1 AND slp.type = 1
+ AND sl.customer_id = #{customerId}
+ GROUP BY sl.customer_id
+ ) T2 ON T2.customer_id = c.id
+ LEFT JOIN (
+ SELECT customer_id, SUM(collection_amount) AS receivedAmounts
+ FROM account_sales_collection WHERE customer_id = #{customerId}
+ GROUP BY customer_id
+ ) T3 ON T3.customer_id = c.id
+ LEFT JOIN (
+ SELECT
+ sl.customer_id,
+ SUM(rm.refund_amount) AS returnAmounts
+ FROM return_management rm
+ LEFT JOIN shipping_info si ON rm.shipping_id = si.id
+ LEFT JOIN sales_ledger sl ON si.sales_ledger_id = sl.id
+ WHERE rm.status = 1 AND sl.customer_id = #{customerId}
+ GROUP BY sl.customer_id
+ ) T4 ON T4.customer_id = c.id
+ LEFT JOIN (
+ SELECT sl.customer_id, COUNT(DISTINCT pm.product_id) AS productCount
+ FROM sales_ledger sl
+ LEFT JOIN sales_ledger_product slp ON sl.id = slp.sales_ledger_id
+ LEFT JOIN product_model pm ON slp.product_id = pm.id
+ WHERE sl.customer_id = #{customerId} AND slp.type = 1
+ GROUP BY sl.customer_id
+ ) T5 ON T5.customer_id = c.id
+ WHERE c.id = #{customerId}
+ </select>
-</mapper>
\ No newline at end of file
+ <!-- 瀹㈡埛寰�鏉ヤ骇鍝佹槑缁� -->
+ <select id="getCustomerTransactionsProducts" resultType="com.ruoyi.sales.vo.CustomerTransactionsProductVo">
+ SELECT
+ sl.id AS salesLedgerId,
+ sl.sales_contract_no AS salesContractNo,
+ slp.product_id AS productId,
+ IFNULL(p.product_name, slp.product_category) AS productName,
+ IFNULL(pm.model, slp.specification_model) AS model,
+ IFNULL(pm.unit, slp.unit) AS unit,
+ slp.quantity AS contractQuantity,
+ slp.tax_inclusive_unit_price AS taxInclusiveUnitPrice,
+ slp.quantity * slp.tax_inclusive_unit_price AS contractAmount,
+ IFNULL(T1.shippedQuantity, 0) AS shippedQuantity,
+ IFNULL(T1.shippedAmount, 0) AS shippedAmount,
+ IFNULL(T2.receivedAmount, 0) AS receivedAmount,
+ IFNULL(T1.shippedAmount, 0) - IFNULL(T2.receivedAmount, 0) AS receivableAmount
+ FROM sales_ledger sl
+ LEFT JOIN sales_ledger_product slp ON sl.id = slp.sales_ledger_id
+ LEFT JOIN product_model pm ON slp.product_id = pm.id
+ LEFT JOIN product p ON pm.product_id = p.id
+ LEFT JOIN (
+ SELECT
+ s.sales_ledger_id,
+ s.sales_ledger_product_id,
+ SUM(sor.stock_out_num) AS shippedQuantity,
+ SUM(sor.stock_out_num * slp2.tax_inclusive_unit_price) AS shippedAmount
+ FROM stock_out_record sor
+ LEFT JOIN shipping_info s ON sor.record_id = s.id
+ LEFT JOIN sales_ledger_product slp2 ON s.sales_ledger_product_id = slp2.id
+ WHERE sor.record_type = '13' AND sor.approval_status = 1
+ GROUP BY s.sales_ledger_id, s.sales_ledger_product_id
+ ) T1 ON T1.sales_ledger_id = sl.id AND T1.sales_ledger_product_id = slp.id
+ LEFT JOIN (
+ SELECT
+ s.sales_ledger_id,
+ s.sales_ledger_product_id,
+ SUM(ascc.collection_amount) AS receivedAmount
+ 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 s.sales_ledger_id, s.sales_ledger_product_id
+ ) T2 ON T2.sales_ledger_id = sl.id AND T2.sales_ledger_product_id = slp.id
+ WHERE sl.customer_id = #{customerId} AND slp.type = 1
+ <if test="salesLedgerId != null">
+ AND sl.id = #{salesLedgerId}
+ </if>
+ ORDER BY sl.id DESC, slp.id DESC
+ </select>
+
+ <!-- 瀹㈡埛寰�鏉ュ彂璐ф槑缁� -->
+ <select id="getCustomerTransactionsShipments" resultType="com.ruoyi.sales.vo.CustomerTransactionsShipmentVo">
+ SELECT
+ sl.id AS salesLedgerId,
+ sl.sales_contract_no AS salesContractNo,
+ s.id AS shippingId,
+ s.shipping_no AS shippingNo,
+ IFNULL(p.product_name, slp.product_category) AS productName,
+ IFNULL(pm.model, slp.specification_model) AS model,
+ sor.stock_out_num AS shippingQuantity,
+ sor.stock_out_num * slp.tax_inclusive_unit_price AS shippingAmount,
+ sor.batch_no AS batchNo,
+ s.shipping_date AS shippingDate,
+ sor.approval_status AS approvalStatus,
+ IFNULL(T1.receivedAmount, 0) AS receivedAmount,
+ sor.stock_out_num * slp.tax_inclusive_unit_price - IFNULL(T1.receivedAmount, 0) AS receivableAmount
+ FROM stock_out_record sor
+ LEFT JOIN shipping_info s ON sor.record_id = s.id
+ LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
+ LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id
+ LEFT JOIN product_model pm ON slp.product_id = pm.id
+ LEFT JOIN product p ON pm.product_id = p.id
+ LEFT JOIN (
+ SELECT
+ sor2.id AS stock_out_record_id,
+ SUM(ascc.collection_amount) AS receivedAmount
+ FROM account_sales_collection ascc
+ LEFT JOIN stock_out_record sor2 ON FIND_IN_SET(sor2.id, ascc.stock_out_record_ids) > 0
+ WHERE ascc.customer_id = #{customerId}
+ GROUP BY sor2.id
+ ) T1 ON T1.stock_out_record_id = sor.id
+ WHERE sor.record_type = '13' AND sl.customer_id = #{customerId}
+ <if test="salesLedgerId != null">
+ AND sl.id = #{salesLedgerId}
+ </if>
+ ORDER BY sor.id DESC
+ </select>
+</mapper>
--
Gitblit v1.9.3