From 07fc18f77a9764bd47857e30d65abc03cc1e439c Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 16:21:56 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
index 51e73eb..63faab5 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -67,6 +67,7 @@
//鍒ゆ柇瑕佷慨鏀圭殑宸ヤ綔妗ｇ姸鎬佹槸鍚﹀悎鐞嗭紝濡傛灉涓嶅悎鐞嗗垯鎶涘嚭寮傚父
checkWrkSts(agvWrkMast,wrkSts);
agvWrkMast.setWrkSts(wrkSts);
+ agvWrkMast.setModiTime(new Date());
this.updateById(agvWrkMast);
}
@@ -108,6 +109,8 @@
AgvLocMast locMast = agvCommonService.getLocNo(basDevp.getLocType1(),basDevp.getFloor(),false,true);
agvWrkMast.setLocNo(locMast.getLocNo());
agvWrkMast.setWrkSts(201L);
+ agvWrkMast.setLogErrMemo("startAllcationIn");
+ agvWrkMast.setModiTime(new Date());
agvWrkMastService.updateById(agvWrkMast);
// 鏇寸洰鏍囧簱浣�
locMast.setLocSts("S");
@@ -222,6 +225,7 @@
}
agvTaskCreateParam.setTaskCode(agvWrkMast.getWrkNo().toString());
switch (agvWrkMast.getIoType()) {
+ case 114:
case 108:
case 12:
agvTaskCreateParam.setTaskTyp("F06");
@@ -269,7 +273,6 @@
private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip){
String response = "";
boolean success = false;
-
try {
response = new HttpHandler.Builder()
.setUri(url)
@@ -281,13 +284,17 @@
int code = Integer.parseInt(jsonObject.get("code").toString());
if(code != 0){
+ //TODO 寮犺秴
throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+ //return code;
}
success = true;
return code;
}catch (Exception e){
log.error(e.getMessage());
+ //TODO 寮犺秴
throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+ //return 1;
}finally {
apiLogService.save(
namespace,
--
Gitblit v1.9.1