From a5ba6fbce1527c514392c01a914e15365d32dfab Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 19 六月 2025 14:14:20 +0800
Subject: [PATCH] #批量出库同一托盘不同箱号界面显示bug修复
---
src/main/java/com/zy/asrs/controller/OutController.java | 111 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 60 insertions(+), 51 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 7f72384..51211a5 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -63,70 +63,74 @@
return R.parse(BaseRes.PARAM);
}
- // 璁㈠崟鏄庣粏
List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
if (orderDetls.isEmpty()) {
return R.parse("璇烽�夋嫨鏁版嵁");
}
- // 鑾峰彇璁㈠崟涓昏〃
- Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderDetls.get(0).getOrderNo()));
+ Order order = orderService.selectOne(
+ new EntityWrapper<Order>().eq("order_no", orderDetls.get(0).getOrderNo())
+ );
if (order == null) {
return R.parse("璁㈠崟鏁版嵁涓虹┖");
}
+ // 鎸夊寘瑁呯粍鍙峰垎缁勫鐞�
+ Map<String, List<OrderDetl>> brandGroup = orderDetls.stream()
+ .collect(Collectors.groupingBy(OrderDetl::getBrand));
+
List<LocDto> locDtos = new ArrayList<>();
- Set<String> exist = new HashSet<>();
+ // 姣忎釜鍖呰缁勬煡涓�娆″簱瀛�
+ for (Map.Entry<String, List<OrderDetl>> entry : brandGroup.entrySet()) {
+ String brand = entry.getKey();
+ List<OrderDetl> brandOrderDetls = entry.getValue();
- for (OrderDetl orderDetl : orderDetls) {
- double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
- if (issued <= 0.0D) { continue; }
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("brand",orderDetl.getBrand()));
- if (issued > 0 && !locDetls.isEmpty()) {
- // 鏍规嵁鍗曟嵁绫诲瀷杩斿洖鍑哄簱鍙ｅ垪琛� 21鍑哄簱鍙ｏ紝22鐩樼偣鍙ｏ紝23鍙嶄慨鍝佸嚭搴撳彛
- List<Integer> staNos = new ArrayList<>();
- if (order.getDocType() == 21) {
- staNos.add(3077);
- staNos.add(3106);
- } else if(order.getDocType() == 22) {
- staNos.add(3092);
- staNos.add(3102);
- staNos.add(3095);
- } else if(order.getDocType() == 23) {
- staNos.add(3041);
- }
- LocDto locDto = new LocDto();
- locDto.setLocNo(locDetls.get(0).getLocNo());
-// wrkDetl.setMatnr(roll.getSpecs()); // 瑙勬牸
-// wrkDetl.setMaktx(roll.getSpecs()); //瑙勬牸
-// locDto.setBatch(locDetl.getBatch()); // 绠卞彿
-// locDto.setModel(locDetl.getModel()); // 鍗峰彿
- locDto.setBrand(orderDetl.getBrand()); // 鍖呰缁勫彿
-// locDto.setOrigin(locDetl.getOrigin()); // 鏈ㄧ鍦ㄦ墭鐩樹綅缃�
-// locDto.setWeight(locDetl.getWeight()); // 鍑�閲�
-// locDto.setVolume(locDetl.getVolume()); // 姣涢噸
-// locDto.setPrice(locDetl.getPrice());
-// locDto.setSpecs(locDetl.getSpecs());
-// locDto.setZpallet(locDetl.getZpallet());
- locDto.setOrderNo(orderDetl.getOrderNo());
- locDto.setStaNos(staNos);
- locDto.setOrderDetlId(orderDetl.getId());
- locDtos.add(locDto);
-// exist.add(locDetl.getLocNo());
-// // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
-// issued = issued - locDetl.getAnfme();
- } else {
- break;
- }
-// if (issued > 0) {
-// LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
-// locDto.setLack(Boolean.TRUE);
-// locDtos.add(locDto);
-// }
+ // 鏌ヨ繖涓寘瑁呯粍瀵瑰簲鐨勬墍鏈夊簱瀛�
+ List<LocDetl> locDetls = locDetlService.selectList(
+ new EntityWrapper<LocDetl>().eq("brand", brand)
+ );
+ if (locDetls.isEmpty()) continue;
+
+ // 鑾峰彇鍑哄簱鍙�
+ List<Integer> staNos = new ArrayList<>();
+ if (order.getDocType() == 21) {
+ staNos.add(3077); staNos.add(3106);
+ } else if (order.getDocType() == 22) {
+ staNos.add(2041);
+ } else if (order.getDocType() == 23) {
+ staNos.add(3092); staNos.add(3102); staNos.add(3095);
+ }
+
+ // 鍘婚噸 key锛岄伩鍏嶇浉鍚� loc+unit+model 閲嶅鏄剧ず
+ Set<String> seen = new HashSet<>();
+
+ for (LocDetl locDetl : locDetls) {
+ String key = locDetl.getLocNo() + "|" + locDetl.getUnit() + "|" + locDetl.getModel();
+ if (seen.contains(key)) continue;
+ seen.add(key);
+
+ // 瀵瑰簲澶氫釜鏄庣粏鏃讹紝鍒嗛厤鍒扮涓�涓槑缁嗭紙鎴栦綘鍙互鎷嗗垎澶氫釜锛�
+ OrderDetl firstDetl = brandOrderDetls.get(0);
+
+ LocDto locDto = new LocDto();
+ locDto.setLocNo(locDetl.getLocNo());
+ locDto.setUnit(locDetl.getUnit());
+ locDto.setModel(locDetl.getModel());
+ locDto.setThreeCode(locDetl.getThreeCode());
+ locDto.setBrand(brand);
+ locDto.setOrderNo(firstDetl.getOrderNo());
+ locDto.setStaNos(staNos);
+ locDto.setOrderDetlId(firstDetl.getId());
+
+ locDtos.add(locDto);
+ }
}
+
return R.ok().add(locDtos);
}
+
+
@PostMapping("/out/refund/loc/preview/auth")
@ManagerAuth
@@ -251,7 +255,12 @@
for (StockOutParam.LocDetl paramLocDetl : stockOutParam.getLocDetls()) {
LocDetl one = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",paramLocDetl.getLocNo())
.eq("brand",paramLocDetl.getBrand()).eq("model",paramLocDetl.getModel()));
- if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), stockOutParam.getOrderNo()));
+ if (null != one) {
+ if(!"鍚堟牸".equals(one.getThreeCode())) {
+ throw new CoolException(one.getModel() + "鍗蜂笉鍚堟牸:" + one.getThreeCode() );
+ }
+ locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), stockOutParam.getOrderNo()));
+ }
}
if (!locDetlDtos.isEmpty()) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
@@ -260,7 +269,7 @@
Order order = orderService.selectByNo(stockOutParam.getOrderNo());
// 鍚姩鍑哄簱寮�濮�
- workService.stockOut(staNo, locDetlDtos, order.getDocType() == 22 ? IoWorkType.CHECK_OUT : null, getUserId());
+ workService.stockOut(staNo, locDetlDtos, order.getDocType() == 23 ? IoWorkType.CHECK_OUT : null, getUserId());
}else {
throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篎銆丏鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$());
}
--
Gitblit v1.9.1