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, 5 insertions(+), 4 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 1e4e397..63faab5 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -225,6 +225,7 @@
}
agvTaskCreateParam.setTaskCode(agvWrkMast.getWrkNo().toString());
switch (agvWrkMast.getIoType()) {
+ case 114:
case 108:
case 12:
agvTaskCreateParam.setTaskTyp("F06");
@@ -284,16 +285,16 @@
int code = Integer.parseInt(jsonObject.get("code").toString());
if(code != 0){
//TODO 寮犺秴
- //throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
- return code;
+ throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+ //return code;
}
success = true;
return code;
}catch (Exception e){
log.error(e.getMessage());
//TODO 寮犺秴
- //throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
- return 1;
+ throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+ //return 1;
}finally {
apiLogService.save(
namespace,
--
Gitblit v1.9.1