From 19e83bcd49f988e77d39df81192ab116bb991b18 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 07 六月 2023 10:00:51 +0800
Subject: [PATCH] #组托增加重量字段
---
src/main/java/com/zy/asrs/controller/OutController.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 2499a72..d7cd098 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -67,7 +67,7 @@
for (OrderDetl orderDetl : orderDetls) {
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
if (issued <= 0.0D) { continue; }
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOwner());
+ List<LocDetl> locDetls = locDetlService.queryStock2(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOwner());
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
@@ -100,17 +100,12 @@
@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;
@@ -121,7 +116,7 @@
}
}
if (Cools.isEmpty(locDtos)) {
- return R.ok();
+ return R.ok("绔嬪簱鍙傛暟涓虹┖锛岃鐢熸垚鎷ｈ揣鍗曪紝骞冲簱鎷ｈ揣鍑哄簱");
}
boolean lack = true;
for (LocDto locDto : locDtos) {
@@ -131,7 +126,7 @@
}
}
if (lack) {
- return R.ok("");
+ return R.error("搴撳瓨涓嶈冻");
}
Thread.sleep(1000L);
@@ -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++) {
--
Gitblit v1.9.1