From 641f7bb8b2d2e23f1f5192fecf030a567151c7b5 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 15 七月 2025 17:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs
---
src/main/java/com/zy/asrs/controller/OutController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 862bff4..c43b525 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -77,7 +77,11 @@
// 鎸夊寘瑁呯粍鍙峰垎缁勫鐞�
Map<String, List<OrderDetl>> brandGroup = orderDetls.stream()
- .collect(Collectors.groupingBy(OrderDetl::getBrand));
+ .collect(Collectors.groupingBy(o -> {
+ String brand = o.getBrand();
+ return brand != null ? brand : "璺ㄥ贩閬�";
+ }));
+
List<LocDto> locDtos = new ArrayList<>();
@@ -221,11 +225,17 @@
.eq("model", paramLocDetl.getModel()));
if (one != null) {
- if (!"鍚堟牸".equals(one.getThreeCode())) {
- throw new CoolException(one.getModel() + "鍗蜂笉鍚堟牸: " + one.getThreeCode());
+ // 鍒ゆ柇鏄惁涓虹洏鐐瑰崟锛坉ocType == 23锛夛紝濡傛灉涓嶆槸鍒欐牎楠屽悎鏍兼��
+ Order order = orderService.selectByNo(stockOutParam.getOrderNo());
+ if ( order.getDocType() != 23) {
+ if (!"鍚堟牸".equals(one.getThreeCode())) {
+ throw new CoolException(one.getModel() + "鍗蜂笉鍚堟牸: " + one.getThreeCode());
+ }
}
+
locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), stockOutParam.getOrderNo()));
}
+
}
if (!locDetlDtos.isEmpty()) {
--
Gitblit v1.9.1