From c45d612c0673c5037a12b4a7514b5c52e7ecdbe9 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 26 十一月 2024 11:14:03 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index 5f13e3c..69403df 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -26,6 +26,7 @@
import java.io.IOException;
import java.util.*;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@Slf4j
@@ -530,9 +531,16 @@
throw new CoolException("浠诲姟涓嬪彂澶辫触");
}
- agvWrkMast.setWrkSts(202L);
- agvWrkMast.setModiTime(new Date());
- agvWrkMastService.updateById(agvWrkMast);
+ //agvWrkMast.setWrkSts(202L);
+ //agvWrkMast.setModiTime(new Date());
+ //boolean b = agvWrkMastService.updateById(agvWrkMast);
+ boolean b = agvWrkMastService.updateWrkStsByWrkNo(Math.abs(agvWrkMast.getWrkNo()), 202L);
+ if (!b) {
+ log.info("鏇存柊浠诲姟鐘舵�佸け璐�,{}", agvWrkMast.getWrkNo());
+ throw new CoolException("鏇存柊浠诲姟鐘舵�佸け璐�");
+ } else {
+ log.info("鏇存柊浠诲姟鐘舵�佹垚鍔�,{}", agvWrkMast.getWrkNo());
+ }
if (agvWrkMast.getIoType() == 1) {
//淇敼AGV鍏ュ簱閫氱煡妗ｇ姸鎬佸叆鍑虹姸鎬佷负Y
agvWaitPakinService.updateIoStatus(agvWrkMast.getWrkNo(), "Y");
@@ -540,7 +548,7 @@
return SUCCESS;
} catch (Exception e) {
//TODO
- log.error("淇敼AGV鍏ュ簱閫氱煡妗ｇ姸鎬佸叆鍑虹姸鎬佷负Y" + e.getMessage());
+ log.error("淇敼AGV鍏ュ簱閫氱煡妗ｇ姸鎬佸叆鍑虹姸鎬佷负Y,{}", e.getMessage());
}
return FAIL;
}
@@ -746,7 +754,7 @@
} else {
MesPakinReportParam mesPakinReportParam = new MesPakinReportParam();
- mesPakinReportParam.setInboundOrderCode(agvWrkDetl.getOrderNo());
+ //mesPakinReportParam.setInboundOrderCode(agvWrkDetl.getOrderNo());
mesPakinReportParam.setBizType("0");
mesPakinReportParam.setInventoryAttr(new MesPakinReportParam.InventoryAttr(null, agvWrkDetl.getMatnr(), agvWrkMast.getLocNo()));
mesPakinReportParam.setNoQrCodeExecAmount(new MesPakinReportParam.NoQrCodeExecAmount(agvWrkDetl.getAnfme(), agvWrkDetl.getUnit(), null));
@@ -868,7 +876,7 @@
boolean success = false;
try {
- response = new HttpHandler.Builder().setUri(url).setPath(path).setHeaders(headParam).setJson(JSONObject.toJSONString(requestParam)).setHttps(true).build().doPost();
+ response = new HttpHandler.Builder().setUri(url).setPath(path).setTimeout(30, TimeUnit.SECONDS).setHeaders(headParam).setJson(JSONObject.toJSONString(requestParam)).setHttps(true).build().doPost();
JSONObject jsonObject = JSON.parseObject(response);
if (Cools.isEmpty(jsonObject.get("code")) || Integer.parseInt(jsonObject.get("code").toString()) != 200) {
--
Gitblit v1.9.1