From 8f3bf7050e65fdbe55eaad74fde307c57dab960e Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 24 七月 2026 17:25:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mes/src/main/resources/mapper/wm/batch/MesWmBatchMapper.xml | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 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 4d71f7f..22fba71 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
@@ -11,32 +11,35 @@
<!--
鍚戝墠杩芥函锛氫粠鏌愪釜鍘熸潗鏂欐壒娆″嚭鍙戯紝鏌ユ壘瀹冭鍝簺宸ュ崟娑堣�楀悗锛屼骇鍑轰簡鍝簺鎴愬搧鎵规
- SQL 璺緞锛氭秷鑰楁槑缁�(icd) 鈫� 娑堣�楀崟(ic) 鈫� 鎶ュ伐璁板綍(pf) 鈫� 鐢熶骇鍏ュ簱鍗�(pp) 鈫� 鍏ュ簱琛�(ppl)
+ SQL 璺緞锛氬簱瀛樹簨鍔�(娑堣�� OUT) 鈫� 娑堣�楀崟 鈫� 鎶ュ伐璁板綍 鈫� 搴撳瓨浜嬪姟(浜у嚭 IN) 鈫� 鎵规
-->
<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_item_consume_detail icd
- LEFT JOIN mes_wm_item_consume ic ON icd.consume_id = ic.id AND ic.deleted = 0
+ SELECT DISTINCT pf.work_order_id, pf.item_id, tx_produce.batch_id, tx_produce.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_product_produce pp ON pp.work_order_id = ic.work_order_id AND pp.deleted = 0
- LEFT JOIN mes_wm_product_produce_line ppl ON pp.id = ppl.produce_id AND ppl.deleted = 0
- WHERE icd.batch_code = #{batchCode}
- AND icd.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
+ 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>
<!--
鍚戝悗杩芥函锛氫粠鏌愪釜鎴愬搧鎵规鍑哄彂锛屾煡鎵剧敓浜у畠鏃舵秷鑰椾簡鍝簺鍘熸潗鏂欐壒娆�
- SQL 璺緞锛氬叆搴撴槑缁�(ppd) 鈫� 鍏ュ簱鍗�(pp) 鈫� 娑堣�楀崟(ic) 鈫� 娑堣�楁槑缁�(icd)
+ 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_product_produce_detail ppd
- LEFT JOIN mes_wm_product_produce pp ON ppd.produce_id = pp.id AND pp.deleted = 0
- LEFT JOIN mes_wm_item_consume ic ON pp.work_order_id = ic.work_order_id AND ic.deleted = 0
- LEFT JOIN mes_wm_item_consume_detail icd ON ic.id = icd.consume_id AND icd.deleted = 0
- WHERE ppd.batch_code = #{batchCode}
- AND ppd.deleted = 0
- AND icd.batch_code IS NOT NULL
+ SELECT DISTINCT ic.work_order_id, tx_consume.item_id, tx_consume.batch_id, tx_consume.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 ic.id = tx_consume.biz_id 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
</select>
</mapper>
--
Gitblit v1.9.3