From 514f372270b181f82e4deff98f8d0f38ace63183 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 16 十月 2026 18:03:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_塔河种业' into dev_新疆_塔河种业
---
yudao-module-mes/src/main/resources/mapper/wm/batch/MesWmBatchMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 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 aa5871c..2576322 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
@@ -63,7 +63,7 @@
-->
<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, s.client_name,
+ SELECT s.code AS sales_code, s.sales_date, s.sales_order_code, s.client_id, s.client_name, s.contact_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
@@ -73,7 +73,7 @@
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,
+ SELECT s.code AS sales_code, s.sales_date, s.sales_order_code, s.client_id, s.client_name, s.contact_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
@@ -81,7 +81,7 @@
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,
+ GROUP BY s.id, s.code, s.sales_date, s.sales_order_code, s.client_id, s.client_name, s.contact_name,
oqc.code, oqc.check_result, d.batch_code, d.item_id
ORDER BY sales_date
</select>
@@ -91,7 +91,7 @@
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
+ sales.client_name, sales.contact_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
--
Gitblit v1.9.3