From bab0b194ba2f48d914b9bcebdc2c7d0c332386c4 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, 7 Sep 2021 10:01:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=A8=A1=E5=9D=97bug?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/anomaly/dto/AbnormalBillDisposeDto.java     | 10 ++++++++++
 .../anomaly/service/impl/AbnormalBillServiceImpl.java  |  4 ++--
 .../resources/mapper/AbnormalBillDisposeMapper.xml     |  7 +++++--
 .../mesnac/common/enums/AnomalyConstant.java           |  2 +-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDisposeDto.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDisposeDto.java
index 9a5539b5..f8417670 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDisposeDto.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDisposeDto.java
@@ -208,6 +208,8 @@ public class AbnormalBillDisposeDto extends AbnormalBillDispose {
 
     private String routerDescription;;
 
+    private String stepId;
+
     public String getAbnormalNo() {
         return abnormalNo;
     }
@@ -547,4 +549,12 @@ public class AbnormalBillDisposeDto extends AbnormalBillDispose {
     public void setRouterDescription(String routerDescription) {
         this.routerDescription = routerDescription;
     }
+
+    public String getStepId() {
+        return stepId;
+    }
+
+    public void setStepId(String stepId) {
+        this.stepId = stepId;
+    }
 }
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 6e74caea..6976e322 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
@@ -535,8 +535,8 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
                 sfcDto.setAbnormalNo(abnormalBill2.getAbnormalNo());
                 sfcDto.setQty(sfc.getQty());
                 Map map = sfcMapper.findOperationBySfc(site, sfc.getSfc());
-                if(StringUtils.isBlank((String)map.get("STEP_ID"))){
-                    throw new BaseException("整批返修失败，根据该产品条码找不到STEP_ID");
+                if(map != null && StringUtils.isBlank((String)map.get("STEP_ID"))){
+                    throw new BaseException("整批返修失败，根据产品条码"+sfc.getSfc()+"找不到STEP_ID");
                 }
                 sfcDto.setStepId((String) map.get("STEP_ID"));
                 this.batchRepair(sfcDto);
diff --git a/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml
index bd59cfda..fbef2903 100644
--- a/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml
+++ b/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml
@@ -78,6 +78,8 @@
         <result column="DUTY_TYPE" property="dutyType"/>
         <result column="DUTY_CAUSE_TYPE" property="dutyCauseType"/>
         <result column="ROUTER_DESCRIPTION" property="routerDescription"/>
+        <result column="PRODUCT_CATEGORY" property="productCategory"/>
+        <result column="STEP_ID" property="stepId"/>
     </resultMap>
 
 
@@ -722,7 +724,8 @@
         listagg(ZANC.NC_CODE_GROUP || '/'||ZANC.NC_CODE || ',') within GROUP(ORDER BY zab.ABNORMAL_NO) NC_CODE,
         ZABD.ROUTER_BO ROUTER_BO,ZAB.OPERATION OPERATION,I.HANDLE ITEM_BO,ZAB.REPORT_SEND_USER_GROUP REPORT_SEND_USER_GROUP,
         ZAB.CORRECTION CORRECTION,ZAB.PROGRAM PROGRAM,WCT.DESCRIPTION WORK_CENTER_DESCRIPTION,ZAB.SHUT_DOWN SHUT_DOWN,
-        RS.DESCRIPTION RESRCE_DESCRIPTION,OT.DESCRIPTION OPERATION_DESCRIPTION,R.DESCRIPTION ROUTER_DESCRIPTION
+        RS.DESCRIPTION RESRCE_DESCRIPTION,OT.DESCRIPTION OPERATION_DESCRIPTION,R.DESCRIPTION ROUTER_DESCRIPTION,
+               ZAB.PRODUCT_CATEGORY PRODUCT_CATEGORY,ZAB.STEP_ID STEP_ID
         FROM Z_ABNORMAL_BILL ZAB
         LEFT JOIN Z_ABNORMAL_BILL_DISPOSE ZABD ON ZAB.HANDLE = ZABD.ABNORMAL_BILL_BO
         LEFT JOIN ITEM I ON I.HANDLE = ZAB.ITEM_BO
@@ -766,7 +769,7 @@
         R.ROUTER ,ZABD.RESOLVE_SHOP_ORDER ,ZABD.RESOLVE_REMARK ,ZABD.RESOLVE_SEND_USER_GROUP ,
         ZABD.ABNORMAL_REASON ,ZABD.BEFORE_MEASURE ,"MAP".VALUE,ZABD.ROUTER_BO,ZAB.OPERATION,I.HANDLE,
         ZAB.REPORT_SEND_USER_GROUP,ZAB.CORRECTION,ZAB.PROGRAM,WCT.DESCRIPTION,ZAB.SHUT_DOWN,RS.DESCRIPTION,
-        OT.DESCRIPTION,R.DESCRIPTION
+        OT.DESCRIPTION,R.DESCRIPTION, ZAB.PRODUCT_CATEGORY ,ZAB.STEP_ID
     </select>
 
 
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/enums/AnomalyConstant.java b/common/src/main/java/com/foreverwin/mesnac/common/enums/AnomalyConstant.java
index cf149fdc..567dbbfa 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/enums/AnomalyConstant.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/enums/AnomalyConstant.java
@@ -221,7 +221,7 @@ public enum AnomalyConstant {
     public enum AnomalyMethod{
         AnomalyMethod1("X","线下换料"),
         AnomalyMethod2("S","试装"),
-        AnomalyMethod3("R","让步放心"),
+        AnomalyMethod3("R","让步放行"),
         AnomalyMethod4("C","产品报废"),
         AnomalyMethod5("P","配作"),
         AnomalyMethod6("F","返修");