From df908abc9be603406c67d1474d160e3144da38cd Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期六, 27 九月 2025 16:40:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qlasrs-sxk' into qlasrs-sxk
---
src/main/java/com/zy/asrs/controller/OutController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 0d2ba7d..eea546a 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -1,16 +1,21 @@
package com.zy.asrs.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
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.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.properties.SlaveProperties;
import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -23,7 +28,7 @@
/**
* Created by vincent on 2022/3/26
*/
-
+@Slf4j
@RestController
public class OutController extends BaseController {
@@ -41,6 +46,8 @@
private WorkService workService;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private SlaveProperties slaveProperties;
@PostMapping("/out/pakout/orderDetlIds/auth")
@@ -66,17 +73,44 @@
if (issued <= 0.0D) { continue; }
List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
for (LocDetl locDetl : locDetls) {
- if (issued > 0) {
- 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);
- locDtos.add(locDto);
- exist.add(locDetl.getLocNo());
- // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issued = issued - locDetl.getAnfme();
- } else {
- break;
+ String locNo = locDetl.getLocNo();
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locNo));
+ if (locMast == null) {
+ R.error("娌℃湁鎵惧埌璇ュ簱浣嶏細" + locDetl.getLocNo());
+ }
+
+ //鑾峰彇閫氶亾缁�
+ List<Integer> locRowGroupAsc = Utils.getLocRowGroupAsc(slaveProperties, Utils.getRow(locNo));
+ for (Integer row : locRowGroupAsc) {
+ String shallow = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
+ LocMast shallowLoc = locMastService.selectById(shallow);
+ 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);
+ locDto.setStaNos(staNos);
+ locDtos.add(locDto);
+ exist.add(locDetl1.getLocNo());
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl1.getAnfme();
+ } else {
+ break;
+ }
+ }
}
}
if (issued > 0) {
--
Gitblit v1.9.1