From 30730084c35b2cc09268e6b630324c7964a4d2fc Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 26 十一月 2024 08:48:49 +0800
Subject: [PATCH] 优化任务状态更新逻辑
---
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 9 +++++----
src/main/java/com/zy/asrs/service/AgvWrkMastService.java | 2 +-
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 8 ++++----
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/AgvWrkMastService.java b/src/main/java/com/zy/asrs/service/AgvWrkMastService.java
index 27fa643..2d072dd 100644
--- a/src/main/java/com/zy/asrs/service/AgvWrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/AgvWrkMastService.java
@@ -8,7 +8,7 @@
public interface AgvWrkMastService extends IService<AgvWrkMast> {
- public void updateWrkStsByWrkNo(int wrkNo, long wrkSts);
+ public Boolean updateWrkStsByWrkNo(int wrkNo, long wrkSts);
public void updateWrkStsByWrkNo(int wrkNo, long wrkSts,String manuType,long userId);
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 f9f4675..230cf7c 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -63,13 +63,13 @@
private AgvWrkMastService agvWrkMastService;
- public void updateWrkStsByWrkNo(int wrkNo, long wrkSts) {
+ public Boolean updateWrkStsByWrkNo(int wrkNo, long wrkSts) {
AgvWrkMast agvWrkMast = this.selectById(wrkNo);
//鍒ゆ柇瑕佷慨鏀圭殑宸ヤ綔妗ｇ姸鎬佹槸鍚﹀悎鐞嗭紝濡傛灉涓嶅悎鐞嗗垯鎶涘嚭寮傚父
checkWrkSts(agvWrkMast, wrkSts);
agvWrkMast.setWrkSts(wrkSts);
agvWrkMast.setModiTime(new Date());
- this.updateById(agvWrkMast);
+ return this.updateById(agvWrkMast);
}
public void updateWrkStsByWrkNo(int wrkNo, long wrkSts, String manuType, long userId) {
@@ -284,7 +284,7 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- code = Integer.parseInt(jsonObject.get("code").toString());
+ code = Integer.parseInt(jsonObject.get("code").toString());
if (code != 0) {
if (code == 6) {
log.info("AGV浠诲姟鍗曞彿宸蹭笂鎶�:{}", response);
@@ -304,7 +304,7 @@
throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
//return 1;
} finally {
- if(code !=6){
+ if (code != 6) {
apiLogService.save(
namespace,
url + path,
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 3b072b0..69403df 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -531,13 +531,14 @@
throw new CoolException("浠诲姟涓嬪彂澶辫触");
}
- agvWrkMast.setWrkSts(202L);
- agvWrkMast.setModiTime(new Date());
- boolean b = 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 {
+ } else {
log.info("鏇存柊浠诲姟鐘舵�佹垚鍔�,{}", agvWrkMast.getWrkNo());
}
if (agvWrkMast.getIoType() == 1) {
--
Gitblit v1.9.1