From 0fdd0bf60b7d98d21c9b5ff95bb55f0fa6495007 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 14 八月 2026 14:20:03 +0800
Subject: [PATCH] Merge branch 'dev_business' of http://114.132.189.42:9002/r/mom-pro2-after into dev_business
---
yudao-module-mes/src/main/resources/mapper/qc/pendinginspect/MesQcPendingInspectMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/yudao-module-mes/src/main/resources/mapper/qc/pendinginspect/MesQcPendingInspectMapper.xml b/yudao-module-mes/src/main/resources/mapper/qc/pendinginspect/MesQcPendingInspectMapper.xml
index ce2de7c..ab88c74 100644
--- a/yudao-module-mes/src/main/resources/mapper/qc/pendinginspect/MesQcPendingInspectMapper.xml
+++ b/yudao-module-mes/src/main/resources/mapper/qc/pendinginspect/MesQcPendingInspectMapper.xml
@@ -74,9 +74,9 @@
ppl.item_id AS itemId,
ppl.quantity AS quantity,
NULL AS vendorId,
- pp.work_order_id AS workOrderId,
- pp.workstation_id AS workstationId,
- pp.task_id AS taskId,
+ pf.work_order_id AS workOrderId,
+ pf.workstation_id AS workstationId,
+ pf.task_id AS taskId,
NULL AS clientId
FROM mes_wm_product_produce_line ppl
JOIN mes_wm_product_produce pp ON ppl.produce_id = pp.id
@@ -126,7 +126,7 @@
NULL AS vendorId,
ri.work_order_id AS workOrderId,
ri.workstation_id AS workstationId,
- NULL AS taskId,
+ ri.task_id AS taskId,
NULL AS clientId
FROM mes_wm_return_issue ri
JOIN mes_wm_return_issue_line ril ON ri.id = ril.issue_id
--
Gitblit v1.9.3