From dddc473c582e983674913163dd4e93f840effbdb Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 26 十月 2026 10:54:55 +0800
Subject: [PATCH] fix(search): 修复多处搜索条件未生效的问题

---
 yudao-module-mes/src/main/resources/mapper/wm/batch/MesWmBatchMapper.xml |   98 ++++++++++++++++++++++++++++++++++++------------
 1 files changed, 73 insertions(+), 25 deletions(-)

diff --git a/yudao-module-mes/src/main/resources/mapper/wm/batch/MesWmBatchMapper.xml b/yudao-module-mes/src/main/resources/mapper/wm/batch/MesWmBatchMapper.xml
index 78ba8f4..bfa05b0 100644
--- a/yudao-module-mes/src/main/resources/mapper/wm/batch/MesWmBatchMapper.xml
+++ b/yudao-module-mes/src/main/resources/mapper/wm/batch/MesWmBatchMapper.xml
@@ -10,37 +10,85 @@
     </resultMap>
 
     <!--
-        鍚戝墠杩芥函锛氫粠鏌愪釜鍘熸潗鏂欐壒娆″嚭鍙戯紝鏌ユ壘瀹冭鍝簺宸ュ崟娑堣�楀悗锛屼骇鍑轰簡鍝簺鎴愬搧鎵规
-        SQL 璺緞锛氬簱瀛樹簨鍔�(娑堣�� OUT) 鈫� 娑堣�楀崟 鈫� 鎶ュ伐璁板綍 鈫� 搴撳瓨浜嬪姟(浜у嚭 IN) 鈫� 鎵规
+        鍚戝墠杩芥函锛氬師鏂欐秷鑰楁槑缁� 鈫� 娑堣�楀崟 鈫� 浜у搧浜у嚭鍗� 鈫� 浜у搧浜у嚭琛屻��
+        鏂版暟鎹紭鍏堟寜 feedback_id 绮剧‘鍏宠仈锛涘巻鍙�/鑷姩鐢熸垚鍗曟嵁缂哄皯 feedback_id 鏃讹紝
+        閫�鍖栦负鍚屼竴 work_order_id 鍏宠仈锛屼繚璇佸凡鏈夌敓浜ф暟鎹篃鑳藉舰鎴愭壒娆¢摼璺��
     -->
     <select id="selectListByForward" parameterType="String" resultMap="BatchTraceResult">
-        SELECT DISTINCT pf.work_order_id, pf.item_id, ppl.batch_id, ppl.batch_code
-        FROM mes_wm_transaction tx_consume
-        LEFT JOIN mes_wm_item_consume ic ON tx_consume.biz_id = ic.id AND tx_consume.biz_type = 123 AND ic.deleted = 0
-        LEFT JOIN mes_pro_feedback pf ON pf.id = ic.feedback_id AND pf.deleted = 0
-        LEFT JOIN mes_wm_transaction tx_produce ON tx_produce.biz_id = pf.id AND tx_produce.biz_type = 124 AND tx_produce.deleted = 0
-        LEFT JOIN mes_wm_product_produce pp ON tx_produce.biz_id = pp.id AND tx_produce.biz_type = 124 AND pp.deleted = 0
-        WHERE tx_consume.batch_code = #{batchCode}
-        AND tx_consume.biz_type = 123
-        AND tx_consume.deleted = 0
-        AND tx_produce.batch_id IS NOT NULL
+        SELECT DISTINCT pp.work_order_id, ppl.item_id, ppl.batch_id, ppl.batch_code
+        FROM mes_wm_item_consume_detail icd
+        JOIN mes_wm_item_consume ic ON ic.id = icd.consume_id AND ic.deleted = 0
+        JOIN mes_wm_product_produce pp ON pp.deleted = 0 AND (
+            (ic.feedback_id IS NOT NULL AND pp.feedback_id = ic.feedback_id)
+            OR ((ic.feedback_id IS NULL OR pp.feedback_id IS NULL)
+                AND pp.work_order_id = ic.work_order_id)
+        )
+        JOIN mes_wm_product_produce_line ppl ON ppl.produce_id = pp.id AND ppl.deleted = 0
+        WHERE icd.batch_code = #{batchCode}
+          AND icd.deleted = 0
+          AND ppl.batch_id IS NOT NULL
     </select>
 
-    <!--
-        鍚戝悗杩芥函锛氫粠鏌愪釜鎴愬搧鎵规鍑哄彂锛屾煡鎵剧敓浜у畠鏃舵秷鑰椾簡鍝簺鍘熸潗鏂欐壒娆�
-        SQL 璺緞锛氬簱瀛樹簨鍔�(浜у嚭 IN) 鈫� 浜у嚭鍗� 鈫� 鎶ュ伐璁板綍 鈫� 搴撳瓨浜嬪姟(娑堣�� OUT) 鈫� 鎵规
-    -->
+    <!-- 鍚戝悗杩芥函锛氫骇鍝佷骇鍑鸿 鈫� 浜у搧浜у嚭鍗� 鈫� 娑堣�楀崟 鈫� 鍘熸枡娑堣�楁槑缁嗐�傚叧鑱旇鍒欏悓鍚戝墠杩芥函銆� -->
     <select id="selectListByBackward" parameterType="String" resultMap="BatchTraceResult">
         SELECT DISTINCT ic.work_order_id, icd.item_id, icd.batch_id, icd.batch_code
-        FROM mes_wm_transaction tx_produce
-        LEFT JOIN mes_wm_product_produce pp ON tx_produce.biz_id = pp.id AND tx_produce.biz_type = 124 AND pp.deleted = 0
-        LEFT JOIN mes_pro_feedback pf ON pf.id = pp.feedback_id AND pf.deleted = 0
-        LEFT JOIN mes_wm_transaction tx_consume ON tx_consume.biz_id = pf.id AND tx_consume.biz_type = 123 AND tx_consume.deleted = 0
-        LEFT JOIN mes_wm_item_consume ic ON tx_consume.biz_id = ic.id AND tx_consume.biz_type = 123 AND ic.deleted = 0
-        WHERE tx_produce.batch_code = #{batchCode}
-        AND tx_produce.biz_type = 124
-        AND tx_produce.deleted = 0
-        AND tx_consume.batch_id IS NOT NULL
+        FROM mes_wm_product_produce_line ppl
+        JOIN mes_wm_product_produce pp ON pp.id = ppl.produce_id AND pp.deleted = 0
+        JOIN mes_wm_item_consume ic ON ic.deleted = 0 AND (
+            (pp.feedback_id IS NOT NULL AND ic.feedback_id = pp.feedback_id)
+            OR ((pp.feedback_id IS NULL OR ic.feedback_id IS NULL)
+                AND ic.work_order_id = pp.work_order_id)
+        )
+        JOIN mes_wm_item_consume_detail icd ON icd.consume_id = ic.id AND icd.deleted = 0
+        WHERE ppl.batch_code = #{batchCode}
+          AND ppl.deleted = 0
+          AND icd.batch_id IS NOT NULL
+    </select>
+
+    <!-- 鎵规閲囪喘鏉ユ簮锛氭壒娆� 鈫� 閲囪喘鍏ュ簱琛� 鈫� 閲囪喘鍏ュ簱鍗� 鈫� IQC -->
+    <select id="selectPurchaseSourceList" parameterType="String"
+            resultType="cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchPurchaseSourceRespVO">
+        SELECT r.code AS receipt_code, r.receipt_date, r.purchase_order_code, r.vendor_id,
+               iqc.code AS iqc_code, iqc.check_result AS check_result,
+               rl.batch_code, rl.item_id, rl.received_quantity
+        FROM mes_wm_item_receipt_line rl
+        JOIN mes_wm_item_receipt r ON r.id = rl.receipt_id AND r.deleted = 0
+        LEFT JOIN mes_qc_iqc iqc ON iqc.id = r.iqc_id AND iqc.deleted = 0
+        WHERE rl.batch_code = #{batchCode} AND rl.deleted = 0
+    </select>
+
+    <!-- 鎵规閿�鍞幓鍚戯細鎵规 鈫� 閿�鍞嚭搴撹 鈫� 閿�鍞嚭搴撳崟 鈫� OQC -->
+    <select id="selectSalesTargetList" parameterType="String"
+            resultType="cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchSalesTargetRespVO">
+        SELECT s.code AS sales_code, s.sales_date, s.sales_order_code, s.client_id,
+               oqc.code AS oqc_code, oqc.check_result AS check_result,
+               sl.batch_code, sl.item_id, sl.quantity, sl.quality_status
+        FROM mes_wm_product_sales_line sl
+        JOIN mes_wm_product_sales s ON s.id = sl.sales_id AND s.deleted = 0
+        LEFT JOIN mes_qc_oqc oqc ON oqc.id = sl.oqc_id AND oqc.deleted = 0
+        WHERE sl.batch_code = #{batchCode} AND sl.deleted = 0
+    </select>
+
+    <!-- 鎵规宸ュ簭娴佽浆锛氫骇鍑�(OUT)/鎶曞叆(IN) 浜嬩欢鑱氬悎锛屾棤闇�寤鸿〃 -->
+    <select id="selectProcessTraceList" parameterType="String"
+            resultType="cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchProcessTraceRespVO">
+        SELECT 'OUT' AS event_type, pp.work_order_id, pp.process_id,
+               ppl.batch_code, ppl.quantity, ppl.quality_status, pp.produce_date AS event_time,
+               wop.sort AS process_sort
+        FROM mes_wm_product_produce_line ppl
+        JOIN mes_wm_product_produce pp ON pp.id = ppl.produce_id AND pp.deleted = 0
+        LEFT JOIN mes_pro_work_order_process wop
+               ON wop.work_order_id = pp.work_order_id AND wop.process_id = pp.process_id AND wop.deleted = 0
+        WHERE ppl.batch_code = #{batchCode} AND ppl.deleted = 0
+        UNION ALL
+        SELECT 'IN' AS event_type, ic.work_order_id, ic.process_id,
+               icd.batch_code, icd.quantity, NULL AS quality_status, ic.consume_date AS event_time,
+               wop.sort AS process_sort
+        FROM mes_wm_item_consume_detail icd
+        JOIN mes_wm_item_consume ic ON ic.id = icd.consume_id AND ic.deleted = 0
+        LEFT JOIN mes_pro_work_order_process wop
+               ON wop.work_order_id = ic.work_order_id AND wop.process_id = ic.process_id AND wop.deleted = 0
+        WHERE icd.batch_code = #{batchCode} AND icd.deleted = 0
     </select>
 
 </mapper>

--
Gitblit v1.9.3