From 4722c52ab6e93a432203870dce212838d10e192b Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 20 十一月 2025 13:35:45 +0800
Subject: [PATCH] 侧面入库下发码盘层数
---
src/main/java/com/zy/asrs/controller/OpenController.java | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 9a7f185..5249b8d 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;
@@ -13,7 +14,6 @@
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;
@@ -60,33 +60,33 @@
@Autowired
private BasCrnErrorService basCrnErrorService;
- // WMS鍏ュ簱鍓嶄笅鍙戠爜鐩樹俊鎭�
+ @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();
- }
+ public R preStoragePallet(@RequestHeader String appkey, @RequestBody List<PreStoragePallet> param, HttpServletRequest request) {
+ auth(appkey, param, request);
+ for (PreStoragePallet preStoragePallet : param) {
+ if (Cools.isEmpty(preStoragePallet.getSite(), 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()));
+ staProtocol.setLev(preStoragePallet.getLev());
- boolean offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(3, staProtocol));
- if(!offer) {
- return R.error("鎺ㄩ�侀槦鍒楀け璐�");
+ 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,
@@ -151,7 +151,7 @@
}
- //浠诲姟鍙栨秷鎺ュ彛
+ @AppAuth(memo = "WMS鍙栨秷浠诲姟")
@PostMapping("/taskCancel")
public R taskCancel(@RequestHeader String appkey,
@RequestBody WMSAndAGVInterfaceParam param,
@@ -275,6 +275,7 @@
}
// 澶栫疆杈撻�佺嚎wms閫氱煡杈撻�佺嚎娴佸姩,涓婃姤鏃跺�欎笂鎶ョ珯鐐瑰嵆鍙�
+ @AppAuth(memo = "澶栫疆杈撻�佺嚎wms閫氱煡杈撻�佺嚎娴佸姩")
@PostMapping("/applyInDevp")
public R applyInDevp(@RequestHeader String appkey,
@RequestBody ApplyInDevpDto param,
--
Gitblit v1.9.1