From 02c00895bff1c36dc33529b6fe8d8ccef2f3e003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Thu, 5 Aug 2021 13:46:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7-=E5=BC=82=E5=B8=B8=20?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=92=8C=E5=85=B6=E4=BB=96=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AbnormalBillServiceImpl.java |  3 +-
 .../resources/mapper/AbnormalBillMapper.xml   | 42 +++++++++++--------
 .../mesnac/common/service/AnomalyService.java |  2 +-
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
index 519f7e26..f6537990 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
@@ -758,7 +758,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
     @Override
     public void createAnomalyTask(String category, String resource, String shopOrder,
                                   String sfc, String ncCodes,String position,String ncQty,
-                                  String ncDescription,String userGroup,String remark) {
+                                  String ncDescription,String userGroup) {
         String site = CommonMethods.getSite();
         LocalDateTime now = LocalDateTime.now();
         String user = CommonMethods.getUser();
@@ -781,7 +781,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         abnormalBill.setStatus(Constants.NEW);
         abnormalBill.setSfc(sfc);
         abnormalBill.setShopOrder(shopOrder);
-        abnormalBill.setPbDescription(remark);
         //根据工单找itemBo，并放到异常单里面
         if(shopOrder != null ){
             ShopOrder shopOrder1 = shopOrderMapper.selectById(HandleEnum.SHOP_ORDER.getHandle(site, shopOrder));
diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
index 82ebfd49..5615b27c 100644
--- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
+++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
@@ -67,6 +67,7 @@
         <result column="ITEM" property="item"/>
         <result column="ROUTER" property="router"/>
         <result column="BOM" property="bom"/>
+        <result column="REASON" property="reason"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -976,25 +977,30 @@
 
     <select id="findScrapDtoBySfc" resultMap="scrapDto">
         SELECT   S.SFC SFC, CASE WHEN S2.STATUS = '401' THEN '新建'
-                                 WHEN S2.STATUS = '402' THEN '排队'
-                                 WHEN S2.STATUS = '403' THEN '活动'
-                                 WHEN S2.STATUS = '407' THEN '报废'
-                                 END STATUS,
-                 SUBSTR(SS.OPERATION_BO ,INSTR(SS.OPERATION_BO ,',',1)+1,(INSTR(SS.OPERATION_BO ,'#',1)-1)-(INSTR(SS.OPERATION_BO ,',',1)+1)) || '/' || SS.STEP_ID OPERATION,
-                 ZSD.RESRCE RESRCE,ZSD.SHOP_ORDER SHOP_ORDER,
-                 CASE WHEN I.ITEM != 'NULL'  THEN I.ITEM || '/' || I.REVISION END ITEM,
-                 CASE WHEN R.ROUTER != 'NULL'  THEN R.ROUTER || '/' || R.REVISION END ROUTER ,
-                 CASE WHEN B.BOM != 'NULL'  THEN B.BOM || '/' || B.REVISION END BOM
+        WHEN S2.STATUS = '402' THEN '排队'
+        WHEN S2.STATUS = '403' THEN '活动'
+        WHEN S2.STATUS = '407' THEN '报废'
+        END STATUS,
+        SUBSTR(SS.OPERATION_BO ,INSTR(SS.OPERATION_BO ,',',1)+1,(INSTR(SS.OPERATION_BO ,'#',1)-1)-(INSTR(SS.OPERATION_BO ,',',1)+1)) || '/' || SS.STEP_ID OPERATION,
+        ZSD.RESRCE RESRCE,ZSD.SHOP_ORDER SHOP_ORDER,
+        CASE WHEN I.ITEM != 'NULL'  THEN I.ITEM || '/' || I.REVISION END ITEM,
+        CASE WHEN R.ROUTER != 'NULL'  THEN R.ROUTER || '/' || R.REVISION END ROUTER ,
+        CASE WHEN B.BOM != 'NULL'  THEN B.BOM || '/' || B.REVISION END BOM,
+        CASE WHEN ZSS.HANDLE != 'NULL' THEN ZSS.REASON
+             ELSE ZABV.PB_DESCRIPTION
+             END REASON
         FROM SFC S
-                 INNER JOIN SFC_ROUTING SR ON SR.SFC_BO  = S.HANDLE
-                 INNER JOIN SFC_ROUTER ST ON ST.SFC_ROUTING_BO  = SR.HANDLE
-                 INNER JOIN SFC_STEP SS ON SS.SFC_ROUTER_BO = ST.HANDLE AND (SS.QTY_IN_QUEUE > 0 OR SS.QTY_IN_WORK > 0)
-                 INNER JOIN STATUS S2 ON S2.HANDLE = S.STATUS_BO
-                 INNER  JOIN Z_SFC_DISPATCH ZSD ON ZSD.DISPATCH_NO = S.SFC || '-' || SS.STEP_ID
-                 LEFT JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZSD.SHOP_ORDER AND SO.SITE = S.SITE
-                 LEFT JOIN ITEM I ON I.HANDLE = SO.PLANNED_ITEM_BO
-                 LEFT JOIN ROUTER R ON R.HANDLE  = ZSD.ROUTER_BO
-                 LEFT JOIN BOM B ON B.HANDLE = SO.PLANNED_BOM_BO
+        INNER JOIN SFC_ROUTING SR ON SR.SFC_BO  = S.HANDLE
+        INNER JOIN SFC_ROUTER ST ON ST.SFC_ROUTING_BO  = SR.HANDLE
+        INNER JOIN SFC_STEP SS ON SS.SFC_ROUTER_BO = ST.HANDLE AND (SS.QTY_IN_QUEUE > 0 OR SS.QTY_IN_WORK > 0)
+        INNER JOIN STATUS S2 ON S2.HANDLE = S.STATUS_BO
+        INNER  JOIN Z_SFC_DISPATCH ZSD ON ZSD.DISPATCH_NO = S.SFC || '-' || SS.STEP_ID
+        LEFT JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZSD.SHOP_ORDER AND SO.SITE = S.SITE
+        LEFT JOIN ITEM I ON I.HANDLE = SO.PLANNED_ITEM_BO
+        LEFT JOIN ROUTER R ON R.HANDLE  = ZSD.ROUTER_BO
+        LEFT JOIN Z_SFC_SCRAP ZSS ON ZSS.SFC = S.SFC AND ZSS.SITE = S.SITE
+        LEFT JOIN BOM B ON B.HANDLE = SO.PLANNED_BOM_BO
+        INNER JOIN (  SELECT * FROM Z_ABNORMAL_BILL_VIEW ZABV  WHERE ZABV.HANDLE = (SELECT MAX(HANDLE) FROM Z_ABNORMAL_BILL_VIEW) ) ZABV ON ZABV.SFC = S.SFC AND ZABV.SITE= S.SITE
         <where>
             S.SITE = #{site} AND S.SFC = #{sfc}
         </where>
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/AnomalyService.java b/common/src/main/java/com/foreverwin/mesnac/common/service/AnomalyService.java
index 6584a38c..8952f968 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/AnomalyService.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/AnomalyService.java
@@ -23,7 +23,7 @@ public interface AnomalyService {
 
     void createAnomalyTask(String category, String resource, String shopOrder,
                            String sfc, String ncCodes,String position,String ncQty,
-                           String ncDescription,String userGroup,String remark);
+                           String ncDescription,String userGroup);
 
     /**
      * 判断产品条码在质量异常中是否为报废