From 4b48448c784d80cfbaff4840b9c6a4c1866a5979 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 23 十月 2025 09:27:25 +0800
Subject: [PATCH] 接口文档更新，三方日志记录
---
src/main/java/com/zy/asrs/controller/OpenController.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 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 961d675..2e137c7 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.annotations.AppAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
@@ -9,10 +10,18 @@
import com.zy.asrs.domain.param.ApplyInDevpDto;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CrnStatusParam;
+import com.zy.asrs.entity.param.PreStoragePallet;
import com.zy.asrs.entity.param.TaskCreateParam;
import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.OpenServiceImpl;
import com.zy.common.web.BaseController;
+import com.zy.core.DevpThread;
+import com.zy.core.cache.MessageQueue;
+import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.SlaveType;
+import com.zy.core.model.Task;
+import com.zy.core.model.protocol.StaProtocol;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -52,7 +61,33 @@
@Autowired
private BasCrnErrorService basCrnErrorService;
- //鍒涘缓浠诲姟
+ @AppAuth(memo = "WMS鍏ュ簱鍓嶄笅鍙戠爜鐩樹俊鎭�")
+ @PostMapping("/preStoragePallet")
+ public R preStoragePallet(@RequestHeader String appkey, @RequestBody PreStoragePallet preStoragePallet, HttpServletRequest request) {
+ auth(appkey, preStoragePallet, request);
+ if(Cools.isEmpty(preStoragePallet.getSite(),preStoragePallet.getLx(),preStoragePallet.getLev())) {
+ return R.error("鍙傛暟涓嶅畬鏁达紝璇锋鏌ワ細" + preStoragePallet);
+ }
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ StaProtocol staProtocol = devpThread.getStation().get(preStoragePallet.getSite());
+ if (staProtocol == null) {
+ return R.error("绔欑偣绾跨▼涓嶅瓨鍦細" + preStoragePallet.getSite());
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+
+ staProtocol.setMp((short) (preStoragePallet.getLev() > 1 ? 1 : 2));
+ staProtocol.setLev(preStoragePallet.getLev());
+ staProtocol.setLx(OpenServiceImpl.getGzlx(preStoragePallet.getLx()));
+
+ boolean offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(3, staProtocol));
+ if(!offer) {
+ return R.error("鎺ㄩ�侀槦鍒楀け璐�");
+ }
+ return R.ok("鍏ュ簱鍓嶄笅鍙戠爜鐩樹俊鎭垚鍔�");
+ }
+
+ @AppAuth(memo = "WMS浠诲姟涓嬪彂")
@PostMapping("/taskCreate")
@Transactional
public R taskCreate(@RequestHeader String appkey,
@@ -117,7 +152,7 @@
}
- //浠诲姟鍙栨秷鎺ュ彛
+ @AppAuth(memo = "WMS鍙栨秷浠诲姟")
@PostMapping("/taskCancel")
public R taskCancel(@RequestHeader String appkey,
@RequestBody WMSAndAGVInterfaceParam param,
@@ -241,6 +276,7 @@
}
// 澶栫疆杈撻�佺嚎wms閫氱煡杈撻�佺嚎娴佸姩,涓婃姤鏃跺�欎笂鎶ョ珯鐐瑰嵆鍙�
+ @AppAuth(memo = "澶栫疆杈撻�佺嚎wms閫氱煡杈撻�佺嚎娴佸姩")
@PostMapping("/applyInDevp")
public R applyInDevp(@RequestHeader String appkey,
@RequestBody ApplyInDevpDto param,
--
Gitblit v1.9.1