From 43bf799fc85e18923480b5877e01b46dab28606f Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期六, 13 八月 2022 16:19:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 75 ++++---------------------------------
1 files changed, 9 insertions(+), 66 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index eeaf75d..a9d19e0 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -3,30 +3,24 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.entity.param.Review;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.MobileServiceImpl;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.constant.MesConstant;
-import com.zy.common.model.MesPakinParam;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
-import net.sf.jsqlparser.parser.JJTCCJSqlParserState;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
/**
* Created by vincent on 2020/7/6
@@ -44,17 +38,9 @@
@Autowired
private WrkDetlLogService wrkDetlLogService;
@Autowired
- private WaitPakinService waitPakinService;
- @Autowired
- private WaitPakinLogService waitPakinLogService;
- @Autowired
- private OrderService orderService;
- @Autowired
private ApiLogService apiLogService;
@Autowired
private LocMastService locMastService;
-
- private MobileServiceImpl mobileService;
@Value("${mes.url}")
private String mesUrl;
@@ -64,9 +50,6 @@
@Value("${mes.outPath}")
private String outPath;
-
- @Value("${mes.startUpTestPACK}")
- private String startUpTestPACK;
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
@@ -88,7 +71,7 @@
combParam.setLocno(wrkMast.getLocNo());
combParam.setPackSts(1);
combParam.setRequestTime(DateUtils.convert(new Date()));
- result = postMesData(inpath,1,combParam);
+ result = postMesData(inpath,combParam);
}
} else if (wrkMast.getWrkSts() == 15 && wrkMast.getIoType() == 101){
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
@@ -103,9 +86,9 @@
combParam.setPackNo(wrkDetl.getZpallet());
combParam.setPackName(wrkDetl.getMatnr());
combParam.setLocno(wrkMast.getLocNo());
- combParam.setPackSts(1);
+ combParam.setPackSts(null);
combParam.setRequestTime(DateUtils.convert(new Date()));
- result = postMesData(outPath,2,combParam);
+ result = postMesData(outPath,combParam);
}
}
if(null != result && !result.isSuccess()){
@@ -142,12 +125,14 @@
/*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
- private ReturnT<String> postMesData(String mesPath,int a,Object combParam){
+ private ReturnT<String> postMesData(String mesPath,Object combParam){
if(combParam != null){
String response = "";
boolean success = false;
try {
- response = new HttpHandler.Builder()
+ Map<String, Object> map = new HashMap<>();
+ map.put("appkey","ea1f0459efc02a79f046f982767939ae");
+ response = new HttpHandler.Builder().setHeaders(map)
.setUri(mesUrl)
.setPath(mesPath)
.setJson(JSON.toJSONString(combParam))
@@ -155,18 +140,7 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
- if (a==4 && a==3){
- 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 {
- success = true;
- }
+ success = true;
} else {
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(combParam), response);
throw new CoolException("涓婃姤mes绯荤粺澶辫触");
@@ -191,37 +165,6 @@
}
}
return SUCCESS;
- }
-
- @Transactional
- public ReturnT<String> startUpTestPACK(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(outPath,3,combParam);
- }catch (Exception e) {
- log.error("fail", e);
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- }
- }
- @Transactional
- public ReturnT<String> suspendTestPACK(){
- try {
- Review review=new Review();
- review.setPause(true);
- review.setRequestTime(DateUtils.convert(new Date()));
- return postMesData(outPath,4,review);
- }catch (Exception e) {
- log.error("fail", e);
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- }
}
/*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
}
--
Gitblit v1.9.1