From e6fc4345bb82c01a190c16093a175b87573525b7 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 11 二月 2023 11:16:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 113 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 88 insertions(+), 25 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 b496292..8d37d41 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -579,6 +579,15 @@
@Override
@Transactional
public void combPACK(CombParam param) {
+ if (Cools.isEmpty(param.getPackNo())){
+ throw new CoolException("缂哄皯鍙傛暟锛歱ackNo");
+ }else if (Cools.isEmpty(param.getPackName())){
+ throw new CoolException("缂哄皯鍙傛暟锛歱ackName");
+ }else if (Cools.isEmpty(param.getSettingTimes())){
+ throw new CoolException("缂哄皯鍙傛暟锛歴ettingTimes");
+ }else if (Cools.isEmpty(param.getRequestTime())){
+ throw new CoolException("缂哄皯鍙傛暟锛歳equestTime");
+ }
if (Cools.isEmpty(param.getPackNo())) {
throw new CoolException(BaseRes.PARAM);
}
@@ -629,6 +638,15 @@
@Override
@Transactional
public void combPackOut(CombParam param) {
+ if (Cools.isEmpty(param.getPackNo())){
+ throw new CoolException("缂哄皯鍙傛暟锛歱ackNo");
+ }else if (Cools.isEmpty(param.getPackName())){
+ throw new CoolException("缂哄皯鍙傛暟锛歱ackName");
+ }else if (Cools.isEmpty(param.getSettingTimes())){
+ throw new CoolException("缂哄皯鍙傛暟锛歴ettingTimes");
+ }else if (Cools.isEmpty(param.getRequestTime())){
+ throw new CoolException("缂哄皯鍙傛暟锛歳equestTime");
+ }
if (Cools.isEmpty(param.getPackNo())) {
throw new CoolException(BaseRes.PARAM);
}
@@ -638,7 +656,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,11 +718,11 @@
if (locMast.getLocSts().equals("F")) {
locMast.setLocSts("R");
locMast.setModiTime(now);
- locMast.setPackStatus(5); //5:闈欑疆瀹屾垚
+ locMast.setPackStatus(6); //6:闈欑疆瀹屾垚
CombParam combParam = new CombParam();
combParam.setPackNo(locMast.getBarcode());
combParam.setLocNo(locMast.getLocNo());
- combParam.setPackSts(6);
+ combParam.setPackSts(7);
combParam.setRequestTime(DateUtils.convert(new Date()));
postMesData(inpath,combParam);
@@ -722,7 +740,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 +749,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 +779,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 +787,7 @@
} else {
throw new CoolException("娴嬭瘯鐢宠澶嶆牳澶辫触");
}
+ return testMast;
}
@@ -781,17 +809,52 @@
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.setPackSts(3);
+ 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())){
+ throw new CoolException("鐘舵�佸紓甯�");
+ }else {
+ throw new CoolException("娴嬭瘯鐘舵�佷笉鏄� 3:娴嬭瘯涓�");
+ }
+ } else {
+ throw new CoolException("鐘舵�佸紓甯�");
+ }
+ return success;
+ }
+
+ @Override
+ @Transactional
+ public Boolean testNG(Review review) {
+ Boolean success=true;
+ Wrapper wrapper = new EntityWrapper<TestMast>()
+ .eq("loc_no", review.getLocNo())
+ .eq("barcode", review.getBarcode())
+ .eq("user_Id", review.getUserId());
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()));
+ if (null == locMast ||locMast.getPackStatus()!=2){
+ throw new CoolException("浜у搧鐘舵�佷笉鏄� 2:娴嬭瘯涓�");
+ }else if (!review.getBarcode().equals(locMast.getBarcode())){
+ throw new CoolException("pack鐮佷笉鍚�");
+ }
+ TestMast testMast = testMastService.selectOne(wrapper);
+ if(null != testMast){
+ if (testMast.getStatus()==3){
+ Date date = new Date();
+ locMast.setPackStatus(4);
+ locMast.setModiTime(date);
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(locMast.getBarcode());
+ combParam.setLocNo(locMast.getLocNo());
+ combParam.setPackSts(4);
combParam.setRequestTime(DateUtils.convert(new Date()));
postMesData(inpath,combParam);
if (!locMastService.update(locMast, new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
@@ -824,16 +887,16 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
- if (jsonObject.getDate("isComplete").equals(true)){
+// if (jsonObject.getDate("isComplete").equals(true)){
success = true;
- }else if (jsonObject.getDate("isComplete").equals(false)){
- success = false;
- }else {
- log.error("杩斿洖鍊煎嚭閿�!!!url锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(combParam), response);
- throw new CoolException("杩斿洖鍊煎嚭閿�");
- }
+// }else if (jsonObject.getDate("isComplete").equals(false)){
+// success = false;
+// }else {
+// 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,8 +907,8 @@
try {
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
- "鎴愬搧搴撳叆搴撲笂鎶�",
- MesConstant.URL + MesConstant.PAKIN_URL,
+ "涓婃姤mes绯荤粺",
+ mesUrl +"/"+ mesPath,
null,
"127.0.0.1",
JSON.toJSONString(combParam),
--
Gitblit v1.9.1