From b1ab4be395a104f6e1bb25249e0b93c520080053 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 01 十二月 2025 13:51:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index e5847dc..f830bdc 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -374,6 +374,9 @@
} catch (Exception e){
return R.error("鍗曟嵁缂栧彿[order_id]浠� "+sign_arm_sku+" 涓� "+sign_arm_order+" 浣滀负鎷嗗垎鏍囪鎷嗗垎澶辫触锛侊紒锛�");
}
+ if (param.getArm_no()>4){
+ return R.ok();
+ }
openService.taskArmWorkOrderStatus(param);
return R.ok();
@@ -451,7 +454,7 @@
boolean taskAgvReport = openService.TaskAgvReport(param);
if (taskAgvReport){
agvBindAndBin(String.valueOf(param.getTaskNo()));
- return R.ok();
+ return new R(0,"鎴愬姛");
}
return R.error("浠诲姟鍙蜂笉瀛樺湪");
}
@@ -551,7 +554,7 @@
Thread.sleep(500);
openService.agvBindAndBin(taskNo);
} catch (Exception e) {
- log.error("寮傛澶勭悊AGV鍏夋爡鍚庣画閫昏緫澶辫触", e);
+ log.error("寮傛澶勭悊AGV鎼繍鍚庣画閫昏緫澶辫触", e);
}
}
--
Gitblit v1.9.1