From cf18470cf429a992da434b8b4eb22c30d849c66a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 02 六月 2023 09:41:16 +0800
Subject: [PATCH] Revert "#"
---
src/main/webapp/static/js/order/out.js | 2 +-
src/main/java/com/zy/asrs/controller/OutController.java | 9 +++------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index add6ab0..2d60d53 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -100,11 +100,6 @@
@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);
@@ -157,7 +152,9 @@
return R.ok();
}
- public synchronized R pakout2(List<LocDto> locDtos) throws InterruptedException {
+ @PostMapping("/out/pakout2/auth")
+ @ManagerAuth(memo = "鐢熸垚鎷ｈ揣鍗�")
+ public synchronized R pakout2(@RequestBody 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++) {
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index f9128a8..a589b9f 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -268,7 +268,7 @@
,yes: function(index, layero){
//鎸夐挳銆愮珛鍗冲嚭搴撱�戠殑鍥炶皟
pakout(tableCache, index);
- // pakout2(tableCache, index);
+ pakout2(tableCache, index);
}
,btn2: function(index, layero){
//鎸夐挳銆愮◢鍚庡鐞嗐�戠殑鍥炶皟
--
Gitblit v1.9.1