From 5b4989a3e8dc144da636f1a8b84206e0f4ba76f3 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期四, 06 十月 2022 20:38:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 addbfdb..dd40d38 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -65,11 +65,11 @@
if(wrkDetl != null){
CombParam combParam = new CombParam();
combParam.setPackNo(wrkDetl.getZpallet());
- combParam.setPackName(wrkDetl.getMatnr());
- combParam.setLocno(wrkMast.getLocNo());
+// combParam.setPackName(wrkDetl.getMatnr());
+ combParam.setLocNo(wrkMast.getLocNo());
combParam.setPackSts(1);
combParam.setRequestTime(DateUtils.convert(new Date()));
-// result = postMesData(inpath,combParam);
+ result = postMesData(inpath,combParam);
// 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
if (!waitPakinLogService.save(wrkMast.getBarcode())) {
exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo());
@@ -84,10 +84,19 @@
CombParam combParam = new CombParam();
combParam.setPackNo(wrkDetl.getZpallet());
combParam.setPackName(wrkDetl.getMatnr());
- combParam.setLocno(wrkMast.getLocNo());
+ combParam.setLocNo(wrkMast.getLocNo());
combParam.setPackSts(0);
combParam.setRequestTime(DateUtils.convert(new Date()));
-// result = postMesData(outPath,combParam);
+ result = postMesData(outPath,combParam);
+ }
+ }else if(wrkMast.getWrkSts() == 4 && wrkMast.getIoType() == 11){
+ if(wrkDetl != null){
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(wrkDetl.getZpallet());
+ combParam.setLocNo(wrkMast.getLocNo());
+ combParam.setPackSts(5);
+ combParam.setRequestTime(DateUtils.convert(new Date()));
+ result = postMesData(inpath,combParam);
}
}
if(null != result && !result.isSuccess()){
@@ -140,7 +149,7 @@
if (jsonObject.getInteger("code").equals(200)) {
success = true;
} 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) {
@@ -152,7 +161,7 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"鎴愬搧搴撳叆搴撲笂鎶�",
- MesConstant.URL + MesConstant.PAKIN_URL,
+ mesUrl + mesPath,
null,
"127.0.0.1",
JSON.toJSONString(combParam),
--
Gitblit v1.9.1