From dab3247888114bed8854e0005bde90f5283a1e21 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 2 Aug 2024 10:08:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E6=A3=80=E9=AA=8C=E5=90=AF?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op-mes/src/main/resources/mapper/mes/MesMapper.xml       | 5 ++++-
 .../main/resources/mapper/quality/QcStaticTableMapper.xml    | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml
index 9caac7210..2e3e2d823 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml
@@ -337,9 +337,12 @@
             pow.unit
         from pro_order_workorder pow
         left join base_equipment be on pow.workorder_name = be.equipment_code and be.equipment_type_code = 'equ_type_bzx'
-        where pow.workorder_name = #{equCode} and pow.status = 'w2'
+        where pow.workorder_name = #{equCode} <!--and pow.status = 'w2'-->
           and CONVERT ( DATE, pow.product_date ) = CONVERT ( DATE, GETDATE( ) )
           and pow.parent_order = '0' and pow.del_flag='0'
+        <if test="workorderCodeSap != null  and workorderCodeSap != ''">
+            and pow.workorder_code_sap = #{workorderCodeSap}
+        </if>
     </select>
     <select id="getTaskInfo" resultType="com.op.system.api.domain.quality.QcCheckTaskDTO">
         select count(0) quality,
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml
index bceeaf5cb..7757c56be 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml
@@ -239,8 +239,8 @@
         select qct.supplier_code supplierCode,
         qct.supplier_name supplierName,
         <if test="orderNo != null ">qct.order_no orderNo, qct.unit,</if>
-        <if test="incomeBatchNo != null ">qct.income_batch_no,</if>
-        <if test="materialCode != null ">qct.material_code,qct.material_name,</if>
+        <if test="incomeBatchNo != null ">qct.income_batch_no incomeBatchNo,</if>
+        <if test="materialCode != null ">qct.material_code materialCode,qct.material_name materialName,</if>
         sum(quality) quality,
         sum(qct.sample_quality) sampleQuality,
         sum(qct.noOk_quality) noOkNums