From 53f87c2ff10f7ab71d6b0340a5a4811089d7cd1e Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期五, 28 十一月 2025 17:17:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 66 +++++++++++++++++++++++++++++---
1 files changed, 59 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index e378cb2..bcba859 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -5,6 +5,7 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.param.*;
+import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
@@ -402,6 +403,9 @@
} catch (Exception e){
return R.error("鍗曟嵁缂栧彿[order_id]浠� "+sign_arm_sku+" 涓� "+sign_arm_order+" 浣滀负鎷嗗垎鏍囪鎷嗗垎澶辫触锛侊紒锛�");
}
+ if (param.getArm_no()>4){
+ return R.ok().add(true);
+ }
boolean taskArmWorkOrderSign = openService.TaskArmWorkOrderSign(param);
return R.ok().add(taskArmWorkOrderSign);
@@ -416,16 +420,34 @@
public synchronized R TaskAgvReport(@RequestHeader(required = false) String appkey,
@RequestBody TaskAgvReportParam param,
HttpServletRequest request) {
- auth(appkey, param, request);
+// auth(appkey, param, request);
+ // 鏃ュ織璁板綍
+ ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
+ apiLogService.save(
+ "AGV涓婃姤鎺ユ敹",
+ "/open/asrs/agv/task/v1/agvCallback",
+ null,
+ request.getRemoteAddr(),
+ JSON.toJSONString(param),
+ null,
+ true
+ );
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
if (Cools.isEmpty(param.getReqCode())) {
return R.error("WMS浠诲姟鍙穂reqCode]涓嶈兘涓虹┖");
}
- String reqCode = param.getReqCode();
- String[] split = reqCode.split("-");
- param.setTaskNo(Integer.parseInt(split[0]));
+ if (Cools.isEmpty(param.getTaskCode())) {
+ return R.error("WMS浠诲姟鍙穂reqCode]涓嶈兘涓虹┖");
+ }
+ String taskCode = param.getTaskCode();
+ if (taskCode == null || !taskCode.matches("^\\d+-.*$")) {
+ throw new CoolException("taskCode 鏍煎紡閿欒锛岄渶涓� 鏁板瓧-xxx锛屼緥濡� 123-ABC");
+ }
+
+ param.setTaskNo(Integer.parseInt(taskCode.substring(0, taskCode.indexOf("-"))));
+
// if (Cools.isEmpty(param.getTimestamp())) {
// return R.error("RGV浠诲姟鍙穂timestamp]涓嶈兘涓虹┖");
// }
@@ -465,9 +487,7 @@
HttpServletRequest request) {
auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
+
List<AgvLocListDetlParam> list = openService.getAgvLocList(param);
if (!list.isEmpty()) {
return R.ok(list);
@@ -494,4 +514,36 @@
return R.error("搴撲綅涓嶅瓨鍦ㄦ垨鏃犳槑缁�");
}
+ /**
+ * AGV鐢宠杩囧厜鏍�
+ */
+ @PostMapping("/agv/arm/grating/v1/agvCallback")
+ @AppAuth(memo = "AGV鐢宠杩囧厜鏍�")
+ public synchronized R agvGrating(@RequestHeader(required = false) String appkey,
+ @RequestBody AgvGoTheArnParam param,
+ HttpServletRequest request) {
+// auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getCurrentPositionCode())) {
+ return R.error("浣嶇疆[currentPositionCode]涓嶈兘涓虹┖");
+ }
+ boolean bindCtnrAndBin = true;
+ List<ArmAgvGratingParam> armList = param.getArmNo();
+ if (armList.isEmpty()){
+ return R.error("搴撲綅涓嶅瓨鍦ㄦ垨鏃犳槑缁�");
+ }
+ for (ArmAgvGratingParam arm : armList){
+ if (bindCtnrAndBin){
+ bindCtnrAndBin = openService.agvApplicationPassedTheGrating(arm);
+// System.out.println("璇锋眰閫氳繃鍏夋爡"+armNo);
+ }
+ }
+ if (bindCtnrAndBin) {
+ return new R(0,"鎴愬姛");
+ }
+ return R.error("搴撲綅涓嶅瓨鍦ㄦ垨鏃犳槑缁�");
+ }
+
}
--
Gitblit v1.9.1