From 61be76023c66950644c02ac3d69f21aab58447c3 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期四, 06 十月 2022 14:36:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 11 ++++++++---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 12 ++++++------
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 22 ++++++++++++++++------
src/main/java/com/zy/asrs/service/OpenService.java | 2 +-
src/main/resources/application.yml | 4 ++--
5 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 91d9d9e..a35cc59 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
@@ -266,9 +267,13 @@
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- openService.infoReview(param);
-
- return R.ok();
+ TestMast testMast = openService.infoReview(param);
+ if (testMast.getStatus()==3){
+ return R.ok();
+ }else if (testMast.getStatus()==2){
+ return R.error("绛夊緟鍛樺伐鎿嶄綔");
+ }
+ return R.error();
}
@PostMapping("/rpv/testFinish/auth/v1")
// @AppAuth(memo = "娴嬭瘯瀹屾垚")
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index c5107bb..3c6060a 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -54,7 +54,7 @@
/**
* pda娴嬭瘯澶嶆牳璋冪敤鎺ュ彛
*/
- void infoReview(Review review);
+ TestMast infoReview(Review review);
/**
* pda娴嬭瘯瀹屾垚
*/
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 0dcd93f..ec50d9c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -623,12 +623,12 @@
@Transactional
public void startUpTestPACK(TestMast testMast) {
- //鍚姩娴嬭瘯璇锋眰
-// ReturnT<String> result=startUpTestPACK1(testMast);
-// if (!result.isSuccess()) {
-// log.error("娴嬭瘯鐢宠澶辫触", testMast.getBarcode());
-// throw new CoolException("娴嬭瘯鐢宠澶辫触");
-// }
+// 鍚姩娴嬭瘯璇锋眰
+ ReturnT<String> result=startUpTestPACK1(testMast);
+ if (!result.isSuccess()) {
+ log.error("娴嬭瘯鐢宠澶辫触", testMast.getBarcode());
+ throw new CoolException("娴嬭瘯鐢宠澶辫触");
+ }
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()));
if (Cools.isEmpty(locMast)) {
throw new CoolException(BaseRes.PARAM);
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 5d3f5c3..ef18257 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -722,7 +722,7 @@
@Override
@Transactional
- public void infoReview(Review review) {
+ public TestMast infoReview(Review review) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()));
if (!review.getBarcode().equals(locMast.getBarcode())){
throw new CoolException("pack鐮佷笉鍚�");
@@ -731,13 +731,22 @@
.eq("loc_no", review.getLocNo())
.eq("barcode", review.getBarcode())
.eq("user_Id", review.getUserId());
- if (null == locMast ||locMast.getPackStatus()!=1) {
- throw new CoolException("浜у搧鐘舵�佷笉鏄� 1:寰呮祴璇�");
- }
TestMast testMast = testMastService.selectOne(wrapper);
+ if (null == locMast) {
+ throw new CoolException("浜у搧鐘舵�佷负绌�");
+ }else if (locMast.getPackStatus()==2){
+ if (!Cools.isEmpty(testMast)){
+ if (testMast.getStatus()==2 || testMast.getStatus()==3){
+ return testMast;
+ }
+ }
+ }else if (locMast.getPackStatus()!=1){
+ throw new CoolException("浜у搧鐘舵�佷笉鏄�1寰呮祴璇�");
+ }
+
if(null != testMast){
if (testMast.getStatus()==1){
- testMast.setStatus(3);
+ testMast.setStatus(2);
testMast.setModiTime(new Date());
if (!testMastService.update(testMast,wrapper)){
throw new CoolException("鏇存柊娴嬭瘯鐘舵�佸け璐�");
@@ -752,7 +761,7 @@
if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
throw new CoolException("鏇存柊浜у搧鐘舵�佸け璐�");
}
- }else if (Cools.isEmpty(testMast.getStatus())){
+ } else if (Cools.isEmpty(testMast.getStatus())){
throw new CoolException("鐘舵�佸紓甯�");
}else {
throw new CoolException("鐘舵�佷笉鏄� 1:鐢宠涓�");
@@ -760,6 +769,7 @@
} else {
throw new CoolException("娴嬭瘯鐢宠澶嶆牳澶辫触");
}
+ return testMast;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index bda09be..79bf391 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -62,6 +62,6 @@
ren:
url: 172.28.15.251:7899
# 鍚姩娴嬭瘯璇锋眰
- startUpTestPACK: 127.0.0.1:8080/ynwms/open/asrs/rpv/test/open/auth
+ startUpTestPACK: ynwms/open/asrs/rpv/test/open/auth
#鏆傚仠娴嬭瘯
- suspendTestPACK: 127.0.0.1:8080/ynwms/open/asrs/rpv/test/open/auth
\ No newline at end of file
+ suspendTestPACK: ynwms/open/asrs/rpv/test/open/auth
\ No newline at end of file
--
Gitblit v1.9.1