From c89f7dcf9344a35efde2a00edb10491b401ba000 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 16 九月 2026 09:19:00 +0800
Subject: [PATCH] feat(trace): 添加种子流向信息展示功能
---
yudao-module-mes/src/main/resources/mapper/wm/batch/MesWmBatchMapper.xml | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 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 0eda416..aa5871c 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
@@ -55,16 +55,50 @@
WHERE rl.batch_code = #{batchCode} AND rl.deleted = 0
</select>
- <!-- 鎵规閿�鍞幓鍚戯細鎵规 鈫� 閿�鍞嚭搴撹 鈫� 閿�鍞嚭搴撳崟 鈫� OQC -->
+ <!--
+ 鎵规閿�鍞幓鍚戯紙绉嶅瓙娴佸悜锛夛細
+ 鈶� 琛岀骇鍖归厤锛氭壒娆� 鈫� 閿�鍞嚭搴撹 鈫� 閿�鍞嚭搴撳崟 鈫� OQC锛堣涓婄洿鎺ヨ褰曟壒娆＄殑娴佺▼锛夛紱
+ 鈶� 鏄庣粏绾у尮閰嶏細鎵规 鈫� 鎵爜鍑哄簱鏄庣粏 鈫� 閿�鍞嚭搴撳崟 鈫� OQC锛堢瀛愯鐮�/鎵樼洏鎵爜鍑哄簱鏃舵壒娆″彧鍐欏叆鏄庣粏琛紝鎸夊崟鎹仛鍚堟暟閲忥級銆�
+ 鍚屼竴鍑哄簱琛岃嫢宸叉湁鏄庣粏绾у尮閰嶅垯涓嶅啀閲嶅鍑鸿绾ц褰曪紱鎺掗櫎宸插彇娑堬紙鐘舵�� 5锛夊崟鎹��
+ -->
<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,
+ SELECT s.code AS sales_code, s.sales_date, s.sales_order_code, s.client_id, s.client_name,
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
+ WHERE sl.batch_code = #{batchCode} AND sl.deleted = 0 AND s.status != 5
+ AND NOT EXISTS (SELECT 1 FROM mes_wm_product_sales_detail d
+ WHERE d.line_id = sl.id AND d.batch_code = #{batchCode} AND d.deleted = 0)
+ UNION ALL
+ SELECT s.code AS sales_code, s.sales_date, s.sales_order_code, s.client_id, s.client_name,
+ oqc.code AS oqc_code, oqc.check_result AS check_result,
+ d.batch_code, d.item_id, SUM(d.quantity) AS quantity, MAX(sl.quality_status) AS quality_status
+ FROM mes_wm_product_sales_detail d
+ JOIN mes_wm_product_sales s ON s.id = d.sales_id AND s.deleted = 0
+ JOIN mes_wm_product_sales_line sl ON sl.id = d.line_id AND sl.deleted = 0
+ LEFT JOIN mes_qc_oqc oqc ON oqc.id = sl.oqc_id AND oqc.deleted = 0
+ WHERE d.batch_code = #{batchCode} AND d.deleted = 0 AND s.status != 5
+ GROUP BY s.id, s.code, s.sales_date, s.sales_order_code, s.client_id, s.client_name,
+ oqc.code, oqc.check_result, d.batch_code, d.item_id
+ ORDER BY sales_date
+ </select>
+
+ <!-- 鎵规鍑哄叆搴撴祦姘达紙绉嶅瓙娴佸悜锛夛細搴撳瓨浜嬪姟 鈫� 浠撳簱/搴撳尯/搴撲綅 鈫� 閿�鍞嚭搴撳崟锛坆iz_type 119 甯﹀嚭瀹㈡埛鍚嶇О锛� -->
+ <select id="selectBatchFlowList" parameterType="String"
+ resultType="cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchFlowRespVO">
+ SELECT tx.type, tx.biz_type, tx.biz_code, tx.quantity, tx.transaction_time,
+ w.name AS warehouse_name, loc.name AS location_name, area.name AS area_name,
+ sales.client_name
+ FROM mes_wm_transaction tx
+ LEFT JOIN mes_wm_warehouse w ON w.id = tx.warehouse_id AND w.deleted = 0
+ LEFT JOIN mes_wm_warehouse_location loc ON loc.id = tx.location_id AND loc.deleted = 0
+ LEFT JOIN mes_wm_warehouse_area area ON area.id = tx.area_id AND area.deleted = 0
+ LEFT JOIN mes_wm_product_sales sales ON tx.biz_type = 119 AND sales.id = tx.biz_id AND sales.deleted = 0
+ WHERE tx.batch_code = #{batchCode} AND tx.deleted = 0
+ ORDER BY tx.transaction_time
</select>
<!-- 鎵规宸ュ簭娴佽浆锛氫骇鍑�(OUT)/鎶曞叆(IN) 浜嬩欢鑱氬悎锛屾棤闇�寤鸿〃 -->
--
Gitblit v1.9.3