From f548bd5e0c9e73f56fffa528ef14d92599a71cce Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期四, 06 十月 2022 20:33:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 89 +++++++++++++++++++++++---------------------
1 files changed, 46 insertions(+), 43 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 7ef3992..d7642fc 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());
@@ -618,19 +623,22 @@
@Transactional
public void startUpTestPACK(TestMast testMast) {
- //鍚姩娴嬭瘯璇锋眰
-// ReturnT<String> result=startUpTestPACK1(testMast);
-// if (!result.isSuccess()) {
-// log.error("娴嬭瘯鐢宠澶辫触", testMast.getBarcode());
-// throw new CoolException("娴嬭瘯鐢宠澶辫触");
-// }
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()));
+// 鍚姩娴嬭瘯璇锋眰
+ ReturnT<String> result=startUpTestPACK1(testMast);
+ if (!result.isSuccess()) {
+ log.error("娴嬭瘯鐢宠澶辫触", testMast.getBarcode());
+ throw new CoolException("娴嬭瘯鐢宠澶辫触");
+ }
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no", testMast.getLocNo())
+ );
if (Cools.isEmpty(locMast)) {
throw new CoolException(BaseRes.PARAM);
}
Date now = new Date();
testMast.setStatus(1);
+ testMast.setChannel(locMast.getChannel());
testMast.setModiTime(now);
testMast.setAppeTime(now);
if (!testMastService.insert(testMast)){
@@ -638,6 +646,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("鐢宠娴嬭瘯澶辫触");
}
@@ -653,12 +669,12 @@
@Transactional
public ReturnT<String> startUpTestPACK1(TestMast testMast){
try {
- CombParam combParam = new CombParam();
- combParam.setPackNo(testMast.getLocNo());
- combParam.setPackName(testMast.getUserId());
- combParam.setLocno(testMast.getBarcode());
- combParam.setRequestTime(DateUtils.convert(new Date()));
- return postMesData(startUpTestPACK,combParam);
+ Review review=new Review();
+ review.setLocNo(testMast.getLocNo());
+ review.setUserId(testMast.getUserId());
+ review.setBarcode(testMast.getBarcode());
+ review.setRequestTime(DateUtils.convert(new Date()));
+ return postMesData(renUrl,startUpTestPACK,review);
}catch (Exception e) {
log.error("fail", e);
e.printStackTrace();
@@ -672,7 +688,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 +697,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 +718,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 +734,7 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"鎴愬搧搴撳叆搴撲笂鎶�",
- MesConstant.URL + MesConstant.PAKIN_URL,
+ URL + Path,
null,
"127.0.0.1",
JSON.toJSONString(combParam),
@@ -728,20 +745,6 @@
}
}
return SUCCESS;
- }
- @Transactional
- public void transplant(Review review){
- //绉诲簱寮�濮嬶紝鏌ヨ鐩爣搴撲綅
- LocMast targetLocNo = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("row1",2)
- .eq("loc_sts","O")
- .eq("fire_status", 0)
- .eq("pack_status",0));
- if (targetLocNo != null){
- workService.locMove(review.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(review.getUserId()));
- }else {
- throw new CoolException("娌℃湁绌哄簱浣�");
- }
}
/*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
}
--
Gitblit v1.9.1