From dfce0d94a7ed3fa1fe324359a788f0ad2f781803 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 24 十一月 2022 15:37:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 36 +++++++++++++++---------------------
1 files changed, 15 insertions(+), 21 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 2303def..2b9f511 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -71,32 +71,26 @@
combParam.setRequestTime(DateUtils.convert(new Date()));
result = postMesData(inpath,combParam);
// 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
- if (!waitPakinLogService.save(wrkMast.getBarcode())) {
- exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- // 鍒犻櫎鍏ュ簱閫氱煡妗�
- if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
- exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+ WaitPakin pakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
+ if (pakin!=null){
+ if (!waitPakinLogService.save(wrkMast.getBarcode())) {
+ exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
+ // 鍒犻櫎鍏ュ簱閫氱煡妗�
+ if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
+ exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
}
}
} else if (wrkMast.getWrkSts() == 15 && wrkMast.getIoType() == 101){
if(wrkDetl != null){
CombParam combParam = new CombParam();
combParam.setPackNo(wrkDetl.getZpallet());
- combParam.setPackName(wrkDetl.getMatnr());
- combParam.setLocNo(wrkMast.getLocNo());
- combParam.setPackSts(0);
+// combParam.setPackName(wrkDetl.getMatnr());
+ combParam.setLocNo(wrkMast.getSourceLocNo());
+// combParam.setPackSts(0);
combParam.setRequestTime(DateUtils.convert(new Date()));
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()){
@@ -149,7 +143,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) {
@@ -160,8 +154,8 @@
try {
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
- "鎴愬搧搴撳叆搴撲笂鎶�",
- MesConstant.URL + MesConstant.PAKIN_URL,
+ "涓婃姤mes绯荤粺",
+ mesUrl + mesPath,
null,
"127.0.0.1",
JSON.toJSONString(combParam),
--
Gitblit v1.9.1