From cc4e0bd14edeeb43268216f18c70be62e482b8f0 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 05 二月 2026 14:31:17 +0800
Subject: [PATCH] 初始化未完成
---
src/main/java/com/zy/asrs/controller/OpenController.java | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 151 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 7253df4..f9a2ea6 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -4,13 +4,17 @@
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.entity.result.TokenVo;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
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;
@@ -36,7 +40,21 @@
@Autowired
private OpenService openService;
- @PostMapping("/order/matSync/default/v2")
+ @PostMapping("/getToken")
+ public synchronized R getToken(@RequestBody(required = true) TokenParam param,
+ HttpServletRequest request){
+ authNew(param, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ TokenVo tokenVo = new TokenVo();
+ String token = Cools.enToken(System.currentTimeMillis() + param.getAppId(), param.getAppSecret());
+ tokenVo.setToken(token);
+ tokenVo.setValidTime(30);
+ return R.ok().add(tokenVo);
+ }
+
+ @PostMapping("/erp/mat/sync")
// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfoV2(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MatSyncParam.MatParam param,
@@ -180,6 +198,23 @@
}
}
+ private void authNew(TokenParam param, Object obj, HttpServletRequest request) {
+ log.info("{}鎺ュ彛琚闂紱appSecret:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", param.getAppSecret(), JSON.toJSONString(obj));
+ request.setAttribute("cache", obj);
+ if (!auth) {
+ return;
+ }
+ if (Cools.isEmpty(param.getAppId()) || Cools.isEmpty(param.getAppSecret())) {
+ throw new CoolException("璁よ瘉澶辫触锛岃纭appId鍜宎ppSecret鏃犺锛�");
+ }
+ if (!param.getAppId().contains("FNWMS")){
+ throw new CoolException("璁よ瘉澶辫触锛岃纭appId鏃犺锛�");
+ }
+ if (!APP_KEY_LIST.contains(param.getAppSecret())) {
+ throw new CoolException("璁よ瘉澶辫触锛岃纭appSecret鏃犺锛�");
+ }
+ }
+
public static void main(String[] args) {
// 1
System.out.println("======================================");
@@ -247,9 +282,9 @@
if (Cools.isEmpty(param.getItem())) {
return R.error("UPC[item]涓嶈兘涓虹┖");
}
-// if (Cools.isEmpty(param.getSupplier())) {
-// return R.error("璐ф簮[supplier]涓嶈兘涓虹┖");
-// }
+ if (Cools.isEmpty(param.getSupplier())) {
+ return R.error("璐ф簮[supplier]涓嶈兘涓虹┖");
+ }
if (Cools.isEmpty(param.getStaNo())) {
return R.error("鍒嗘嫞鐐逛綅[staNo]涓嶈兘涓虹┖");
}
@@ -331,6 +366,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 +435,10 @@
} 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);
return R.ok();
@@ -402,6 +468,9 @@
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){
+ return R.ok().add(true);
}
boolean taskArmWorkOrderSign = openService.TaskArmWorkOrderSign(param);
@@ -439,14 +508,15 @@
return R.error("WMS浠诲姟鍙穂reqCode]涓嶈兘涓虹┖");
}
String taskCode = param.getTaskCode();
- String[] split = taskCode.split("-");
- param.setTaskNo(Integer.parseInt(split[0]));
-// if (Cools.isEmpty(param.getTimestamp())) {
-// return R.error("RGV浠诲姟鍙穂timestamp]涓嶈兘涓虹┖");
-// }
+ if (taskCode == null || !taskCode.matches("^\\d+-.*$")) {
+ throw new CoolException("taskCode 鏍煎紡閿欒锛岄渶涓� 鏁板瓧-xxx锛屼緥濡� 123-ABC");
+ }
+
+ param.setTaskNo(Integer.parseInt(taskCode.substring(0, taskCode.indexOf("-"))));
boolean taskAgvReport = openService.TaskAgvReport(param);
if (taskAgvReport){
- return R.ok();
+// agvBindAndBin(String.valueOf(param.getTaskNo()));
+ return new R(0,"鎴愬姛");
}
return R.error("浠诲姟鍙蜂笉瀛樺湪");
}
@@ -480,10 +550,25 @@
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);
+ }
+ 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);
}
@@ -509,4 +594,57 @@
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) {
+ 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