From 53ca017d46403700cabc775fc4dbd89f8ebdef78 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期六, 13 十二月 2025 13:35:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/controller/OpenController.java | 5 +++--
1 files changed, 3 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 fabb4a2..e369e5e 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -402,6 +402,7 @@
return R.error("鍗曟嵁缂栧彿[order_id]浠� "+sign_arm_sku+" 涓� "+sign_arm_order+" 浣滀负鎷嗗垎鏍囪鎷嗗垎澶辫触锛侊紒锛�");
}
if (param.getArm_no()>4){
+ openService.taskArmOrderResult(param);
return R.ok();
}
@@ -480,7 +481,7 @@
param.setTaskNo(Integer.parseInt(taskCode.substring(0, taskCode.indexOf("-"))));
boolean taskAgvReport = openService.TaskAgvReport(param);
if (taskAgvReport){
- agvBindAndBin(String.valueOf(param.getTaskNo()));
+// agvBindAndBin(String.valueOf(param.getTaskNo()));
return new R(0,"鎴愬姛");
}
return R.error("浠诲姟鍙蜂笉瀛樺湪");
@@ -578,7 +579,7 @@
@Async
public void agvBindAndBin(String taskNo) {
try {
- Thread.sleep(500);
+ Thread.sleep(1000);
openService.agvBindAndBin(taskNo);
} catch (Exception e) {
log.error("寮傛澶勭悊AGV鎼繍鍚庣画閫昏緫澶辫触", e);
--
Gitblit v1.9.1