From 3ce57820e618b704ce61487b7cdb38fdd6b0f44a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 22 九月 2026 14:06:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_银川_九鸿化工' into dev_银川_九鸿化工
---
yudao-module-mes/src/main/resources/mapper/qc/pendinginspect/MesQcPendingInspectMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 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 ab88c74..7928816 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
@@ -22,6 +22,7 @@
n.arrival_date AS recordTime,
${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@IQC.type} AS qcType,
l.item_id AS itemId,
+ NULL AS batchCode,
l.arrival_quantity AS quantity,
n.vendor_id AS vendorId,
NULL AS workOrderId,
@@ -47,6 +48,7 @@
r.receipt_date AS recordTime,
${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@IQC.type} AS qcType,
rl.item_id AS itemId,
+ NULL AS batchCode,
rl.quantity AS quantity,
r.vendor_id AS vendorId,
NULL AS workOrderId,
@@ -72,6 +74,7 @@
pf.feedback_time AS recordTime,
${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@IPQC.type} AS qcType,
ppl.item_id AS itemId,
+ ppl.batch_code AS batchCode,
ppl.quantity AS quantity,
NULL AS vendorId,
pf.work_order_id AS workOrderId,
@@ -97,6 +100,7 @@
s.sales_date AS recordTime,
${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@OQC.type} AS qcType,
sl.item_id AS itemId,
+ NULL AS batchCode,
sl.quantity AS quantity,
NULL AS vendorId,
NULL AS workOrderId,
@@ -122,6 +126,7 @@
ri.return_date AS recordTime,
${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@RQC.type} AS qcType,
ril.item_id AS itemId,
+ NULL AS batchCode,
ril.quantity AS quantity,
NULL AS vendorId,
ri.work_order_id AS workOrderId,
@@ -148,6 +153,7 @@
r.return_date AS recordTime,
${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@RQC.type} AS qcType,
rl.item_id AS itemId,
+ NULL AS batchCode,
rl.quantity AS quantity,
NULL AS vendorId,
NULL AS workOrderId,
--
Gitblit v1.9.3