From 5c57b90b29ad3f1a7747dbec1adf1e063f9ceac2 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 19 十一月 2024 08:21:46 +0800
Subject: [PATCH] 盘点单生成-成功后关闭弹框
---
src/main/java/com/zy/asrs/controller/OutController.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index f1d0ebc..5bb069f 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -10,8 +10,10 @@
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.Utils;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
+import com.zy.common.utils.OutStockInterceptUtil;
import com.zy.common.utils.RoleUtils;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -90,19 +92,19 @@
locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("gro1", locMast.getGro1())
.eq("crn_no", 7)
- .eq("lev1",locMast.getLocType1())
+ .eq("loc_type1",locMast.getLocType1())
.orderBy("bay1", false));
}else if (locMast.getBay1() >=4 && locMast.getBay1()<=12){
locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("gro1", locMast.getGro1())
.eq("crn_no", 7)
- .eq("lev1",locMast.getLocType1())
+ .eq("loc_type1",locMast.getLocType1())
.orderBy("bay1", true));
}else {
locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("gro1", locMast.getGro1())
.eq("crn_no", 7)
- .eq("lev1",locMast.getLocType1())
+ .eq("loc_type1",locMast.getLocType1())
.orderBy("bay1", false));
}
for (LocMast locMast1 : locMasts){
@@ -116,7 +118,14 @@
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
- locDto.setStaNos(staNos);
+ List<LocDto.staListDto> maps = new ArrayList<>();
+ for (Integer staNo : staNos) {
+ LocDto.staListDto staListDto = new LocDto.staListDto();
+ staListDto.setStaNo(staNo);
+ staListDto.setStaName(Utils.getStaName(staNo));
+ maps.add(staListDto);
+ }
+ locDto.setStaNos(maps);
locDtos.add(locDto);
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
@@ -134,9 +143,16 @@
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
- locDto.setStaNos(staNos);
+ List<LocDto.staListDto> maps = new ArrayList<>();
+ for (Integer staNo : staNos) {
+ LocDto.staListDto staListDto = new LocDto.staListDto();
+ staListDto.setStaNo(staNo);
+ staListDto.setStaName(Utils.getStaName(staNo));
+ maps.add(staListDto);
+ }
+ locDto.setStaNos(maps);
locDtos.add(locDto);
- exist.add(locDetl.getLocNo());
+// exist.add(locDetl.getLocNo());
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
}else {
@@ -163,6 +179,8 @@
}
boolean lack = true;
for (LocDto locDto : locDtos) {
+ // 鍒ゆ柇鍏ュ簱妯″紡
+ OutStockInterceptUtil.outStockIntercept(locDto.getStaNo());
if (!locDto.isLack()) {
lack = false;
break;
--
Gitblit v1.9.1