From 4d733abd4eaf5fe23f8cf277f8975860a3caa5be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Fri, 2 Jul 2021 15:35:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=BC=82=E5=B8=B8=E6=8F=90?=
 =?UTF-8?q?=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AbnormalBillController.java    | 10 ++++++++++
 .../mesnac/anomaly/model/AbnormalBill.java    |  1 +
 .../anomaly/service/AbnormalBillService.java  |  2 ++
 .../service/impl/AbnormalBillServiceImpl.java | 19 ++++++++++++++-----
 4 files changed, 27 insertions(+), 5 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 043b1896..fbf0d39c 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
@@ -232,6 +232,16 @@ public class AbnormalBillController {
         return R.ok(abnormalBillService.anomalyReport(abnormalBill, abnormalBillDispose,ncGroupAndNcCodes,dutyCauseType,dutyType));
     }
 
+    /**
+     * 设备异常提报
+     * @param abnormalBill
+     * @return
+     */
+    @GetMapping("/anomalyReportDevice")
+    public R anomalyReportDevice(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose){
+        return R.ok(abnormalBillService.anomalyReportDevice(abnormalBill,abnormalBillDispose));
+    }
+
 
     /**
      * 取消原因
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java
index 6f6e852f..00fe7a76 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
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 f5e6f937..5c5f1969 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
@@ -47,4 +47,6 @@ public interface AbnormalBillService extends IService<AbnormalBill> {
 
     void cancelBrowse(String handle,String cancelBrowse);
 
+    String anomalyReportDevice(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose);
+
 }
\ No newline at end of file
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 d86f7e49..ca57a77a 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
@@ -143,6 +143,15 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
     }
 
 
+    @Override
+    public String anomalyReportDevice(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose) {
+        this.generateAbnormalBill(abnormalBill,abnormalBillDispose,null,null);
+        this.saveOrUpdate(abnormalBill);
+        abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose);
+        return abnormalBill.getAbnormalNo();
+    }
+
+
     @Override
     public void generateAbnormalBill(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose,List<String> dutyCauseType,List<String> dutyType) {
         String site = CommonMethods.getSite();
@@ -174,7 +183,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
 
         ArrayList<AbnormalCause> causeTypes = new ArrayList<>();
         //判断原因分类是否为空
-        if(dutyCauseType.size() >= 1){
+        if(dutyCauseType != null && dutyCauseType.size() >= 1){
             for(String cause:dutyCauseType){
                 AbnormalCause abnormalCause = new AbnormalCause();
                 String uuid = UUID.randomUUID().toString();
@@ -198,7 +207,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         }
         ArrayList<AbnormalDuty> dutyTypes = new ArrayList<>();
         //判断责任分类是否为空
-        if(dutyType.size() >= 1){
+        if(dutyType != null && dutyType.size() >= 1){
             for(String duty:dutyType){
                 AbnormalDuty abnormalDuty = new AbnormalDuty();
                 String uuid = UUID.randomUUID().toString();
@@ -234,7 +243,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         abnormalBillDispose.setModifiedUser(user);
 
         //判断SFC、设备编号、消息类型是否不正确或为空
-        if(StringUtil.isBlank(abnormalBill.getSfc())){
+        if(StringUtil.isBlank(abnormalBill.getSfc()) && "S".equals(abnormalBill.getType())){
             throw BusinessException.build("产品条码不能为空");
         }
         if(StringUtil.isBlank(abnormalBill.getResrce())){
@@ -252,10 +261,10 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         }
         //判断不良品数量和问题数量是否为正整数
         try {
-            if(Integer.parseInt(abnormalBill.getNcQty()) < 0) {
+            if(!StringUtil.isBlank(abnormalBill.getNcQty()) && Integer.parseInt(abnormalBill.getNcQty()) < 0) {
                 throw BusinessException.build("不良品数量必须大于0");
             }
-            if(Integer.parseInt(abnormalBill.getPbQty()) < 0){
+            if(!StringUtil.isBlank(abnormalBill.getPbQty()) && Integer.parseInt(abnormalBill.getPbQty()) < 0){
                 throw BusinessException.build("问题数量必须大于0");
             }
         }catch (NumberFormatException num){