From 350125984c618f95d09fb08978953ad24f5d3b6c Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 20 十二月 2023 13:53:48 +0800
Subject: [PATCH] 去除默认机构默认仓库逻辑
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java
index 1442df9..c652171 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java
@@ -1,6 +1,7 @@
package com.consum.base.service.impl;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -147,9 +148,13 @@
// 鎶ュ簾鍗曠紪鍙�
Long transBusinessId = formScrappedGood.getTransBusinessId();
+ // 鑾峰緱閿佸悗鏌ヨ璇ュ瀷鍙风殑鏈熷垵鏁伴噺
int goodsModelNum = 0;
List<Long> srappedGoodsIds = null;
if (warehouseType == null || warehouseType == 0) {
+ List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
+ goodsModelNum =
+ lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseIds, baseGoodsModelsId, 1, null);
srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(warehouseType, warehouseId, null, null,
baseGoodsModelsId, (short)1, counts);
} else {
@@ -158,6 +163,16 @@
// 鏍规嵁鍒嗗彂鍗曘�佽鏍煎瀷鍙风紪鍙枫�佷娇鐢ㄤ汉鍛樺悕绉帮紝杩涜鎶ュ簾
srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(warehouseType, warehouseId,
transBusinessId, userName, baseGoodsModelsId, (short)2, counts);
+ List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
+ goodsModelNum =
+ lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseIds, baseGoodsModelsId, 2, null);
+ }
+
+ if (goodsModelNum < counts) {
+ log.error("瑕佹姤搴熺殑鐗╁搧鏁伴噺涓嶈冻");
+ // 鎵嬪姩鍥炴粴
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ throw new RuntimeException("鍑哄簱澶辫触!鍨嬪彿鏁伴噺涓嶈冻");
}
if (CollectionUtils.isEmpty(srappedGoodsIds) || srappedGoodsIds.size() < counts) {
--
Gitblit v1.9.1