From f245b2ecba9428659f2a8fb3e1f3d23bddda1218 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 18 十二月 2025 16:22:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 4 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..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;
@@ -332,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")
@@ -373,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);
@@ -450,8 +483,8 @@
param.setTaskNo(Integer.parseInt(taskCode.substring(0, taskCode.indexOf("-"))));
boolean taskAgvReport = openService.TaskAgvReport(param);
if (taskAgvReport){
- agvBindAndBin(String.valueOf(param.getTaskNo()));
- return R.ok();
+// agvBindAndBin(String.valueOf(param.getTaskNo()));
+ return new R(0,"鎴愬姛");
}
return R.error("浠诲姟鍙蜂笉瀛樺湪");
}
@@ -487,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);
}
@@ -548,10 +598,10 @@
@Async
public void agvBindAndBin(String taskNo) {
try {
- Thread.sleep(500);
+ Thread.sleep(1000);
openService.agvBindAndBin(taskNo);
} catch (Exception e) {
- log.error("寮傛澶勭悊AGV鍏夋爡鍚庣画閫昏緫澶辫触", e);
+ log.error("寮傛澶勭悊AGV鎼繍鍚庣画閫昏緫澶辫触", e);
}
}
--
Gitblit v1.9.1