From 86ee8a3f57793e30b3300bcab83e931c6781392b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Sat, 10 Jul 2021 17:24:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=BC=82=E5=B8=B8=E3=80=81?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=BC=82=E5=B8=B8=E3=80=81=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=94=9F=E6=88=90=E5=BC=82=E5=B8=B8=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AbnormalBillController.java    |  4 +--
 .../anomaly/service/AbnormalBillService.java  |  2 +-
 .../service/impl/AbnormalBillServiceImpl.java | 26 +++++++++++--------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
index 29fd3b44..4311eb88 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
@@ -157,8 +157,8 @@ public class AbnormalBillController {
      * @return
      */
     @GetMapping("/init")
-    public R init(String messageType){
-        return R.ok(abnormalBillService.init(messageType));
+    public R init(String messageType,String type){
+        return R.ok(abnormalBillService.init(messageType,type));
     }
 
 //    @GetMapping("/findAllUserByUserGroup")
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java
index a80c2d26..93fe07d4 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java
@@ -55,7 +55,7 @@ public interface AbnormalBillService extends IService<AbnormalBill> {
     /**
      * 初始化
      */
-    HashMap<String,Object> init(String messageType);
+    HashMap<String,Object> init(String messageType,String type);
     /**
      * 待办事项
      * @param abnormalBillDto
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 75a9ca69..125e4ef8 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
@@ -185,7 +185,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
     }
 
     @Override
-    public HashMap<String, Object> init(String messageType) {
+    public HashMap<String, Object> init(String messageType,String type) {
         HashMap<String, Object> hashMap = new HashMap<>();
         String site = CommonMethods.getSite();
         //消息类型
@@ -224,6 +224,18 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         if(nwaUsers != null){
             hashMap.put("currentUser",nwaUsers.get(0).getFullName());
         }
+        //初始化异常单号
+        String abnormalNo = null;
+        //生成异常单号
+        if("Q".equals(type)){//其他异常
+            abnormalNo = nextNumberHelper.getNextNumber(site, "ABNORMAL_OTHER", 1, null).get(0);
+        }else if("Z".equals(type)){//质量异常
+            abnormalNo = nextNumberHelper.getNextNumber(site, "ABNORMAL_QUALITY", 1, null).get(0);
+        }else if("S".equals(type)){//设备异常
+            abnormalNo = nextNumberHelper.getNextNumber(site, "ABNORMAL_DEVICE", 1, null).get(0);
+        }
+        hashMap.put("abnormalNo",abnormalNo);
+
         return hashMap;
     }
 
@@ -370,16 +382,8 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         LocalDateTime currentTime = LocalDateTime.now();
         String user = CommonMethods.getUser();
         if(StringUtil.isBlank(abnormalBill.getAbnormalNo())){
-            String abnormalNo = null;
-            //生成异常单号
-            if("Q".equals(abnormalBill.getType())){//其他异常
-                abnormalNo = nextNumberHelper.getNextNumber(site, "ABNORMAL_OTHER", 1, null).get(0);
-            }else if("Z".equals(abnormalBill.getType())){//质量异常
-                abnormalNo = nextNumberHelper.getNextNumber(site, "ABNORMAL_QUALITY", 1, null).get(0);
-            }else if("S".equals(abnormalBill.getType())){//设备异常
-                abnormalNo = nextNumberHelper.getNextNumber(site, "ABNORMAL_DEVICE", 1, null).get(0);
-            }
-            abnormalBill.setAbnormalNo(abnormalNo);
+            throw BusinessException.build("异常单号不存在");
+
         }