From f5f7889cd423667b4b6d63d12ff9c78750952262 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 17 五月 2023 16:48:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 56 +++++++++++++++++++-------------------------------------
1 files changed, 19 insertions(+), 37 deletions(-)
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 6263465..a04142d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -634,70 +634,52 @@
@Transactional
public void startUpTestPACK(TestMast testMast) {
if(Cools.isEmpty(testMast.getLocNo())){
- throw new CoolException("搴撲綅鍙蜂负绌�");
- }else if(Cools.isEmpty(testMast.getUserId())){
- throw new CoolException("鐢ㄦ埛缂栫爜涓虹┖");
+ log.error("搴撲綅鍙蜂负绌�");
+ return;
}else if(Cools.isEmpty(testMast.getBarcode())){
- throw new CoolException("PACK鐮佷负绌�");
+ log.error("PACK鐮佷负绌�");
+ return;
}
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_no", testMast.getLocNo())
.eq("loc_sts","F")
);
if (Cools.isEmpty(locMast)) {
- throw new CoolException("鏈煡璇㈠埌搴撲綅鍙凤細"+testMast.getLocNo()+" 璇锋鏌ュ簱浣嶅彿鎴栬�呮鏌ュ簱浣嶇姸鎬佹槸鍚︽湭鍦ㄥ簱");
+ log.error("鏈煡璇㈠埌搴撲綅鍙凤細"+testMast.getLocNo()+" 璇锋鏌ュ簱浣嶅彿鎴栬�呮鏌ュ簱浣嶇姸鎬佹槸鍚︽湭鍦ㄥ簱");
+ return;
}
Date now = new Date();
- testMast.setStatus(1);
- testMast.setChannel(locMast.getChannel());
testMast.setModiTime(now);
testMast.setAppeTime(now);
// 鍚姩娴嬭瘯璇锋眰
ReturnT<String> result=startUpTestPACK1(testMast);
- if (!result.isSuccess()) {
+ if (Cools.isEmpty(result) || !result.isSuccess()) {
log.error("娴嬭瘯鐢宠澶辫触", testMast.getBarcode());
- throw new CoolException("娴嬭瘯鐢宠澶辫触");
+ return;
+ }
+ testMast.setStatus(3);
+
+ if (!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("barcode", testMast.getBarcode()))){
+ log.error("鏇存柊testMast澶辫触");
+ return;
}
- TestMast testMast1 = testMastService.selectOne(new EntityWrapper<TestMast>()
- .eq("loc_no", testMast.getLocNo())
- .eq("barcode", testMast.getBarcode())
- .eq("user_id",testMast.getUserId())
- .eq("channel",locMast.getChannel().toString())
- .lt("status",4)
- );
- if (Cools.isEmpty(testMast1)){
- if (!testMastService.insert(testMast)){
- throw new CoolException("娣诲姞testMast澶辫触");
- }
- }else {
- if (!testMastService.update(testMast,new EntityWrapper<TestMast>()
- .eq("loc_no", testMast.getLocNo())
- .eq("barcode", testMast.getBarcode())
- .eq("user_id",testMast.getUserId())
- .eq("channel",locMast.getChannel().toString())
- .lt("status",4)
- )){
- throw new CoolException("鏇存柊testMast澶辫触");
- }
- }
-
- locMast.setPackStatus(1);
+ locMast.setPackStatus(2);
locMast.setModiTime(now);
if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){
- throw new CoolException("鐢宠娴嬭瘯澶辫触");
+ log.error("鐢宠娴嬭瘯澶辫触");
}
-// throw new CoolException("寮傚父锛侊紒锛佽瑙勮寖浣跨敤鎴栬仈绯荤鐞嗗憳");
}
@Override
@Transactional
- public void suspendTestPACK(String channel) {
+ public boolean suspendTestPACK(String channel) {
ReturnT<String> result=suspendTestPACK1(channel);
if (!result.isSuccess()) {
log.error("鏆傚仠娴嬭瘯澶辫触");
}
+ return result.isSuccess();
}
@Transactional
public ReturnT<String> startUpTestPACK1(TestMast testMast){
@@ -705,12 +687,12 @@
try {
Review review=new Review();
review.setLocNo(testMast.getLocNo());
- review.setUserId(testMast.getUserId());
review.setBarcode(testMast.getBarcode());
review.setChannel(testMast.getChannel().toString());
review.setRequestTime(DateUtils.convert(new Date()));
if (testMast.getChannel()<1 || testMast.getChannel()>48){
log.error("閫氶亾鏈夎锛岃鏌ョ湅锛�");
+ return null;
} else if (testMast.getChannel()<=8){
renUrl=renUrl1;
}else if (testMast.getChannel()<=16){
--
Gitblit v1.9.1