From c1ac6d13630b04b4e11d6f383858e4f8fa64f924 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 02 十二月 2023 17:24:34 +0800
Subject: [PATCH] 盘点查询返回结果修改
---
consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 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 81cd08f..e890509 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
@@ -5,23 +5,27 @@
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.consum.model.po.LGoodsUserRecord;
+import com.consum.model.po.LWarehouseFlow;
+import com.consum.model.po.LWhFormTransfer;
+import com.consum.model.po.LWhGoodsRecord;
+import com.consum.model.po.LWhGoodsRecordDetails;
+import com.consum.model.po.LWhProcureModelUser;
import com.iplatform.model.po.S_user_core;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.NumberGenerator;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
-import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
/**
* @ClassName LWhFormTransferCoreService
@@ -35,7 +39,7 @@
public class LWhFormTransferCoreService {
@Resource
- private LWhFormTransferServiceImpl lWhFormTransferService;
+ private LWhFormTransferService lWhFormTransferService;
@Resource
private LWhFormOutputCoreService lWhFormOutputCoreService;
@Resource
@@ -128,7 +132,7 @@
String nickName = currentUser.getNick_name();
// 鍑哄簱鍗曟祦姘磇d
Long outWarehouseFlowId = lWhFormTransfer.getOutWarehouseFlowId();
- if (outWarehouseFlowId == null){
+ if (outWarehouseFlowId == null) {
log.error("璋冩嫧澶辫触锛佹湭鎵惧埌鍑哄簱鍗�");
return;
}
@@ -188,7 +192,7 @@
synchronized (warehouseModelLockObj) {
// 鏍规嵁鍑哄簱娴佹按ID 鏌ヨ 鍑哄簱鐨勭墿鍝両D
outGoodsIds = getGoodsidByFlowId(outWarehouseFlowId, oldRecordId);
- if (CollectionUtils.isEmpty(outGoodsIds)){
+ if (CollectionUtils.isEmpty(outGoodsIds)) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
throw new RuntimeException("鍏ュ簱鍗曞け璐ワ紝鏈煡璇㈠埌鐗╁搧锛�");
}
@@ -211,7 +215,7 @@
lWhProcureModelUser.setTransBusinessId(whFormTransferId);
lWhProcureModelUser.setBaseGoodsModelsId(baseGoodsModelsId);
List<LWhProcureModelUser> goodsUserInfo = goodsBaseService.select(lWhProcureModelUser);
- if (CollectionUtils.isEmpty(goodsUserInfo)){
+ if (CollectionUtils.isEmpty(goodsUserInfo)) {
continue;
}
int totalGoodsNum = goodsUserInfo.stream().filter(item -> item.getGoodsNum() != null).mapToInt(LWhProcureModelUser::getGoodsNum).sum();
@@ -258,7 +262,6 @@
//灏嗕繚绠′粨搴撲俊鎭洿鏂板埌 鐗╁搧浠撳簱淇濈璁板綍銆怢_GOODS_WH_RECORD銆�
lGoodsWhRecordService.insertNewRecord(outGoodsIds, inWarehouseFlowId, dealTime);
-
LWhGoodsRecordDetails lWhGoodsRecordDetails = new LWhGoodsRecordDetails();
lWhGoodsRecordDetails.setWhGoodsRecordId(oldRecordId);
List<LWhGoodsRecordDetails> goodsRecordDetailsList = lWhGoodsRecordDetailsService.select(lWhGoodsRecordDetails);
@@ -282,7 +285,7 @@
lWhFormTransferService.update(lWhFormTransfer);
//褰撳簱瀛樺彉鍔ㄦ椂璋冪敤璇ユ柟娉�
- if (inWarehouseType == 0){
+ if (inWarehouseType == 0) {
lWhWarningCoreService.updateKuCun(Convert.toShort(inWarehouseType, (short) 0), inWarehouseId, allChangModelList, null, dealTime);
}
log.info("璋冩嫧鍗曪細{} 鍏ュ簱瀹屾垚", whFormTransferId);
--
Gitblit v1.9.1