From 504f0284a53afac898a5a8097c997290d38ab8d7 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 15 Apr 2024 18:01:06 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=BA=A7=E5=93=81=E8=BF=BD?=
 =?UTF-8?q?=E6=BA=AF=E6=8A=A5=E8=A1=A8=E6=A0=B7=E5=93=81=E6=9C=BA=E3=80=81?=
 =?UTF-8?q?=E9=99=8D=E7=BA=A7=E5=93=81=E7=AD=9B=E9=80=89=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/report/GeneralReportMapper.xml        | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
index 22791d4..835d3fe 100644
--- a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
@@ -334,6 +334,10 @@
         FROM C##AUCMA_SCADA.PRODUCT_OFFLINE PO
         LEFT JOIN BASE_ORDERINFO BO ON BO.ORDER_CODE = SUBSTR(PO.PRODUCT_ORDER_NO, -8)
         LEFT JOIN BASE_PRODUCTLINE PL ON PL.WORK_CENTER_CODE = BO.WORK_CENTER_CODE
+        LEFT JOIN (SELECT BAR_CODE
+        FROM REPORT_QUALITY_INSPECTION
+        WHERE PROCESS_RESULT = 'KA'
+        GROUP BY BAR_CODE) KA ON KA.BAR_CODE = PO.BOX_CODE
         <where>
             <if test="PRODUCT_LINE_CODE != null and PRODUCT_LINE_CODE != ''">and PO.PRODUCT_LINE_CODE =
                 #{PRODUCT_LINE_CODE}
@@ -350,6 +354,18 @@
             <if test="beginBeginTime != null  and beginBeginTime != '' and endBeginTime != null  and endBeginTime != ''">
                 AND TO_CHAR(PO.PRODUCT_SCANTIME, 'YYYY-MM-DD HH24:MI:SS') BETWEEN #{beginBeginTime} AND #{endBeginTime}
             </if>
+            <if test="isSample != null and isSample == 1 ">
+                AND SUBSTR(PO.PRODUCT_SNCODE, -4, 1) = 'A'
+            </if>
+            <if test="isSample != null and isSample == 2 ">
+                AND SUBSTR(PO.PRODUCT_SNCODE, -4, 1) != 'A'
+            </if>
+            <if test="isDowngrade != null and isDowngrade == 1 ">
+                AND KA.BAR_CODE IS NOT NULL
+            </if>
+            <if test="isDowngrade != null and isDowngrade == 2 ">
+                AND KA.BAR_CODE IS NULL
+            </if>
         </where>
     </select>