From ca7ad15cff9fc942a40aa289db325ad616c73cd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Tue, 17 Aug 2021 10:35:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=BE=85=E5=8A=9E=E4=BA=8B?=
 =?UTF-8?q?=E9=A1=B9=E5=B7=A5=E4=BD=9C=E4=BB=A4=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java | 10 ++++++++++
 .../src/main/resources/mapper/AbnormalBillMapper.xml   | 10 ++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java
index 27df7b40..3d214d2b 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java
@@ -44,6 +44,8 @@ public class AbnormalBillDto extends AbnormalBill {
 
     private String ncCodeDescription;
 
+    private String workOrder;
+
     public String getSeq() {
         return seq;
     }
@@ -133,4 +135,12 @@ public class AbnormalBillDto extends AbnormalBill {
     public void setNcCodeDescription(String ncCodeDescription) {
         this.ncCodeDescription = ncCodeDescription;
     }
+
+    public String getWorkOrder() {
+        return workOrder;
+    }
+
+    public void setWorkOrder(String workOrder) {
+        this.workOrder = workOrder;
+    }
 }
diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
index 7e24585f..57d9454a 100644
--- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
+++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
@@ -915,12 +915,15 @@
         SELECT ROW_NUMBER() OVER(ORDER BY ZAB.ABNORMAL_NO ASC) SEQ,ZAB.ABNORMAL_NO ABNORMAL_NO,
         ZAB.STATUS STATUS, IT.DESCRIPTION ITEM_DESCRIPTION, ZAB.CREATED_DATE_TIME CREATED_DATE_TIME,
         ZAB.RESPONSE_DATE_TIME RESPONSE_DATE_TIME,
-        ZAB.CREATED_USER CREATED_USER,
+        ZNU.FULL_NAME CREATED_USER,
         ZAB.NC_CODE NC_CODE,ZAB.PB_DESCRIPTION PB_DESCRIPTION,
         SUBSTR(LISTAGG(NCT.DESCRIPTION || ',') WITHIN GROUP(ORDER BY ZAB.ABNORMAL_NO),0,LENGTH(LISTAGG(NCT.DESCRIPTION || ',') WITHIN GROUP(ORDER BY ZAB.ABNORMAL_NO))-1) NC_CODE_DESCRIPTION
         FROM Z_ABNORMAL_BILL ZAB
         LEFT JOIN ITEM I ON ZAB.ITEM_BO = I.HANDLE
         LEFT JOIN ITEM_T IT ON I.HANDLE = IT.ITEM_BO AND IT.LOCALE = #{language}
+        LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = ZAB.CREATED_USER AND ZNU.SITE = ZAB.SITE
+        LEFT JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZAB.SHOP_ORDER AND SO.SITE = ZAB.SITE
+        LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = SO.HANDLE AND CF."ATTRIBUTE" = 'WORK_ORDER'
         LEFT JOIN Z_ABNORMAL_NC_CODE ZANC ON ZANC.ABNORMAL_BILL_BO = ZAB.HANDLE
         LEFT JOIN NC_CODE_T NCT ON NCT.NC_CODE_BO = 'NCCodeBO:'|| ZAB.SITE || ',' || ZANC.NC_CODE  AND NCT.LOCALE = #{language}
         <where>
@@ -955,10 +958,13 @@
                 <if test="abnormalBill.reportFrom != null and abnormalBill.reportFrom != ''">
                     AND zab.REPORT_FROM = #{abnormalBill.reportFrom}
                 </if>
+                <if test="abnormalBill.workOrder != null and abnormalBill.workOrder != ''">
+                    AND CF.VALUE = #{abnormalBill.workOrder}
+                </if>
             </if>
         </where>
         GROUP BY zab.ABNORMAL_NO,zab.STATUS,it.DESCRIPTION,zab.CREATED_DATE_TIME,zab.RESPONSE_DATE_TIME,
-        zab.CREATED_USER,zab.NC_CODE,zab.PB_DESCRIPTION
+        ZNU.FULL_NAME,zab.NC_CODE,zab.PB_DESCRIPTION
     </select>
 
     <select id="findAllByAbnormalNoDevice" resultMap="abnormalBillDto">