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 | 146 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 138 insertions(+), 8 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 d6d7569..0d4f9e4 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -86,13 +86,23 @@
@Value("${mes.url}")
private String mesUrl;
- @Value("${ren.url}")
- private String renUrl;
+ @Value("${ren.url1}")
+ private String renUrl1;
+ @Value("${ren.url2}")
+ private String renUrl2;
+ @Value("${ren.url3}")
+ private String renUrl3;
+ @Value("${ren.url4}")
+ private String renUrl4;
+ @Value("${ren.url5}")
+ private String renUrl5;
+ @Value("${ren.url6}")
+ private String renUrl6;
@Value("${ren.startUpTestPACK}")
private String startUpTestPACK;
- @Value("${ren.startUpTestPACK}")
+ @Value("${ren.suspendTestPACK}")
private String suspendTestPACK;
@Value("${mes.inPath}")
@@ -622,13 +632,19 @@
@Override
@Transactional
public void startUpTestPACK(TestMast testMast) {
-
+ if(Cools.isEmpty(testMast.getLocNo())){
+ throw new CoolException("搴撲綅鍙蜂负绌�");
+ }else if(Cools.isEmpty(testMast.getUserId())){
+ throw new CoolException("鐢ㄦ埛缂栫爜涓虹┖");
+ }else if(Cools.isEmpty(testMast.getBarcode())){
+ throw new CoolException("PACK鐮佷负绌�");
+ }
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_no", testMast.getLocNo())
.eq("loc_sts","F")
);
if (Cools.isEmpty(locMast)) {
- throw new CoolException(BaseRes.PARAM);
+ throw new CoolException("鏈煡璇㈠埌搴撲綅鍙凤細"+testMast.getLocNo()+" 璇锋鏌ュ簱浣嶅彿鎴栬�呮鏌ュ簱浣嶇姸鎬佹槸鍚︽湭鍦ㄥ簱");
}
Date now = new Date();
testMast.setStatus(1);
@@ -643,9 +659,28 @@
throw new CoolException("娴嬭瘯鐢宠澶辫触");
}
- if (!testMastService.insert(testMast)){
- throw new CoolException("娣诲姞testMast澶辫触");
+ 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.setModiTime(now);
@@ -659,6 +694,8 @@
if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){
throw new CoolException("鐢宠娴嬭瘯澶辫触");
}
+// throw new CoolException("寮傚父锛侊紒锛佽瑙勮寖浣跨敤鎴栬仈绯荤鐞嗗憳");
+
}
@Override
@Transactional
@@ -670,6 +707,7 @@
}
@Transactional
public ReturnT<String> startUpTestPACK1(TestMast testMast){
+ String renUrl="";
try {
Review review=new Review();
review.setLocNo(testMast.getLocNo());
@@ -677,6 +715,21 @@
review.setBarcode(testMast.getBarcode());
review.setChannel(testMast.getChannel().toString());
review.setRequestTime(DateUtils.convert(new Date()));
+ if (testMast.getChannel()<1 || testMast.getChannel()>48){
+ log.error("閫氶亾鏈夎锛岃鏌ョ湅锛�");
+ } else if (testMast.getChannel()<=8){
+ renUrl=renUrl1;
+ }else if (testMast.getChannel()<=16){
+ renUrl=renUrl2;
+ }else if (testMast.getChannel()<=24){
+ renUrl=renUrl3;
+ }else if (testMast.getChannel()<=32){
+ renUrl=renUrl4;
+ }else if (testMast.getChannel()<=40){
+ renUrl=renUrl5;
+ }else if (testMast.getChannel()<=48){
+ renUrl=renUrl6;
+ }
return postMesData(renUrl,startUpTestPACK,review);
}catch (Exception e) {
log.error("fail", e);
@@ -687,11 +740,76 @@
}
@Transactional
public ReturnT<String> suspendTestPACK1(String channel){
+ String renUrl="";
try {
Review review=new Review();
review.setPause("true");
review.setChannel(channel);
review.setRequestTime(DateUtils.convert(new Date()));
+ switch (channel){
+ case "1":
+ case "2":
+ case "3":
+ case "4":
+ case "5":
+ case "6":
+ case "7":
+ case "8":
+ renUrl=renUrl1;
+ break;
+ case "9":
+ case "10":
+ case "11":
+ case "12":
+ case "13":
+ case "14":
+ case "15":
+ case "16":
+ renUrl=renUrl2;
+ break;
+ case "17":
+ case "18":
+ case "19":
+ case "20":
+ case "21":
+ case "22":
+ case "23":
+ case "24":
+ renUrl=renUrl3;
+ break;
+ case "25":
+ case "26":
+ case "27":
+ case "28":
+ case "29":
+ case "30":
+ case "31":
+ case "32":
+ renUrl=renUrl4;
+ break;
+ case "33":
+ case "34":
+ case "35":
+ case "36":
+ case "37":
+ case "38":
+ case "39":
+ case "40":
+ renUrl=renUrl5;
+ break;
+ case "41":
+ case "42":
+ case "43":
+ case "44":
+ case "45":
+ case "46":
+ case "47":
+ case "48":
+ renUrl=renUrl6;
+ break;
+ default:
+ log.error("閫氶亾鏈夎锛岃鏌ョ湅锛�");
+ }
return postMesData(renUrl,suspendTestPACK,review);
}catch (Exception e) {
log.error("fail", e);
@@ -705,8 +823,20 @@
String name="";
if (URL.equals(mesUrl)){
name="mes绯荤粺";
- }else if (URL.equals(renUrl)){
+ }else if (URL.equals(renUrl1)){
name="娴嬭瘯绯荤粺";
+ }else if (URL.equals(renUrl2)){
+ name="娴嬭瘯绯荤粺";
+ }else if (URL.equals(renUrl3)){
+ name="娴嬭瘯绯荤粺";
+ }else if (URL.equals(renUrl4)){
+ name="娴嬭瘯绯荤粺";
+ }else if (URL.equals(renUrl5)){
+ name="娴嬭瘯绯荤粺";
+ }else if (URL.equals(renUrl6)){
+ name="娴嬭瘯绯荤粺";
+ }else {
+ log.error("鏌ヨ杩炴帴澶辫触锛岃鏌ョ湅锛�");
}
if(combParam != null){
String response = "";
--
Gitblit v1.9.1