From d667562dcb3c2323e4109cdd07e90690a371c560 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期六, 09 十二月 2023 14:04:29 +0800
Subject: [PATCH] feat: 显示错误
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 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..0588f87 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,35 +1,28 @@
package com.consum.base.service.impl;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
+import cn.hutool.core.convert.Convert;
import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.service.LWhWarningCoreServiceImpl;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.LockManage;
-import com.consum.base.service.BaseGoodsTemplateService;
-import com.consum.base.service.GoodsBaseServiceImpl;
-import com.consum.base.service.LWarehouseFlowService;
-import com.consum.base.service.LWhFormScrappedGoodsService;
-import com.consum.base.service.LWhGoodsRecordService;
-import com.consum.base.service.LWhGoodsService;
+import com.consum.base.service.*;
import com.consum.model.po.LWarehouseFlow;
import com.consum.model.po.LWhFormScrapped;
import com.consum.model.po.LWhFormScrappedGoods;
import com.consum.model.po.LWhGoodsRecord;
import com.iplatform.model.po.S_user_core;
import com.walker.infrastructure.utils.CollectionUtils;
-
-import cn.hutool.core.convert.Convert;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* @ClassName LWhFormScrappedCoreService
@@ -147,9 +140,11 @@
// 鎶ュ簾鍗曠紪鍙�
Long transBusinessId = formScrappedGood.getTransBusinessId();
+ // 鑾峰緱閿佸悗鏌ヨ璇ュ瀷鍙风殑鏈熷垵鏁伴噺
int goodsModelNum = 0;
List<Long> srappedGoodsIds = null;
if (warehouseType == null || warehouseType == 0) {
+ goodsModelNum = lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseId, baseGoodsModelsId, 1, null);
srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(warehouseType, warehouseId, null, null,
baseGoodsModelsId, (short)1, counts);
} else {
@@ -158,6 +153,14 @@
// 鏍规嵁鍒嗗彂鍗曘�佽鏍煎瀷鍙风紪鍙枫�佷娇鐢ㄤ汉鍛樺悕绉帮紝杩涜鎶ュ簾
srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(warehouseType, warehouseId,
transBusinessId, userName, baseGoodsModelsId, (short)2, counts);
+ goodsModelNum = lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseId, 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