From 298285bf63c0cec97fab0c64df4c010c5d2aebe6 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 31 五月 2023 12:47:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/stasrs_test' into stasrs_test
---
src/main/java/com/zy/asrs/controller/OutController.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 2d60d53..2499a72 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -100,12 +100,17 @@
@PostMapping("/out/pakout/auth")
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {
+ List<LocDto> locDtos1 = locDtos;
+ R r = pakout2(locDtos1);
+ if (!r.equals(R.ok())){
+ return r;
+ }
int[][] is=new int[locDtos.size()][2];
for (int i=0;i<locDtos.size();i++){
LocDto locDto=locDtos.get(locDtos.size()-1-i);
if (locDto.getLocNo()==null || locDto.getManu().equals("骞冲簱")){
is[i][0]=1;
- }else {
+ } else {
is[i][0]=0;
}
is[i][1]=locDtos.size()-1-i;
@@ -116,7 +121,7 @@
}
}
if (Cools.isEmpty(locDtos)) {
- return R.error("绔嬪簱鍙傛暟涓虹┖锛岃鐢熸垚鎷ｈ揣鍗曪紝骞冲簱鎷ｈ揣鍑哄簱");
+ return R.ok();
}
boolean lack = true;
for (LocDto locDto : locDtos) {
@@ -126,7 +131,7 @@
}
}
if (lack) {
- return R.error("搴撳瓨涓嶈冻");
+ return R.ok("");
}
Thread.sleep(1000L);
@@ -152,9 +157,7 @@
return R.ok();
}
- @PostMapping("/out/pakout2/auth")
- @ManagerAuth(memo = "鐢熸垚鎷ｈ揣鍗�")
- public synchronized R pakout2(@RequestBody List<LocDto> locDtos) throws InterruptedException {
+ public synchronized R pakout2(List<LocDto> locDtos) throws InterruptedException {
int[][] is = new int[locDtos.size()][2];
List<String> matnrs=new ArrayList<>();
for (int i = 0; i < locDtos.size(); i++) {
--
Gitblit v1.9.1