From d95eac3f8d10cd5b46bf6f39afa64f64646274f3 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期六, 08 十月 2022 19:17:59 +0800
Subject: [PATCH] #lsh
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 62 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 28 deletions(-)
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 665097a..ddef2a3 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -638,7 +638,7 @@
.eq("barcode", param.getPackNo()));
if (Cools.isEmpty(locMast)){
throw new CoolException("鏈煡璇㈠埌PACK鐮佷负锛�"+param.getPackNo()+"鐨勮揣鐗�");
- }else if (locMast.getLocSts().equals("F")){
+ }else if (!locMast.getLocSts().equals("F")){
throw new CoolException("PACK鐮佷负锛�"+param.getPackNo()+"鐨勮揣鐗╁簱浣嶇姸鎬佷笉鏄�淔鈥�");
}else if (locMast.getFireStatus()!=0){
throw new CoolException("璀﹀憡锛侊紒锛丳ACK鐮佷负锛�"+param.getPackNo()+"鐨勫簱浣嶏細"+locMast.getLocNo()+"娑堥槻鐘舵�佸紓甯革紒锛侊紒");
@@ -700,13 +700,13 @@
if (locMast.getLocSts().equals("F")) {
locMast.setLocSts("R");
locMast.setModiTime(now);
-// locMast.setPackStatus(5); //5:闈欑疆瀹屾垚
-// CombParam combParam = new CombParam();
-// combParam.setPackNo(locMast.getBarcode());
-// combParam.setLocno(locMast.getLocNo());
-// combParam.setPackSts(6);
-// combParam.setRequestTime(DateUtils.convert(new Date()));
-// postMesData(inpath,combParam);
+ locMast.setPackStatus(5); //5:闈欑疆瀹屾垚
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(locMast.getBarcode());
+ combParam.setLocNo(locMast.getLocNo());
+ combParam.setPackSts(6);
+ combParam.setRequestTime(DateUtils.convert(new Date()));
+ postMesData(inpath,combParam);
if (!locMastService.updateById(locMast)) {
throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+locMast.getLocNo());
@@ -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("鏇存柊娴嬭瘯鐘舵�佸け璐�");
@@ -745,14 +754,14 @@
locMast.setPackStatus(2);
CombParam combParam = new CombParam();
combParam.setPackNo(locMast.getBarcode());
- combParam.setLocno(locMast.getLocNo());
+ combParam.setLocNo(locMast.getLocNo());
combParam.setPackSts(2);
combParam.setRequestTime(DateUtils.convert(new Date()));
postMesData(inpath,combParam);
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;
}
@@ -781,16 +791,11 @@
if(null != testMast){
if (testMast.getStatus()==3){
Date date = new Date();
- testMast.setStatus(4);
- testMast.setModiTime(date);
- if (!testMastService.update(testMast,wrapper)){
- throw new CoolException("鏇存敼娴嬭瘯鐘舵�佸け璐�");
- }
locMast.setPackStatus(3);
- testMast.setModiTime(date);
+ locMast.setModiTime(date);
CombParam combParam = new CombParam();
combParam.setPackNo(locMast.getBarcode());
- combParam.setLocno(locMast.getLocNo());
+ combParam.setLocNo(locMast.getLocNo());
combParam.setPackSts(3);
combParam.setRequestTime(DateUtils.convert(new Date()));
postMesData(inpath,combParam);
@@ -813,9 +818,10 @@
String response = "";
boolean success = false;
try {
- Map<String, Object> map = new HashMap<>();
- map.put("appkey","ea1f0459efc02a79f046f982767939ae");
- response = new HttpHandler.Builder().setHeaders(map)
+// Map<String, Object> map = new HashMap<>();
+// map.put("appkey","ea1f0459efc02a79f046f982767939ae");
+ response = new HttpHandler.Builder()
+// .setHeaders(map)
.setUri(mesUrl)
.setPath(mesPath)
.setJson(JSON.toJSONString(combParam))
@@ -828,11 +834,11 @@
}else if (jsonObject.getDate("isComplete").equals(false)){
success = false;
}else {
- log.error("杩斿洖鍊煎嚭閿�!!!url锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(combParam), response);
+ log.error("杩斿洖鍊煎嚭閿�!!!url锛歿}锛況equest锛歿}锛況esponse锛歿}", mesUrl+mesPath, JSON.toJSONString(combParam), response);
throw new CoolException("杩斿洖鍊煎嚭閿�");
}
} else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(combParam), response);
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", mesUrl+mesPath, JSON.toJSONString(combParam), response);
throw new CoolException("涓婃姤mes绯荤粺澶辫触");
}
} catch (Exception e) {
@@ -844,7 +850,7 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"鎴愬搧搴撳叆搴撲笂鎶�",
- MesConstant.URL + MesConstant.PAKIN_URL,
+ mesUrl + mesPath,
null,
"127.0.0.1",
JSON.toJSONString(combParam),
--
Gitblit v1.9.1