From abeb3e2f140e3ebb1714b631a71b8e8fd0e956eb Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 29 五月 2023 15:02:06 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/order/out.js | 2 +-
src/main/java/com/zy/asrs/controller/OutController.java | 9 ++++++---
2 files changed, 7 insertions(+), 4 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..add6ab0 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -100,6 +100,11 @@
@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);
@@ -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++) {
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index a589b9f..f9128a8 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