From a46a65c769f676f9367f855812f19b02c2ddb67c Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Sun, 5 Sep 2021 18:50:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=BC=82=E5=B8=B8=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E4=BA=8B=E9=A1=B9=E6=96=B0=E5=A2=9E=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
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   |  5 +++++
 2 files changed, 15 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 0bea61db..5800918b 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
@@ -48,6 +48,16 @@ public class AbnormalBillDto extends AbnormalBill {
 
     private String productionCategory;
 
+    private String checkUsr;
+
+    public String getCheckUsr() {
+        return checkUsr;
+    }
+
+    public void setCheckUsr(String checkUsr) {
+        this.checkUsr = checkUsr;
+    }
+
     public String getSeq() {
         return seq;
     }
diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
index 07b8a1a3..cfbce631 100644
--- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
+++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
@@ -957,11 +957,16 @@
         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}
+        LEFT JOIN RESRCE R ON R.RESRCE = ZAB.RESRCE AND R.SITE = ZAB.SITE
+        LEFT JOIN CUSTOM_FIELDS CFA ON CFA.HANDLE = R.HANDLE AND CFA."ATTRIBUTE" = 'CHECK_USR'
         <where>
             <if test="abnormalBill != null">
                 <if test="abnormalBill.site != null and abnormalBill.site != ''">
                     zab.SITE = #{abnormalBill.site}
                 </if>
+                <if test="abnormalBill.checkUsr != null and abnormalBill.checkUsr != ''">
+                    AND CFA.VALUE = #{abnormalBill.checkUsr}
+                </if>
                 <if test="abnormalBill.resrce != null and abnormalBill.resrce != ''">
                     AND zab.RESRCE = #{abnormalBill.resrce}
                 </if>