From 82de5a307466894bbb0258f8a63a26a7bb96d80d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 16 十月 2025 09:55:35 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/OutController.java | 183 ++++++++++++++++++++++++++-------------------
1 files changed, 106 insertions(+), 77 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 3c43c40..981fe80 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -17,8 +17,6 @@
import com.zy.common.model.ExistDto;
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;
import org.springframework.web.bind.annotation.PostMapping;
@@ -78,7 +76,9 @@
return R.ok().add(result);
}
- /** 澶勭悊璁㈠崟鍑哄簱璐т綅鍒嗛厤
+ /**
+ * 澶勭悊璁㈠崟鍑哄簱璐т綅鍒嗛厤
+ *
* @param jsonObject 璇锋眰鍙傛暟(鍖呭惈璁㈠崟鏄庣粏ID鍒楄〃鍜屽嚭搴撴暟閲�)
*/
@PostMapping("/out/pakout/OrderOutGetLoc.number/auth")
@@ -109,13 +109,14 @@
/**
* 澶勭悊鍗曚釜璁㈠崟鏄庣粏鐨勮揣浣嶅垎閰�
- * @param orderDetl 璁㈠崟鏄庣粏
+ *
+ * @param orderDetl 璁㈠崟鏄庣粏
* @param requiredAmount 闇�姹傚嚭搴撻噺
- * @param processedLocs 宸插鐞嗙殑璐т綅闆嗗悎锛堢敤浜庡幓閲嶏級
+ * @param processedLocs 宸插鐞嗙殑璐т綅闆嗗悎锛堢敤浜庡幓閲嶏級
* @param processedStock 宸插鐞嗙殑搴撳瓨璁板綍闆嗗悎锛堢敤浜庡幓閲嶏級
*/
private List<LocDto> processOrderDetl(OrderDetl orderDetl, Double requiredAmount,
- Set<String> processedLocs, Set<ExistDto> processedStock) {
+ Set<String> processedLocs, Set<ExistDto> processedStock) {
List<LocDto> result = new ArrayList<>();
double remaining = Optional.ofNullable(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
@@ -125,7 +126,7 @@
throw new CoolException("鍑哄簱鏁伴噺蹇呴』澶т簬0");
}
if (requiredAmount > remaining) {
- throw new CoolException("璁㈠崟"+orderDetl.getOrderNo()+"璇锋眰鏁伴噺瓒呰繃鍙嚭搴撴暟閲忥紝鍓╀綑鍙嚭锛�" + remaining);
+ throw new CoolException("璁㈠崟" + orderDetl.getOrderNo() + "璇锋眰鏁伴噺瓒呰繃鍙嚭搴撴暟閲忥紝鍓╀綑鍙嚭锛�" + remaining);
}
// 褰撴寚瀹氭暟閲忔椂锛屼娇鐢ㄦ寚瀹氭暟閲忚鐩栧墿浣欓噺
remaining = Math.min(requiredAmount, remaining);
@@ -133,9 +134,9 @@
// 鑾峰彇鍙敤搴撳瓨璁板綍
List<LocDetl> stocks = locDetlService.queryStock(
- orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getSuppCode(),
- processedLocs, orderDetl.getSupp(),
- orderDetl.getTemp1(), orderDetl.getTemp2()
+ orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getSuppCode(),
+ processedLocs, orderDetl.getSupp(),
+ orderDetl.getTemp1(), orderDetl.getTemp2()
);
// 閬嶅巻澶勭悊姣忎釜搴撳瓨璁板綍
@@ -143,7 +144,7 @@
if (remaining <= 0) break;
LocMast locMast = locMastService.selectOne(
- new EntityWrapper<LocMast>().eq("loc_no", stock.getLocNo()));
+ new EntityWrapper<LocMast>().eq("loc_no", stock.getLocNo()));
// 闈�7鍙峰爢鍨涙満澶勭悊閫昏緫
if (locMast.getCrnNo() != 7) {
@@ -165,22 +166,26 @@
return result;
}
- /** 鍒涘缓缂洪噺DTO */
+ /**
+ * 鍒涘缓缂洪噺DTO
+ */
private LocDto createShortageDto(OrderDetl orderDetl, double qty) {
LocDto dto = new LocDto(null, orderDetl.getMatnr(),
- orderDetl.getMaktx(), orderDetl.getBatch(),
- orderDetl.getOrderNo(), qty);
+ orderDetl.getMaktx(), orderDetl.getBatch(),
+ orderDetl.getOrderNo(), qty);
dto.setLack(true);
return dto;
}
- /** 澶勭悊鏅�氳揣浣� */
+ /**
+ * 澶勭悊鏅�氳揣浣�
+ */
private void processNormalLocation(LocDetl stock, OrderDetl orderDetl, double remaining,
- Set<ExistDto> processedStock, List<LocDto> result) {
+ Set<ExistDto> processedStock, List<LocDto> result) {
ExistDto exist = new ExistDto()
- .setLocNo(stock.getLocNo())
- .setMatnr(stock.getMatnr())
- .setBatch(stock.getBatch());
+ .setLocNo(stock.getLocNo())
+ .setMatnr(stock.getMatnr())
+ .setBatch(stock.getBatch());
if (processedStock.add(exist)) {
double allocateQty = Math.min(remaining, stock.getAnfme());
@@ -188,38 +193,42 @@
}
}
- /** 澶勭悊7鍙峰爢鍨涙満璐т綅 */
+ /**
+ * 澶勭悊7鍙峰爢鍨涙満璐т綅
+ */
private void processCrn7Location(LocMast baseLoc, LocDetl stock, OrderDetl orderDetl,
- double remaining, Set<ExistDto> processedStock,
- List<LocDto> result) {
+ double remaining, Set<ExistDto> processedStock,
+ List<LocDto> result) {
// 鏋勫缓鏌ヨ鏉′欢
EntityWrapper<LocMast> wrapper = (EntityWrapper<LocMast>) new EntityWrapper<LocMast>()
- .eq("gro1", baseLoc.getGro1())
- .eq("crn_no", 7)
- .eq("loc_type1", baseLoc.getLocType1())
- .orderBy("bay1", (baseLoc.getBay1() == 6 || baseLoc.getBay1() == 5));
+ .eq("gro1", baseLoc.getGro1())
+ .eq("crn_no", 7)
+ .eq("loc_type1", baseLoc.getLocType1())
+ .orderBy("bay1", (baseLoc.getBay1() == 6 || baseLoc.getBay1() == 5));
// 鑾峰彇鍚岀粍璐т綅骞跺鐞�
locMastService.selectList(wrapper).stream()
- .filter(loc -> "F".equals(loc.getLocSts()))
- .forEach(loc -> processCrn7SubLocation(loc, stock, orderDetl, remaining, processedStock, result));
+ .filter(loc -> "F".equals(loc.getLocSts()))
+ .forEach(loc -> processCrn7SubLocation(loc, stock, orderDetl, remaining, processedStock, result));
}
- /** 澶勭悊7鍙峰爢鍨涙満瀛愯揣浣� */
+ /**
+ * 澶勭悊7鍙峰爢鍨涙満瀛愯揣浣�
+ */
private void processCrn7SubLocation(LocMast loc, LocDetl stock, OrderDetl orderDetl,
- double remaining, Set<ExistDto> processedStock,
- List<LocDto> result) {
+ double remaining, Set<ExistDto> processedStock,
+ List<LocDto> result) {
LocDetl subStock = locDetlService.selectOne(
- new EntityWrapper<LocDetl>()
- .eq("loc_No", loc.getLocNo())
- .eq("matnr", stock.getMatnr())
- .eq("batch", stock.getBatch()));
+ new EntityWrapper<LocDetl>()
+ .eq("loc_No", loc.getLocNo())
+ .eq("matnr", stock.getMatnr())
+ .eq("batch", stock.getBatch()));
if (!Cools.isEmpty(subStock)) {
ExistDto exist = new ExistDto()
- .setLocNo(subStock.getLocNo())
- .setMatnr(subStock.getMatnr())
- .setBatch(subStock.getBatch());
+ .setLocNo(subStock.getLocNo())
+ .setMatnr(subStock.getMatnr())
+ .setBatch(subStock.getBatch());
if (processedStock.add(exist) && remaining > 0) {
double allocateQty = Math.min(remaining, subStock.getAnfme());
@@ -228,22 +237,24 @@
}
}
- /** 鏋勫缓璐т綅DTO閫氱敤鏂规硶 */
+ /**
+ * 鏋勫缓璐т綅DTO閫氱敤鏂规硶
+ */
private LocDto buildLocDto(LocDetl stock, OrderDetl orderDetl, double qty) {
LocDto dto = new LocDto(
- stock.getLocNo(), stock.getMatnr(), stock.getMaktx(),
- stock.getBatch(), orderDetl.getOrderNo(), qty
+ stock.getLocNo(), stock.getMatnr(), stock.getMaktx(),
+ stock.getBatch(), orderDetl.getOrderNo(), qty
);
// 鑾峰彇宸ヤ綔绔欏苟杞崲
List<Integer> staNos = staDescService.queryOutStaNosByLocNo(
- stock.getLocNo(), qty >= stock.getAnfme() ? 101 : 103);
+ stock.getLocNo(), qty >= stock.getAnfme() ? 101 : 103);
List<LocDto.staListDto> staList = staNos.stream()
- .map(staNo -> new LocDto.staListDto()
- .setStaNo(staNo)
- .setStaName(Utils.getStaName(staNo)))
- .collect(Collectors.toList());
+ .map(staNo -> new LocDto.staListDto()
+ .setStaNo(staNo)
+ .setStaName(Utils.getStaName(staNo)))
+ .collect(Collectors.toList());
dto.setStaNos(staList);
return dto;
@@ -340,7 +351,9 @@
// }
- /** 鍥涘悜搴撹鍗曞嚭搴� **/
+ /**
+ * 鍥涘悜搴撹鍗曞嚭搴�
+ **/
@PostMapping("/out/pakout/previewCustomQuantity/auth/sxk")
@ManagerAuth
public R pakoutPreviewCustomQuantitySXK(@RequestBody JSONObject jsonObject) {
@@ -363,12 +376,14 @@
}
issued = amount;
}
- if (issued <= 0.0D) { continue; }
+ if (issued <= 0.0D) {
+ continue;
+ }
List<LocDetl> locDetls = new ArrayList<>();
- locDetls = locDetlService.queryStockFour(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
+ locDetls = locDetlService.queryStockFour(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist, orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2());
for (LocDetl locDetl : locDetls) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
- if (locMast.getLocSts().equals("F")){
+ if (locMast.getLocSts().equals("F")) {
LocDetl locDetl1 = locDetlService.selectOne(new EntityWrapper<LocDetl>()
.eq("loc_No", locMast.getLocNo())
.eq("matnr", locDetl.getMatnr()).eq("batch", locDetl.getBatch()));
@@ -377,7 +392,7 @@
existDto.setLocNo(locDetl1.getLocNo());
existDto.setMatnr(locDetl1.getMatnr());
existDto.setBatch(locDetl1.getBatch());
- if (existDtos.add(existDto)){
+ if (existDtos.add(existDto)) {
if (issued > 0) {
LocDto locDto = new LocDto(locDetl1.getLocNo(), locDetl1.getMatnr(), locDetl1.getMaktx(), locDetl1.getBatch(), orderDetl.getOrderNo(),
issued >= locDetl1.getAnfme() ? locDetl1.getAnfme() : issued);
@@ -393,7 +408,7 @@
locDtos.add(locDto);
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
- }else {
+ } else {
break;
}
}
@@ -424,12 +439,14 @@
for (OrderDetl orderDetl : orderDetls) {
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
- if (issued <= 0.0D) { continue; }
+ if (issued <= 0.0D) {
+ continue;
+ }
List<LocDetl> locDetls = new ArrayList<>();
- locDetls = locDetlService.queryStockFour(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
+ locDetls = locDetlService.queryStockFour(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist, orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2());
for (LocDetl locDetl : locDetls) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
- if (locMast.getLocSts().equals("F")){
+ if (locMast.getLocSts().equals("F")) {
LocDetl locDetl1 = locDetlService.selectOne(new EntityWrapper<LocDetl>()
.eq("loc_No", locMast.getLocNo())
.eq("matnr", locDetl.getMatnr()).eq("batch", locDetl.getBatch()));
@@ -438,7 +455,7 @@
existDto.setLocNo(locDetl1.getLocNo());
existDto.setMatnr(locDetl1.getMatnr());
existDto.setBatch(locDetl1.getBatch());
- if (existDtos.add(existDto)){
+ if (existDtos.add(existDto)) {
if (issued > 0) {
LocDto locDto = new LocDto(locDetl1.getLocNo(), locDetl1.getMatnr(), locDetl1.getMaktx(), locDetl1.getBatch(), orderDetl.getOrderNo(),
issued >= locDetl1.getAnfme() ? locDetl1.getAnfme() : issued);
@@ -454,7 +471,7 @@
locDtos.add(locDto);
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
- }else {
+ } else {
break;
}
}
@@ -471,7 +488,9 @@
return R.ok().add(locDtos);
}
- /** ctu璁㈠崟鍑哄簱 **/
+ /**
+ * ctu璁㈠崟鍑哄簱
+ **/
@PostMapping("/out/pakout/previewCustomQuantity/auth/ctu")
@ManagerAuth
public R pakoutPreviewCustomQuantityCTU(@RequestBody JSONObject jsonObject) {
@@ -494,9 +513,11 @@
}
issued = amount;
}
- if (issued <= 0.0D) { continue; }
+ if (issued <= 0.0D) {
+ continue;
+ }
List<LocDetl> locDetls = new ArrayList<>();
- locDetls = locDetlService.queryStockMinAnfme(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
+ locDetls = locDetlService.queryStockMinAnfme(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist, orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2());
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
ExistDto existDto = new ExistDto();
@@ -519,7 +540,7 @@
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
}
- }else {
+ } else {
break;
}
}
@@ -546,9 +567,11 @@
for (OrderDetl orderDetl : orderDetls) {
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
- if (issued <= 0.0D) { continue; }
+ if (issued <= 0.0D) {
+ continue;
+ }
List<LocDetl> locDetls = new ArrayList<>();
- locDetls = locDetlService.queryStockMinAnfme(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
+ locDetls = locDetlService.queryStockMinAnfme(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist, orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2());
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
ExistDto existDto = new ExistDto();
@@ -571,7 +594,7 @@
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
}
- }else {
+ } else {
break;
}
}
@@ -584,7 +607,9 @@
return R.ok().add(locDtos);
}
- /** crn璁㈠崟鍑哄簱 **/
+ /**
+ * crn璁㈠崟鍑哄簱
+ **/
@PostMapping("/out/pakout/previewCustomQuantity/auth/crn")
@ManagerAuth
public R pakoutPreviewCustomQuantityCRN(@RequestBody JSONObject jsonObject) {
@@ -607,9 +632,11 @@
}
issued = amount;
}
- if (issued <= 0.0D) { continue; }
+ if (issued <= 0.0D) {
+ continue;
+ }
List<LocDetl> locDetls = new ArrayList<>();
- locDetls = locDetlService.queryStockCrn(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
+ locDetls = locDetlService.queryStockCrn(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist, orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2());
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
ExistDto existDto = new ExistDto();
@@ -632,7 +659,7 @@
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
}
- }else {
+ } else {
break;
}
}
@@ -659,9 +686,11 @@
for (OrderDetl orderDetl : orderDetls) {
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
- if (issued <= 0.0D) { continue; }
+ if (issued <= 0.0D) {
+ continue;
+ }
List<LocDetl> locDetls = new ArrayList<>();
- locDetls = locDetlService.queryStockCrn(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
+ locDetls = locDetlService.queryStockCrn(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist, orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2());
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
ExistDto existDto = new ExistDto();
@@ -684,7 +713,7 @@
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
}
- }else {
+ } else {
break;
}
}
@@ -696,10 +725,6 @@
}
return R.ok().add(locDtos);
}
-
-
-
-
@PostMapping("/out/pakout/auth")
@@ -726,7 +751,9 @@
List<TaskDto> taskDtos = new ArrayList<>();
// 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
for (LocDto locDto : locDtos) {
- if (locDto.isLack()) { continue; }
+ if (locDto.isLack()) {
+ continue;
+ }
TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
if (TaskDto.has(taskDtos, taskDto)) {
TaskDto dto = TaskDto.find(taskDtos, taskDto);
@@ -768,7 +795,9 @@
List<TaskDto> taskDtos = new ArrayList<>();
// 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
for (LocDto locDto : locDtos) {
- if (locDto.isLack()) { continue; }
+ if (locDto.isLack()) {
+ continue;
+ }
TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
if (TaskDto.has(taskDtos, taskDto)) {
TaskDto dto = TaskDto.find(taskDtos, taskDto);
--
Gitblit v1.9.1