From a4699af3282d7abe89f9a9be40e8742fdd3b12b3 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期五, 01 十一月 2024 14:30:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 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 ada1af4..5576b9c 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -8,7 +8,6 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
-import com.zy.common.model.LocDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +16,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 +34,7 @@
@Autowired
private OpenService openService;
+ @Deprecated
@PostMapping("/grouping")
@AppAuth(memo = "AGV缁勬墭璋冪敤")
public synchronized R grouping(@RequestHeader(required = false) String appkey,
@@ -53,17 +54,33 @@
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鍑哄簱璋冪敤")
+ @AppAuth(memo = "MES璋冪敤鍑哄簱")
public synchronized R outbound(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) List<LocDto> locDtos,
- HttpServletRequest request) throws InterruptedException {
- auth(appkey, locDtos, request);
- if (Cools.isEmpty(locDtos)) {
+ @RequestBody(required = false) OutBoundParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param.getEndLocation(),param.getBarcode(),param.getOrderNo())) {
return R.parse(BaseRes.PARAM);
}
- return openService.outbound(locDtos);
+ return openService.outbound(param);
}
@PostMapping("/order/matSync/default/v1")
--
Gitblit v1.9.1