From 78067a1c03707766f3d6561c22e165af68ad36b9 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 18 十二月 2025 14:38:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OutController.java | 81 ++++++++++++++++++++++++----------------
1 files changed, 48 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 2853918..3067a4b 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -5,16 +5,21 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.LocDetl;
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.OutLocDto;
import com.zy.common.model.TaskDto;
+import com.zy.common.properties.SlaveProperties;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
@@ -44,6 +49,8 @@
private WorkService workService;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private SlaveProperties slaveProperties;
@PostMapping("/out/pakout/orderDetlIds/auth")
@@ -69,36 +76,48 @@
if (issued <= 0.0D) { continue; }
List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
for (LocDetl locDetl : locDetls) {
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
- if(locMast==null){
- R.error("娌℃湁鎵惧埌璇ュ簱浣嶏細"+locDetl.getLocNo());
+ String locNo = locDetl.getLocNo();
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locNo));
+ if (locMast == null) {
+ R.error("娌℃湁鎵惧埌璇ュ簱浣嶏細" + locDetl.getLocNo());
}
- List<LocMast> locMasts=locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("group1",locMast.getGroup1())
- .eq("loc_sts","F")
- .orderBy("loc_attribute",false));
- for (LocMast locMast1 : locMasts) {
- LocDetl locDetl1 = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast1.getLocNo()));
- if(locDetl1==null){
- return R.error(locMast1.getLocNo()+"娌℃湁鎵惧埌鐗╂枡");
+
+ //鑾峰彇閫氶亾缁�
+ List<Integer> locRowGroupAsc = Utils.getLocGroupAsc(slaveProperties, locNo);
+ for (Integer row : locRowGroupAsc) {
+ String shallow = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
+ LocMast shallowLoc = locMastService.selectById(shallow);
+ if (shallowLoc == null) {
+ continue;
}
- if (!locDetl1.getMatnr().equals(locDetl.getMatnr())) {
- log.error(locMast1.getGroup1()+"宸烽亾鐨勭"+locMast1.getLocAttribute()+"娣辨祬搴撲綅鍙峰拰鍚屽贩閬撶墿鏂欎笉鍚�");
- break;
- }
- if (issued > 0) {
- LocDto locDto = new LocDto(locDetl1.getLocNo(), locDetl1.getMatnr(), locDetl1.getMaktx(), locDetl1.getBatch(), orderDetl.getOrderNo(),
- issued >= locDetl1.getAnfme() ? locDetl1.getAnfme() : issued);
- List<Integer> staNos = new ArrayList<>();
- staNos.add(100);
- staNos.add(200);
- locDto.setStaNos(staNos);
- locDtos.add(locDto);
- exist.add(locDetl.getLocNo());
- // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issued = issued - locDetl.getAnfme();
- } else {
- break;
+
+ if (shallowLoc.getLocSts().equals("F")) {
+ LocDetl locDetl1 = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", shallowLoc.getLocNo()));
+ if (locDetl1 == null) {
+ log.error(shallowLoc.getLocNo() + "娌℃湁鎵惧埌鐗╂枡");
+ break;
+ }
+ if (!locDetl1.getMatnr().equals(locDetl.getMatnr())) {
+ log.error(shallowLoc.getLocNo() + "搴撲綅涓�" + locNo + "搴撲綅鍚屽贩閬撶墿鏂欎笉鍚�");
+ break;
+ }
+ if (issued > 0) {
+ if(exist.contains(locDetl1.getLocNo())) {
+ continue;
+ }
+ LocDto locDto = new LocDto(locDetl1.getLocNo(), locDetl1.getMatnr(), locDetl1.getMaktx(), locDetl1.getBatch(), orderDetl.getOrderNo(),
+ issued >= locDetl1.getAnfme() ? locDetl1.getAnfme() : issued);
+ int ioType = (issued >= locDetl1.getAnfme() && locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locDto.getLocNo())) == 1) ? 101 : 103;
+// List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl1.getLocNo(), ioType);
+ List<Integer> staNos = Utils.getOutStaNoList();
+ locDto.setStaNos(staNos);
+ locDtos.add(locDto);
+ exist.add(locDetl1.getLocNo());
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl1.getAnfme();
+ } else {
+ break;
+ }
}
}
}
@@ -143,11 +162,7 @@
taskDtos.add(taskDto);
}
}
- // -----------------------------------------------------------------------------------------------
- for (TaskDto taskDto : taskDtos) {
- BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
- workService.stockOut(staNo, taskDto, getUserId());
- }
+ workService.stockOut(taskDtos, getUserId());
return R.ok();
}
--
Gitblit v1.9.1