From 6592a2a095bab7177289adaed866e979a107b22e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 29 三月 2022 14:11:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OutController.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index d7deb51..6b887a5 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -5,6 +5,7 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+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;
@@ -37,6 +38,11 @@
private LocMastService locMastService;
@Autowired
private StaDescService staDescService;
+ @Autowired
+ private WorkService workService;
+ @Autowired
+ private BasDevpService basDevpService;
+
// @PostMapping("/out/pakout/preview/auth")
// public R pakoutPreview(@RequestBody List<Long> ids) {
@@ -80,7 +86,8 @@
List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
List<LocDto> locDtos = new ArrayList<>();
for (OrderDetl orderDetl : orderDetls) {
- double issued = Optional.ofNullable(orderDetl.getAnfme()).orElse(0.0D) ;
+ 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(), null);
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
@@ -106,11 +113,21 @@
@PostMapping("/out/pakout/auth")
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
- public R pakout(@RequestBody List<LocDto> locDtos) {
+ public synchronized R pakout(@RequestBody List<LocDto> locDtos) {
if (Cools.isEmpty(locDtos)) {
return R.parse(BaseRes.PARAM);
}
+ boolean refuse = true;
+ for (LocDto locDto : locDtos) {
+ if (!locDto.isLack()) {
+ refuse = !refuse;
+ }
+ }
+ if (refuse) {
+ return R.error("搴撳瓨涓嶈冻");
+ }
List<TaskDto> taskDtos = new ArrayList<>();
+ // 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
for (LocDto locDto : locDtos) {
if (locDto.isLack()) { continue; }
TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
@@ -124,9 +141,8 @@
}
// -----------------------------------------------------------------------------------------------
for (TaskDto taskDto : taskDtos) {
-
-
-
+ BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
+ workService.stockOut(staNo, taskDto, getUserId());
}
return R.ok();
}
--
Gitblit v1.9.1