From d57e7e224382c953e904094bff8823106fd5b214 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期四, 30 十一月 2023 09:32:05 +0800
Subject: [PATCH] feat: 库存查询只查询本级
---
consum-base/src/main/java/com/consum/base/service/FinWarehouseLedgerServiceImpl.java | 10 ++++++----
consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java | 8 ++++++++
consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java | 3 ++-
consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java | 3 +++
consum-base/src/main/java/com/consum/base/service/LWhGoodsStatisticsServiceImpl.java | 5 +++--
consum-base/src/main/java/com/consum/base/service/LWhWarningConfigServiceImpl.java | 5 +++--
6 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java b/consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java
index 623102a..d893072 100644
--- a/consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java
+++ b/consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java
@@ -8,11 +8,14 @@
import com.walker.jdbc.service.BaseServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
/**
* 缂栫爜缁熶竴鐢熸垚鏈嶅姟
*/
@Service
+@Transactional(propagation = Propagation.NOT_SUPPORTED)
public class CodeGeneratorService extends BaseServiceImpl {
diff --git a/consum-base/src/main/java/com/consum/base/service/FinWarehouseLedgerServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/FinWarehouseLedgerServiceImpl.java
index aa681ad..5429a66 100644
--- a/consum-base/src/main/java/com/consum/base/service/FinWarehouseLedgerServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/FinWarehouseLedgerServiceImpl.java
@@ -34,8 +34,9 @@
}
//鏈烘瀯
if (param.getAgencyId() != null) {
- sql.append(" and left(ware.AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
- paramts.put("lengthAgencyId", param.getAgencyId());
+// sql.append(" and left(ware.AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
+ sql.append(" and ware.AGENCY_ID = :agencyId");
+// paramts.put("lengthAgencyId", param.getAgencyId());
paramts.put("agencyId", param.getAgencyId());
}
//浠撳簱绫诲瀷
@@ -141,8 +142,9 @@
}
//鏈烘瀯
if (param.getAgencyId() != null) {
- sql.append(" and left(ware.AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
- paramts.put("lengthAgencyId", param.getAgencyId());
+// sql.append(" and left(ware.AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
+ sql.append(" and ware.AGENCY_ID = :agencyId");
+// paramts.put("lengthAgencyId", param.getAgencyId());
paramts.put("agencyId", param.getAgencyId());
}
//浠撳簱绫诲瀷
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
index c8830d7..37cba45 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
@@ -92,7 +92,8 @@
List<LWhProcureModel> goodsModelNumList = lWhProcureModelService.getModelByForm(businessEnum, whFormTransferId);
if (CollectionUtils.isEmpty(goodsModelNumList)) {
log.error("娌℃湁瑕佸叆搴撶殑鐗╁搧");
- return null;
+ throw new RuntimeException("娌℃湁瑕佸叆搴撶殑鐗╁搧");
+// return null;
}
Long outWarehouseId = lWhFormTransfer.getOutWarehouseId();
String outWarehouseName = lWhFormTransfer.getOutWarehouseName();
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java
index a9cad8f..9fedf1b 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java
@@ -127,6 +127,10 @@
String nickName = currentUser.getNick_name();
// 鍑哄簱鍗曟祦姘磇d
Long outWarehouseFlowId = lWhFormTransfer.getOutWarehouseFlowId();
+ if (outWarehouseFlowId == null){
+ log.error("璋冩嫧澶辫触锛佹湭鎵惧埌鍑哄簱鍗�");
+ return;
+ }
// 鍏ュ簱浠撳簱绫诲瀷 0鏈烘瀯1閮ㄩ棬
Integer inWarehouseType = lWhFormTransfer.getInWarehouseType();
Long inWarehouseId = lWhFormTransfer.getInWarehouseId();
@@ -183,6 +187,10 @@
synchronized (warehouseModelLockObj) {
// 鏍规嵁鍑哄簱娴佹按ID 鏌ヨ 鍑哄簱鐨勭墿鍝両D
outGoodsIds = getGoodsidByFlowId(outWarehouseFlowId, oldRecordId);
+ if (CollectionUtils.isEmpty(outGoodsIds)){
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ throw new RuntimeException("鍏ュ簱鍗曞け璐ワ紝鏈煡璇㈠埌鐗╁搧锛�");
+ }
// 搴撳瓨鐗╁搧璇︽儏锛圠_WH_GOODS锛変腑 鐘舵�佽缃负1
lWhGoodsService.modGoodsTransfering(outGoodsIds, inWarehouseType, inWarehouseId, inWarehouseName, goodsStatus);
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhGoodsStatisticsServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhGoodsStatisticsServiceImpl.java
index 67a3c85..349d435 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhGoodsStatisticsServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhGoodsStatisticsServiceImpl.java
@@ -42,8 +42,9 @@
HashMap<String, Object> paramts = new HashMap<>();
//鏈烘瀯
if (param.getAgencyId() != null) {
- sqlCangKuWhere.append(" AND left(tenant.id, length(:lengthAgencyId)) = :agencyId");
- paramts.put("lengthAgencyId", param.getAgencyId());
+// sqlCangKuWhere.append(" AND left(tenant.id, length(:lengthAgencyId)) = :agencyId");
+ sqlCangKuWhere.append(" AND tenant.id = :agencyId");
+// paramts.put("lengthAgencyId", param.getAgencyId());
paramts.put("agencyId", param.getAgencyId());
}
// 閮ㄩ棬
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhWarningConfigServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhWarningConfigServiceImpl.java
index 79b0b15..236c1d9 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhWarningConfigServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhWarningConfigServiceImpl.java
@@ -37,8 +37,9 @@
HashMap<String, Object> paramts = new HashMap<>();
//鏈烘瀯
if (param.getAgencyId() != null) {
- sql.append(" and left(ware.AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
- paramts.put("lengthAgencyId", param.getAgencyId());
+// sql.append(" and left(ware.AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
+ sql.append(" and ware.AGENCY_ID = :agencyId");
+// paramts.put("lengthAgencyId", param.getAgencyId());
paramts.put("agencyId", param.getAgencyId());
}
//浠撳簱绫诲瀷
--
Gitblit v1.9.1