From b8ec2530b16d89056909ff2ececdf41340b51fff Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 02 十二月 2023 12:06:41 +0800
Subject: [PATCH] 部门分发详情,明细
---
consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
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..81cd08f 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
@@ -3,6 +3,7 @@
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.model.po.*;
import com.iplatform.model.po.S_user_core;
@@ -127,6 +128,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();
@@ -173,7 +178,7 @@
Long oldRecordId = whGoodsRecord.getId();
Long baseGoodsModelsId = whGoodsRecord.getBaseGoodsModelsId();
allChangModelList.add(baseGoodsModelsId);
- whGoodsRecord.setId(NumberGenerator.getLongSequenceNumber());
+ whGoodsRecord.setId(IdUtil.generateId());
whGoodsRecord.setWarehouseType(inWarehouseType);
whGoodsRecord.setWarehouseId(inWarehouseId);
whGoodsRecord.setDealTime(dealTime);
@@ -183,6 +188,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);
--
Gitblit v1.9.1