From e7d0bb7176bb8cb4966f5b32eb223285bd89426a Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 09 十二月 2024 08:46:24 +0800
Subject: [PATCH] 优化订单同步时间格式设置
---
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 46 ++++++++++++++++++++++++++++++----------------
1 files changed, 30 insertions(+), 16 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 88a8d08..05e33d0 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
@@ -48,7 +49,7 @@
add(101);
add(12);
add(53);
- add(101);
+ add(103);
add(108);
add(111);
add(112);
@@ -207,6 +208,7 @@
// if (!flowLogService.insert(flowLog)) {
// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
// }
+ log.info("53娣诲姞搴撳瓨鏃ュ織:{},{}", updateAnfme,JSON.toJSON(agvLocDetl));
agvLocDetlService.updateAnfme(updateAnfme, agvLocDetl.getLocNo(), agvLocDetl.getMatnr(), agvLocDetl.getBatch(), agvLocDetl.getThreeCode(), agvLocDetl.getDeadTime());
}
//AgvLocDetl agvLocDetl = agvLocDetlService.selectLocdetl(agvWrkMast.getLocNo(),agvWrkDetl.getMatnr(),agvWrkDetl.getBatch(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());
@@ -224,6 +226,7 @@
agvLocDetl.sync(agvWrkDetl);
agvLocDetl.setModiTime(now);
agvLocDetl.setAppeTime(now);
+ log.info("57娣诲姞搴撳瓨鏃ュ織:{}",JSON.toJSON(agvLocDetl));
if (!agvLocDetlService.insert(agvLocDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
@@ -289,6 +292,7 @@
locDetl.setLocNo(agvWrkMast.getLocNo());
locDetl.sync(agvWrkDetl);
locDetl.setModiTime(new Date());
+ log.info("112娣诲姞搴撳瓨鏃ュ織:{}",JSON.toJSON(locDetl));
agvLocDetlService.insert(locDetl);
}
// 鎺ラ┏浣� -- 搴撲綅
@@ -530,9 +534,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 +551,7 @@
return SUCCESS;
} catch (Exception e) {
//TODO
- log.error("淇敼AGV鍏ュ簱閫氱煡妗ｇ姸鎬佸叆鍑虹姸鎬佷负Y" + e.getMessage());
+ log.error("淇敼AGV鍏ュ簱閫氱煡妗ｇ姸鎬佸叆鍑虹姸鎬佷负Y,{}", e.getMessage());
}
return FAIL;
}
@@ -690,7 +701,7 @@
}
private void reportMes(AgvWrkMast agvWrkMast, List<AgvWrkDetl> agvWrkDetls) {
- if (!flag){
+ if (!flag) {
return;
}
if (Cools.isEmpty(agvWrkDetls)) {
@@ -699,14 +710,17 @@
//鍖哄垎涓嶅悓浠诲姟绫诲瀷鐨勪笂鎶ユ柟寮�
if (IN_TYPE_LIST.contains(agvWrkMast.getIoType())) {
- reportMesPakinOrder(agvWrkMast, agvWrkDetls);
+ String barcode = agvWrkMast.getBarcode();
+ if (barcode.startsWith("20") || barcode.startsWith("21") || barcode.startsWith("40")) {
+ reportMesPakinOrder(agvWrkMast, agvWrkDetls);
+ }
}
- if (OUT_TYPE_List.contains(agvWrkMast.getIoType())) {
- reportMesPakoutOrder(agvWrkMast, agvWrkDetls);
- }
- if (MOVE_TYPE_List.contains(agvWrkMast.getIoType())) {
- generateMesParam(agvWrkMast, agvWrkDetls);
- }
+// if (OUT_TYPE_List.contains(agvWrkMast.getIoType())) {
+// reportMesPakoutOrder(agvWrkMast, agvWrkDetls);
+// }
+// if (MOVE_TYPE_List.contains(agvWrkMast.getIoType())) {
+// generateMesParam(agvWrkMast, agvWrkDetls);
+// }
}
private void reportMesPakinOrder(AgvWrkMast agvWrkMast, List<AgvWrkDetl> agvWrkDetls) {
@@ -743,9 +757,9 @@
} else {
MesPakinReportParam mesPakinReportParam = new MesPakinReportParam();
- mesPakinReportParam.setInboundOrderCode(agvWrkDetl.getOrderNo());
+ //mesPakinReportParam.setInboundOrderCode(agvWrkDetl.getOrderNo());
mesPakinReportParam.setBizType("0");
- mesPakinReportParam.setInventoryAttr(new MesPakinReportParam.InventoryAttr(agvWrkDetl.getThreeCode().trim(), agvWrkDetl.getMatnr(), agvWrkMast.getLocNo()));
+ mesPakinReportParam.setInventoryAttr(new MesPakinReportParam.InventoryAttr(null, agvWrkDetl.getMatnr(), agvWrkMast.getLocNo()));
mesPakinReportParam.setNoQrCodeExecAmount(new MesPakinReportParam.NoQrCodeExecAmount(agvWrkDetl.getAnfme(), agvWrkDetl.getUnit(), null));
doHttpRequest(mesPakinReportParam, getMesTokenInfo(), "涓婃姤mes鍏ュ簱淇℃伅", url, pakinReportPath, null, "127.0.0.1");
@@ -865,7 +879,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