From a8ba678a3fe5a39da2c732014cebbb66e408e97c Mon Sep 17 00:00:00 2001
From: WangHan <wwh_work@126,com>
Date: 星期三, 02 四月 2025 18:45:12 +0800
Subject: [PATCH] 问题与漏洞修改
---
consum-base/src/main/java/com/consum/base/service/core/LWhFormTransferCoreService.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/core/LWhFormTransferCoreService.java b/consum-base/src/main/java/com/consum/base/service/core/LWhFormTransferCoreService.java
index 6603f98..b3d2dfd 100644
--- a/consum-base/src/main/java/com/consum/base/service/core/LWhFormTransferCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/core/LWhFormTransferCoreService.java
@@ -7,8 +7,7 @@
import java.util.Map;
import java.util.stream.Collectors;
-import javax.annotation.Resource;
-
+import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
@@ -134,7 +133,6 @@
lWhFormTransferService.update(lWhFormTransfer);
log.info("璋冩嫧鍗曪細{} 鍑哄簱瀹屾垚", whFormTransferId);
- return;
}
@@ -174,7 +172,7 @@
String inWarehouseName = lWhFormTransfer.getInWarehouseName();
// 娴佹按璁板綍鎬昏〃ID
- long lWarehouseFlowId = NumberGenerator.getLongSequenceNumberNano();
+ long lWarehouseFlowId = IdUtil.generateId();
// 娴佹按璁板綍鎬昏〃涓� 涓氬姟ID 銆傝皟鎷ㄥ崟鏃� 淇濆瓨璋冩嫧鍗昳d 鍑哄簱鍗曟椂 淇濆瓨鍑哄簱鍗昳d
long lWarehouseFlowBusinessId = whFormTransferId;
@@ -205,7 +203,7 @@
String modelName = (String)tempGoodsInfo.get("modelname");
// 鎻掑叆 鍚勮鏍肩墿鍝佺殑杩涘嚭搴撹褰� L_WH_GOODS_RECORD
- long whGoodsRecordId = NumberGenerator.getLongSequenceNumberNano();
+ long whGoodsRecordId = IdUtil.generateId();
LWhGoodsRecord whGoodsRecord = new LWhGoodsRecord();
whGoodsRecord.setId(whGoodsRecordId);
whGoodsRecord.setWarehouseId(outWarehouseId);
@@ -231,7 +229,8 @@
log.error("鍑哄簱澶辫触锛佸瀷鍙穥} 鐨勬暟閲忎笉瓒筹紝闇�瑕佽皟鎷▄}涓紝浠撳簱涓幇瀛榹}涓�", baseGoodsModelsId, counts, goodsModelNum);
// 鎵嬪姩鍥炴粴
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- throw new RuntimeException("鍑哄簱澶辫触!鍨嬪彿鏁伴噺涓嶈冻");
+ //throw new RuntimeException("鍑哄簱澶辫触!鍨嬪彿鏁伴噺涓嶈冻");
+ return -1L;
}
whGoodsRecord.setInitialCount(goodsModelNum);
whGoodsRecord.setEndCount(goodsModelNum - counts);
@@ -325,7 +324,7 @@
long dealTime = DateUtils.getDateTimeNumber(System.currentTimeMillis());
// 娴佹按璁板綍鎬昏〃ID
- long inWarehouseFlowId = NumberGenerator.getLongSequenceNumber();
+ long inWarehouseFlowId = IdUtil.generateId();
// 鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��
Integer businessType = lWhFormTransfer.getBusinessType();
// 鐘舵�侊紙0=鍦ㄩ�旇皟鎷紱1=鍏ュ簱鏈垎鍙戯紱2=宸蹭笅鍙戯紱3=鎶ュ簾 4 闆舵槦鍑哄簱锛�
--
Gitblit v1.9.1