From 147fcf9b349bd7314f6488a2c197d91fe6eb86a8 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期五, 30 九月 2022 18:23:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 50 ++++++++++++++++++++++++++++++++------------------
1 files changed, 32 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 f9bc14d..0dcd93f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -86,12 +86,17 @@
@Value("${mes.url}")
private String mesUrl;
+ @Value("${ren.url}")
+ private String renUrl;
- @Value("${mes.startUpTestPACK}")
+ @Value("${ren.startUpTestPACK}")
private String startUpTestPACK;
- @Value("${mes.startUpTestPACK}")
+ @Value("${ren.startUpTestPACK}")
private String suspendTestPACK;
+
+ @Value("${mes.inPath}")
+ private String inpath;
@@ -210,10 +215,10 @@
@Override
public void onSale(CombParam param) {
// 鑾峰彇搴撲綅鍙�
- String locno = param.getLocno();
- Node node = nodeService.selectByUuid(locno);
+ String locNo = param.getLocNo();
+ Node node = nodeService.selectByUuid(locNo);
if (Cools.isEmpty(node)) {
- throw new CoolException(param.getLocno() + ":搴撲綅涓嶅瓨鍦�");
+ throw new CoolException(param.getLocNo() + ":搴撲綅涓嶅瓨鍦�");
}
// 鑾峰彇鍟嗗搧鍒楄〃
@@ -229,7 +234,7 @@
throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鎵瑰彿鏈夎锛�");
}
ManLocDetl manLocDetl = new ManLocDetl();
- manLocDetl.setLocNo(locno);
+ manLocDetl.setLocNo(locNo);
manLocDetl.setNodeId(node.getId());
manLocDetl.setMatnr(combMat.getMatnr());
manLocDetl.setBatch(combMat.getBatch());
@@ -638,6 +643,14 @@
}
locMast.setPackStatus(1);
locMast.setModiTime(now);
+
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(locMast.getBarcode());
+ combParam.setLocNo(locMast.getLocNo());
+ combParam.setPackSts(1);
+ combParam.setRequestTime(DateUtils.convert(new Date()));
+ postMesData(mesUrl,inpath,combParam);
+
if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){
throw new CoolException("鐢宠娴嬭瘯澶辫触");
}
@@ -656,9 +669,9 @@
CombParam combParam = new CombParam();
combParam.setPackNo(testMast.getLocNo());
combParam.setPackName(testMast.getUserId());
- combParam.setLocno(testMast.getBarcode());
+ combParam.setLocNo(testMast.getBarcode());
combParam.setRequestTime(DateUtils.convert(new Date()));
- return postMesData(startUpTestPACK,combParam);
+ return postMesData(renUrl,startUpTestPACK,combParam);
}catch (Exception e) {
log.error("fail", e);
e.printStackTrace();
@@ -672,7 +685,7 @@
Review review=new Review();
review.setPause(true);
review.setRequestTime(DateUtils.convert(new Date()));
- return postMesData(suspendTestPACK,review);
+ return postMesData(renUrl,suspendTestPACK,review);
}catch (Exception e) {
log.error("fail", e);
e.printStackTrace();
@@ -681,16 +694,17 @@
}
}
- private ReturnT<String> postMesData(String mesPath,Object combParam){
+ private ReturnT<String> postMesData(String URL,String Path,Object combParam){
if(combParam != null){
String response = "";
boolean success = false;
try {
- Map<String, Object> map = new HashMap<>();
- map.put("appkey","ea1f0459efc02a79f046f982767939ae");
- response = new HttpHandler.Builder().setHeaders(map)
- .setUri(mesUrl)
- .setPath(mesPath)
+// Map<String, Object> map = new HashMap<>();
+// map.put("appkey","ea1f0459efc02a79f046f982767939ae");
+ response = new HttpHandler.Builder()
+// .setHeaders(map)
+ .setUri(URL)
+ .setPath(Path)
.setJson(JSON.toJSONString(combParam))
.build()
.doPost();
@@ -701,11 +715,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锛歿}", URL+Path, 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锛歿}", URL+Path, JSON.toJSONString(combParam), response);
throw new CoolException("涓婃姤mes绯荤粺澶辫触");
}
} catch (Exception e) {
@@ -717,7 +731,7 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"鎴愬搧搴撳叆搴撲笂鎶�",
- MesConstant.URL + MesConstant.PAKIN_URL,
+ URL + Path,
null,
"127.0.0.1",
JSON.toJSONString(combParam),
--
Gitblit v1.9.1