From d48438f18fa27dae8daad509708cba9fcb1d0552 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Fri, 27 Aug 2021 11:18:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=BA=8B=E9=A1=B9?=
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   |  4 ++++
 2 files changed, 14 insertions(+)

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 3d214d2b..0bea61db 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
@@ -46,6 +46,8 @@ public class AbnormalBillDto extends AbnormalBill {
 
     private String workOrder;
 
+    private String productionCategory;
+
     public String getSeq() {
         return seq;
     }
@@ -143,4 +145,12 @@ public class AbnormalBillDto extends AbnormalBill {
     public void setWorkOrder(String workOrder) {
         this.workOrder = workOrder;
     }
+
+    public String getProductionCategory() {
+        return productionCategory;
+    }
+
+    public void setProductionCategory(String productionCategory) {
+        this.productionCategory = productionCategory;
+    }
 }
diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
index 2780c57c..7d304651 100644
--- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
+++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
@@ -925,6 +925,7 @@
         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 CUSTOM_FIELDS CF2 ON CF2.HANDLE = SO.HANDLE AND CF2."ATTRIBUTE" = 'PRODUCT_CATEGORY'
         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>
@@ -962,6 +963,9 @@
                 <if test="abnormalBill.workOrder != null and abnormalBill.workOrder != ''">
                     AND CF.VALUE LIKE '%${abnormalBill.workOrder}%'
                 </if>
+                <if test="abnormalBill.productionCategory != null and abnormalBill.productionCategory != ''">
+                    AND CF2.VALUE LIKE '%${abnormalBill.productionCategory}'
+                </if>
                 <choose>
                     <when test="userGroupList != null and userGroupList.size != 0">
                          AND ZAB.REPORT_SEND_USER_GROUP IN