From 6ddd525901cce19178983f37cbde7209d9df897e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 11 四月 2022 09:27:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OutController.java | 50 ++++++++------------------------------------------
1 files changed, 8 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index d91debf..8cbcbed 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -1,6 +1,5 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSON;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -8,9 +7,7 @@
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.entity.result.StoPreTab;
import com.zy.asrs.service.*;
-import com.zy.common.model.DetlDto;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
@@ -19,7 +16,9 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
/**
* Created by vincent on 2022/3/26
@@ -42,40 +41,6 @@
private WorkService workService;
@Autowired
private BasDevpService basDevpService;
-
-
-// @PostMapping("/out/pakout/preview/auth")
-// public R pakoutPreview(@RequestBody List<Long> ids) {
-// if (Cools.isEmpty(ids)) {
-// return R.parse(BaseRes.PARAM);
-// }
-// List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
-// Set<DetlDto> detlDtos = new HashSet<>();
-// for (OrderDetl orderDetl : orderDetls) {
-// if (DetlDto.hasList(detlDtos, orderDetl)) {
-// DetlDto detlDto = DetlDto.find(detlDtos, orderDetl.getMatnr(), orderDetl.getBatch());
-// assert detlDto != null;
-// detlDto.setAnfme(detlDto.getAnfme() + orderDetl.getAnfme());
-// } else {
-// detlDtos.add(new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getAnfme()));
-// }
-// }
-// List<LocDto> locDtos = new ArrayList<>();
-// for (DetlDto detlDto : detlDtos) {
-// double issued = Optional.ofNullable(detlDto.getAnfme()).orElse(0.0D) ;
-// List<LocDetl> locDetls = locDetlService.queryStock(detlDto.getMatnr(), detlDto.getBatch(), null);
-// for (LocDetl locDetl : locDetls) {
-// if (issued > 0) {
-// locDtos.add(new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), issued>=locDetl.getAnfme()?locDetl.getAnfme():issued));
-// // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
-// issued = issued - locDetl.getAnfme();
-// } else {
-// break;
-// }
-// }
-// }
-// return R.ok().add(locDtos);
-// }
@PostMapping("/out/pakout/preview/auth")
@ManagerAuth
@@ -117,17 +82,18 @@
if (Cools.isEmpty(locDtos)) {
return R.parse(BaseRes.PARAM);
}
- boolean refuse = true;
+ boolean lack = true;
for (LocDto locDto : locDtos) {
if (!locDto.isLack()) {
- refuse = !refuse;
+ lack = false;
+ break;
}
}
- if (refuse) {
+ if (lack) {
return R.error("搴撳瓨涓嶈冻");
}
- Thread.sleep(500L);
+ Thread.sleep(1000L);
List<TaskDto> taskDtos = new ArrayList<>();
// 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
--
Gitblit v1.9.1