From 3096300068b5cde761ad716e25d23acd72808072 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 23 十月 2024 09:58:49 +0800
Subject: [PATCH] AGV调用校验条码
---
src/main/java/com/zy/asrs/controller/OpenController.java | 18 ++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 22 ++++++++++++++++++++++
src/main/java/com/zy/asrs/service/OpenService.java | 5 +++++
3 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index ada1af4..7bb5801 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -17,6 +17,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
* Created by vincent on 2022/4/8
@@ -34,6 +35,7 @@
@Autowired
private OpenService openService;
+ @Deprecated
@PostMapping("/grouping")
@AppAuth(memo = "AGV缁勬墭璋冪敤")
public synchronized R grouping(@RequestHeader(required = false) String appkey,
@@ -53,6 +55,22 @@
return openService.grouping(param);
}
+ @PostMapping("/barcodeVerificatio")
+ @AppAuth(memo = "AGV璋冪敤鏍￠獙鏉＄爜")
+ public synchronized R barcodeVerificatio(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) Map<String,String> param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+
+ // 鎵樼洏鏉＄爜
+ String barcode = param.get("barcode");
+ if (Cools.isEmpty(barcode)) {
+ return R.parse("鏉＄爜涓嶈兘涓虹┖");
+ }
+
+ return openService.barcodeVerificatio(barcode);
+ }
+
@PostMapping("/outbound")
@AppAuth(memo = "AGV鍑哄簱璋冪敤")
public synchronized R outbound(@RequestHeader(required = false) String appkey,
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 79e11cd..0796874 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -16,6 +16,11 @@
R grouping(AgvGroupingParam param);
/**
+ * AGV璋冪敤鏍￠獙鏉＄爜
+ */
+ R barcodeVerificatio(String barcode);
+
+ /**
* AGV鍑哄簱璋冪敤
*/
R outbound(List<LocDto> locDtos) throws InterruptedException;
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index f7a6ce8..be9b476 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -140,6 +140,28 @@
}
@Override
+ public R barcodeVerificatio(String barcode) {
+
+ if (!barcode.matches("\\d{8}")) {
+ return R.parse("鏉＄爜涓嶆槸8浣嶆暟瀛楋細" + barcode);
+ }
+
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", barcode));
+ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", barcode));
+ int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", barcode));
+
+ if (countLoc > 0) {
+ return R.parse("搴撳瓨宸插瓨鍦ㄨ鏉＄爜锛�" + barcode);
+ } else if (countWrk > 0) {
+ return R.parse("璇ユ潯鐮佸凡鐢熸垚宸ヤ綔妗ｏ細" + barcode);
+ } else if (countwait > 0) {
+ return R.parse("璇ユ潯鐮佸凡鐢熸垚鍏ュ簱閫氱煡妗ｏ細" + barcode);
+ }
+
+ return R.ok("鏍￠獙鎴愬姛");
+ }
+
+ @Override
@Transactional
public R outbound(List<LocDto> locDtos) throws InterruptedException {
if (Cools.isEmpty(locDtos)) {
--
Gitblit v1.9.1