From 2fbf3adb37334f90c29b1f119f0652f37a2608dc Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 19 十一月 2024 10:03:17 +0800
Subject: [PATCH] #优化
---
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 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 e3f57a5..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");
@@ -234,13 +238,27 @@
}
break;
case 1:
+ case 57:
// 鍏ュ簱浠诲姟鏄彧鏈� 鎺ラ┏浣� -- > 搴撲綅
AgvLocMast loc = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvWrkMast.getLocNo()));
String locSub = loc.getLocNo().substring(loc.getLocNo().length() - 4).substring(0, 2).substring(0, 2);
+ AgvBasDevp agvBasDevp = agvBasDevpService.selectByDevNo(agvWrkMast.getSourceLocNo());
if ("02".equals(locSub)) {
- agvTaskCreateParam.setTaskTyp("F06");
+ if (agvBasDevp.getFloor() == 4) {
+ agvTaskCreateParam.setTaskTyp("F01");
+ } else {
+ agvTaskCreateParam.setTaskTyp("F06");
+ }
+
} else {
- agvTaskCreateParam.setTaskTyp("F01");
+ // 鐩爣妤煎眰浣�1妤� 浣嗘簮搴撲綅锛堟帴椹充綅锛夊湪鍚稿浜屾ゼ
+ if (agvBasDevp.getFloor() == 4) {
+ agvTaskCreateParam.setTaskTyp("F06");
+ } else {
+ agvTaskCreateParam.setTaskTyp("F01");
+ }
+
+
}
break;
default:
@@ -255,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)
@@ -267,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