From 9d66bfbfcda297f628e6a857e343f98422f4534a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 09:32:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev_New_pro' into dev_New_pro_OA
---
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 85 +-----------------------------------------
1 files changed, 3 insertions(+), 82 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index f3fa32d..7eb7b79 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -9,7 +9,6 @@
T1.id,
T1.sales_ledger_id,
T1.warn_num,
- T1.speculative_trading_name,
T1.quantity,
T1.min_stock,
T1.tax_rate,
@@ -18,23 +17,11 @@
T1.tax_exclusive_total_price,
T1.invoice_type,
T1.type,
- T1.tickets_num,
- T1.tickets_amount,
- T1.future_tickets,
- T1.future_tickets_amount,
- T1.invoice_num,
- T1.no_invoice_num,
- T1.invoice_amount,
- T1.no_invoice_amount,
T1.product_id,
T1.product_model_id,
T1.register,
T1.register_date,
T1.approve_status,
- T1.pending_invoice_total,
- T1.invoice_total,
- T1.pending_tickets_total,
- T1.tickets_total,
T1.is_checked,
T1.is_production,
T1.create_user,
@@ -48,7 +35,8 @@
END as has_sufficient_stock,
(IFNULL(T1.quantity, 0) - IFNULL(t3.shipped_quantity, 0)) as no_quantity,
CASE
- WHEN (IFNULL(T1.quantity, 0) - IFNULL(t3.shipped_quantity, 0)) > 0 THEN '寰呭彂璐�'
+ WHEN IFNULL(t3.shipped_quantity, 0) = 0 THEN '寰呭彂璐�'
+ WHEN (IFNULL(T1.quantity, 0) - IFNULL(t3.shipped_quantity, 0)) > 0 THEN '閮ㄥ垎鍙戣揣'
ELSE '宸插彂璐�'
END as shippingStatus
FROM
@@ -62,6 +50,7 @@
SELECT sales_ledger_product_id, IFNULL(SUM(spd.quantity), 0) as shipped_quantity
FROM shipping_info si
LEFT JOIN shipping_product_detail spd ON si.id = spd.shipping_info_id
+ where si.status != '瀹℃牳鎷掔粷'
GROUP BY sales_ledger_product_id
) t3 ON t3.sales_ledger_product_id = T1.id
left join product_model pm ON T1.product_model_id = pm.id
@@ -92,74 +81,6 @@
and slp.id is not null
order by slp.id desc
limit 1
-
-
- </select>
- <select id="listPage" resultType="com.ruoyi.sales.dto.SalesLedgerProductDto">
- select slp.*,
- sl.project_name,
- sl.customer_name,
- sl.sales_contract_no,
- sl.customer_contract_no
- from sales_ledger_product slp
- left join sales_ledger sl on slp.sales_ledger_id = sl.id
- <where>
- slp.type = 1
- <if test="req.salesContractNo != null and req.salesContractNo != '' ">
- AND sl.sales_contract_no like concat('%',#{req.salesContractNo},'%')
- </if>
- <if test="req.customerContractNo != null and req.customerContractNo != '' ">
- AND sl.customer_contract_no like concat('%',#{req.customerContractNo},'%')
- </if>
- <if test="req.projectName != null and req.projectName != '' ">
- AND sl.project_name like concat('%',#{req.projectName},'%')
- </if>
- <if test="req.customerName != null and req.customerName != '' ">
- AND sl.customer_name like concat('%',#{req.customerName},'%')
- </if>
- <if test="req.productCategory != null and req.productCategory != '' ">
- AND slp.product_category like concat('%',#{req.productCategory},'%')
- </if>
- <if test="req.status != null and req.status ">
- AND slp.pending_invoice_total > 0
- </if>
- </where>
- order by slp.register_date desc
- </select>
- <select id="listPagePurchaseLedger" resultType="com.ruoyi.sales.dto.SalesLedgerProductDto">
- select slp.*,
- sl.project_name,
- sl.supplier_name,
- sl.supplier_id,
- sl.sales_contract_no,
- sl.purchase_contract_number
- from sales_ledger_product slp
- left join purchase_ledger sl on slp.sales_ledger_id = sl.id
- <where>
- slp.type = 2
- <if test="req.purchaseContractNumber != null and req.purchaseContractNumber != '' ">
- AND sl.purchase_contract_number like concat('%',#{req.purchaseContractNumber},'%')
- </if>
- <if test="req.approvalStatus != null and req.approvalStatus != ''">
- and sl.approval_status = #{req.approvalStatus}
- </if>
- <if test="req.customerContractNo != null and req.customerContractNo != '' ">
- AND sl.customer_contract_no like concat('%',#{req.customerContractNo},'%')
- </if>
- <if test="req.projectName != null and req.projectName != '' ">
- AND sl.project_name like concat('%',#{req.projectName},'%')
- </if>
- <if test="req.customerName != null and req.customerName != '' ">
- AND sl.customer_name like concat('%',#{req.customerName},'%')
- </if>
- <if test="req.productCategory != null and req.productCategory != '' ">
- AND slp.product_category like concat('%',#{req.productCategory},'%')
- </if>
- <if test="req.status != null and req.status ">
- AND slp.pending_tickets_total > 0
- </if>
- </where>
- order by slp.register_date desc
</select>
<select id="procurementBusinessSummaryListPage"
resultType="com.ruoyi.purchase.dto.ProcurementBusinessSummaryDto">
--
Gitblit v1.9.3