From bd3f1b6d3b0dd7429b6f3974f88e0890a401d968 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期五, 12 十二月 2025 11:55:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 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 f830bdc..e369e5e 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -332,6 +332,33 @@
/**
+ * 鎵樼洏灏辩华鐘舵�佹煡璇�
+ */
+ @PostMapping("/arm/task/loc_status")
+ @AppAuth(memo = "鎵樼洏灏辩华鐘舵�佹煡璇�")
+ public synchronized R TaskArmLocStatus(@RequestHeader(required = false) String appkey,
+ @RequestBody ArmOKParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getArmNo())) {
+ return R.error("鏈烘鑷傜紪鍙穂armNo]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getStaNo())) {
+ return R.error("绔欑偣缂栧彿[staNo]涓嶈兘涓虹┖");
+ }
+
+ boolean taskArmLocStatus = openService.TaskArmLocStatus(param);
+ if (taskArmLocStatus){
+ return new R(200,"OK").add(true);
+ }
+ return R.error("涓嶇鍚�").add(false);
+ }
+
+
+ /**
* 寮傚父涓婃姤
*/
@PostMapping("/armAbnormalOperation")
@@ -375,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();
}
@@ -453,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("浠诲姟鍙蜂笉瀛樺湪");
@@ -551,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