From ce7a6062661ef916fbb727975deac03a50c5bf09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Mon, 9 Aug 2021 16:59:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=8A=A5=E5=BA=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 anomaly/src/main/resources/mapper/AbnormalBillMapper.xml  | 7 ++-----
 .../mesnac/production/controller/SfcScrapController.java  | 2 --
 .../production/service/impl/SfcScrapServiceImpl.java      | 8 +++++---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
index ef463532..e84dfa1e 100644
--- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
+++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
@@ -983,11 +983,8 @@
     </select>
 
     <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,
+        SELECT   S.SFC SFC,
+        S2.STATUS 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,
diff --git a/production/src/main/java/com/foreverwin/mesnac/production/controller/SfcScrapController.java b/production/src/main/java/com/foreverwin/mesnac/production/controller/SfcScrapController.java
index b2bde6c1..907a4fda 100644
--- a/production/src/main/java/com/foreverwin/mesnac/production/controller/SfcScrapController.java
+++ b/production/src/main/java/com/foreverwin/mesnac/production/controller/SfcScrapController.java
@@ -139,8 +139,6 @@ public class SfcScrapController {
      */
     @GetMapping("/getScrapDtoBysfc")
     public R getScrapDtoBysfc(String site,String sfc){
-
-
         return R.ok(anomalyService.getScrapDtoBysfc(site,sfc));
     }
 
diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SfcScrapServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SfcScrapServiceImpl.java
index 578cb5a1..14a6e95c 100644
--- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SfcScrapServiceImpl.java
+++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SfcScrapServiceImpl.java
@@ -212,9 +212,11 @@ public class SfcScrapServiceImpl extends ServiceImpl<SfcScrapMapper, SfcScrap> i
         Map<String, String> wordMap = sfcScrapMapper.generatorWord(site,locale ,shopOrder, sfc);
         wordMap.put("SCRAP_MARK","线下质量贴红色标签");
         wordMap.put("OPERATOR",user);
-        wordMap.put("GF",(wordMap.get("TYPE").contains("GF"))? "✔": "");
-        wordMap.put("LF",(wordMap.get("TYPE").contains("LF"))? "✔": "");
-        wordMap.put("OT",(wordMap.get("TYPE").contains("QT"))? "✔": "");
+        if(!StringUtil.isBlank(wordMap.get("TYPE"))){
+            wordMap.put("GF",(wordMap.get("TYPE").contains("GF"))? "✔": "");
+            wordMap.put("LF",(wordMap.get("TYPE").contains("LF"))? "✔": "");
+            wordMap.put("OT",(wordMap.get("TYPE").contains("QT"))? "✔": "");
+        }
         wordMap.put("OPINION","报废");
         wordMap.put("YEAR",year + "");
         wordMap.put("MONTH",month + "");