From c54f243c9a13ce53e7dc3f7823f585466eab0bd1 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 01 十二月 2025 09:53:28 +0800
Subject: [PATCH] yys 替换ip
---
src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml | 33 +++++++++++----------------------
1 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml b/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
index 8a2bb9e..a2aaa11 100644
--- a/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
@@ -21,7 +21,7 @@
LEFT join sales_ledger_scheduling t3 on T2.id = t3.sales_ledger_product_id
LEFT JOIN sales_ledger T1 ON T1.id = T2.sales_ledger_id
<where>
- T1.id is not null
+ T1.id is not null and T2.type = 1
<if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
</if>
@@ -60,46 +60,35 @@
sales_ledger_product T2
LEFT JOIN sales_ledger T1 ON T1.id = T2.sales_ledger_id
LEFT join sales_ledger_scheduling t3 on T1.id = t3.sales_ledger_id
- where T1.id is not null
+ where T1.id is not null and T2.type = 1
GROUP BY T2.id
</select>
<select id="listPageProcess" resultType="com.ruoyi.production.dto.SalesLedgerSchedulingProcessDto">
SELECT
t3.id as salesLedgerProductId,
- T1.id as salesLedgerId,
T2.id,
T2.status,
T2.scheduling_user_id,
T2.scheduling_user_name,
T2.scheduling_date,
ifNull(T2.scheduling_num,0) AS schedulingNum,
- T1.sales_contract_no,
- T1.customer_contract_no,
- T1.project_name,
- T1.customer_name,
+ ifNull(T2.finished_num,0) AS successNum,
t3.product_category,
t3.specification_model,
- t3.unit
+ t3.unit,
+ t3.order_no
FROM
sales_ledger_scheduling T2
- LEFT JOIN sales_ledger T1 ON T1.id = T2.sales_ledger_id
- left join sales_ledger_product t3 on T2.sales_ledger_product_id = t3.id
+ LEFT JOIN production_order t3 on t3.id = T2.sales_ledger_product_id
<where>
- 1 = 1
<if test="salesLedgerDto.status != null and salesLedgerDto.status != '' ">
AND T2.status = #{salesLedgerDto.status}
</if>
- <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
- AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
+ <if test="salesLedgerDto.orderNo != null and salesLedgerDto.orderNo != '' ">
+ AND T1.order_no LIKE CONCAT('%',#{salesLedgerDto.orderNo},'%')
</if>
- <if test="salesLedgerDto.customerContractNo != null and salesLedgerDto.customerContractNo !='' ">
- AND T1.customer_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
- </if>
- <if test="salesLedgerDto.salesContractNo != null and salesLedgerDto.salesContractNo != '' ">
- AND T1.sales_contract_no LIKE CONCAT('%',#{salesLedgerDto.salesContractNo},'%')
- </if>
- <if test="salesLedgerDto.projectName != null and salesLedgerDto.projectName != '' ">
- AND T1.project_name LIKE CONCAT('%',#{salesLedgerDto.projectName},'%')
+ <if test="salesLedgerDto.productCategory != null and salesLedgerDto.productCategory !='' ">
+ AND t3.productCategory LIKE CONCAT('%',#{salesLedgerDto.productCategory},'%')
</if>
<if test="salesLedgerDto.entryDateStart != null and salesLedgerDto.entryDateStart != '' ">
AND T2.scheduling_date >= DATE_FORMAT(#{salesLedgerDto.entryDateStart},'%Y-%m-%d')
@@ -108,6 +97,6 @@
AND T2.scheduling_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
</if>
</where>
- order by T2.update_time desc
+ order by T2.status asc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3