From 6827eba9c63451de02dc0b90451d64c31a06068f Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 15 十二月 2025 13:58:45 +0800
Subject: [PATCH] #supplier逻辑组托
---
src/main/java/com/zy/asrs/controller/OpenController.java | 79 +++++++++++++++++++++++++++++++++++++--
1 files changed, 74 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index bcba859..09e211b 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -4,6 +4,8 @@
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OpenService;
@@ -11,6 +13,7 @@
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
@@ -331,6 +334,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")
@@ -372,6 +402,10 @@
param.OrderIdTwo(sign_arm_order,sign_arm_sku);
} catch (Exception e){
return R.error("鍗曟嵁缂栧彿[order_id]浠� "+sign_arm_sku+" 涓� "+sign_arm_order+" 浣滀负鎷嗗垎鏍囪鎷嗗垎澶辫触锛侊紒锛�");
+ }
+ if (param.getArm_no()>4){
+ openService.taskArmOrderResult(param);
+ return R.ok();
}
openService.taskArmWorkOrderStatus(param);
@@ -447,13 +481,10 @@
}
param.setTaskNo(Integer.parseInt(taskCode.substring(0, taskCode.indexOf("-"))));
-
-// if (Cools.isEmpty(param.getTimestamp())) {
-// return R.error("RGV浠诲姟鍙穂timestamp]涓嶈兘涓虹┖");
-// }
boolean taskAgvReport = openService.TaskAgvReport(param);
if (taskAgvReport){
- return R.ok();
+// agvBindAndBin(String.valueOf(param.getTaskNo()));
+ return new R(0,"鎴愬姛");
}
return R.error("浠诲姟鍙蜂笉瀛樺湪");
}
@@ -489,6 +520,23 @@
List<AgvLocListDetlParam> list = openService.getAgvLocList(param);
+ if (!list.isEmpty()) {
+ return R.ok(list);
+ }
+ return R.error("搴撲綅涓嶅瓨鍦ㄦ垨鏃犳槑缁�");
+ }
+
+ /**
+ * PDA妫�绱㈢洏鐐规暟閲�
+ */
+ @PostMapping("/pick/v1/getPickList")
+ @AppAuth(memo = "PDA妫�绱㈢洏鐐规暟閲�")
+ public synchronized R getPickList(@RequestHeader(required = false) String appkey,
+ @RequestBody PdaPickListParam param,
+ HttpServletRequest request) {
+// auth(appkey, param, request);
+
+ List<PickWrkDetlListParam> list = openService.getPickList(param);
if (!list.isEmpty()) {
return R.ok(list);
}
@@ -541,9 +589,30 @@
}
}
if (bindCtnrAndBin) {
+ asyncProcessAfterValidation(param);
return new R(0,"鎴愬姛");
}
return R.error("搴撲綅涓嶅瓨鍦ㄦ垨鏃犳槑缁�");
}
+ @Async
+ public void agvBindAndBin(String taskNo) {
+ try {
+ Thread.sleep(1000);
+ openService.agvBindAndBin(taskNo);
+ } catch (Exception e) {
+ log.error("寮傛澶勭悊AGV鎼繍鍚庣画閫昏緫澶辫触", e);
+ }
+ }
+
+ @Async
+ public void asyncProcessAfterValidation(AgvGoTheArnParam param) {
+ try {
+ Thread.sleep(500);
+ openService.agvApplicationPassedTheGrating(param);
+ } catch (Exception e) {
+ log.error("寮傛澶勭悊AGV鍏夋爡鍚庣画閫昏緫澶辫触", e);
+ }
+ }
+
}
--
Gitblit v1.9.1