From b333348e34b3d4c4e4cfafbbae7517702b5932e3 Mon Sep 17 00:00:00 2001
From: bns_han <1604366271@qq.com>
Date: Mon, 22 Jan 2024 21:21:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/sgzb/app/controller/BackReceiveController.java  | 2 ++
 .../sgzb/app/service/impl/BackReceiveServiceImpl.java     | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
index f6c90bd2..5e3fd293 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
@@ -92,6 +92,8 @@ public class BackReceiveController extends BaseController {
             int res =backReceiveService.setCodeBack(record);
             if (res>0){
                 return AjaxResult.success("接收成功");
+            }else if (res==-1){
+                return AjaxResult.error("该编码已接收");
             }else {
                 return AjaxResult.error("接收失败");
             }
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
index 0381f625..e504c337 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
@@ -66,7 +66,7 @@ public class BackReceiveServiceImpl implements BackReceiveService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int setCodeBack(BackApplyInfo record) {
-        int res;
+        int res=0;
         try{
             BackApplyInfo[] arr = record.getArr();
             if (arr.length>0){
@@ -74,9 +74,13 @@ public class BackReceiveServiceImpl implements BackReceiveService {
                     //根据maId和taskId查询是否已接收
                     int re = backReceiveMapper.selectCodeByMaIdAndTaskId(arr[i].getMaId(),record.getTaskId());
                     if (re>0){
-                        throw new RuntimeException("该编码已接收");
+                        res=-1;
+                        break;
                     }
                 }
+                if (res==-1){
+                    return res;
+                }
             }
             int taskId = record.getTaskId();
             //修改任务状态