From 8946914db08273d083996bba7189bc70411b0937 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 13 二月 2023 14:20:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 32 ++++++++++++++------------------
1 files changed, 14 insertions(+), 18 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 2f210a5..0d4f9e4 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -24,8 +24,6 @@
import com.zy.common.model.MesCombParam;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -85,8 +83,6 @@
private TestMastService testMastService;
@Autowired
private WorkService workService;
- @Autowired
- private UserService userService;//鍙煡璇� 鏃犱慨鏀规搷浣�
@Value("${mes.url}")
private String mesUrl;
@@ -106,7 +102,7 @@
@Value("${ren.startUpTestPACK}")
private String startUpTestPACK;
- @Value("${ren.startUpTestPACK}")
+ @Value("${ren.suspendTestPACK}")
private String suspendTestPACK;
@Value("${mes.inPath}")
@@ -638,16 +634,10 @@
public void startUpTestPACK(TestMast testMast) {
if(Cools.isEmpty(testMast.getLocNo())){
throw new CoolException("搴撲綅鍙蜂负绌�");
- }else if(Cools.isEmpty(testMast.getChannel())){
+ }else if(Cools.isEmpty(testMast.getUserId())){
throw new CoolException("鐢ㄦ埛缂栫爜涓虹┖");
}else if(Cools.isEmpty(testMast.getBarcode())){
throw new CoolException("PACK鐮佷负绌�");
- }
- User user = userService.selectOne(new EntityWrapper<User>().eq("username", testMast.getChannel().toString()));
- if (!Cools.isEmpty(user)){
- testMast.setUserId(user.getMobile());
- }else {
- throw new CoolException("鏈煡鍒扮敤鎴风紪鍙凤細"+testMast.getChannel()+"鎵�灞炵敤鎴风爜");
}
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_no", testMast.getLocNo())
@@ -725,17 +715,19 @@
review.setBarcode(testMast.getBarcode());
review.setChannel(testMast.getChannel().toString());
review.setRequestTime(DateUtils.convert(new Date()));
- if (testMast.getChannel()>=1 && testMast.getChannel()<=8){
+ if (testMast.getChannel()<1 || testMast.getChannel()>48){
+ log.error("閫氶亾鏈夎锛岃鏌ョ湅锛�");
+ } else if (testMast.getChannel()<=8){
renUrl=renUrl1;
- }else if (testMast.getChannel()>=9 && testMast.getChannel()<=16){
+ }else if (testMast.getChannel()<=16){
renUrl=renUrl2;
- }else if (testMast.getChannel()>=17 && testMast.getChannel()<=24){
+ }else if (testMast.getChannel()<=24){
renUrl=renUrl3;
- }else if (testMast.getChannel()>=25 && testMast.getChannel()<=36){
+ }else if (testMast.getChannel()<=32){
renUrl=renUrl4;
- }else if (testMast.getChannel()>=37 && testMast.getChannel()<=40){
+ }else if (testMast.getChannel()<=40){
renUrl=renUrl5;
- }else if (testMast.getChannel()>=41 && testMast.getChannel()<=48){
+ }else if (testMast.getChannel()<=48){
renUrl=renUrl6;
}
return postMesData(renUrl,startUpTestPACK,review);
@@ -815,6 +807,8 @@
case "48":
renUrl=renUrl6;
break;
+ default:
+ log.error("閫氶亾鏈夎锛岃鏌ョ湅锛�");
}
return postMesData(renUrl,suspendTestPACK,review);
}catch (Exception e) {
@@ -841,6 +835,8 @@
name="娴嬭瘯绯荤粺";
}else if (URL.equals(renUrl6)){
name="娴嬭瘯绯荤粺";
+ }else {
+ log.error("鏌ヨ杩炴帴澶辫触锛岃鏌ョ湅锛�");
}
if(combParam != null){
String response = "";
--
Gitblit v1.9.1