From ceecebe477faf5a45b19f3b258f7add8f93b4583 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 05 十二月 2023 10:00:24 +0800
Subject: [PATCH] 代码优化 结构调整
---
consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java | 141 +++++++++++++++++++++++++----------------------
1 files changed, 75 insertions(+), 66 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 9fedf1b..25ab0e0 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
@@ -1,26 +1,35 @@
package com.consum.base.service;
-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.LockManage;
-import com.consum.model.po.*;
-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 org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+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.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 cn.hutool.core.convert.Convert;
+import lombok.extern.slf4j.Slf4j;
/**
* @ClassName LWhFormTransferCoreService
@@ -34,13 +43,13 @@
public class LWhFormTransferCoreService {
@Resource
- private LWhFormTransferServiceImpl lWhFormTransferService;
+ private LWhFormTransferService lWhFormTransferService;
@Resource
private LWhFormOutputCoreService lWhFormOutputCoreService;
@Resource
private GoodsBaseServiceImpl goodsBaseService;
@Resource
- private LWhGoodsRecordService lWhGoodsRecordService;
+ private LWhGoodsRecordService lWhGoodsRecordServiceImpl;
@Resource
private LWhGoodsService lWhGoodsService;
@Resource
@@ -93,7 +102,7 @@
return;
}
// 鍑哄簱鍗� 鍑哄簱锛岃繑鍥� 鍑哄簱鍗曟祦姘碔d
- Long lWarehouseFlowId = lWhFormOutputCoreService.outFormByTransId(outWarehouseFormId, businessEnum, currentUser, dealTime);
+ Long lWarehouseFlowId = lWhFormOutputCoreService.outFormByTransId(outWarehouseFormId, businessEnum, currentUser, dealTime, whFormTransferId);
// 鏇存柊璋冩嫧鍗�
lWhFormTransfer = new LWhFormTransfer(whFormTransferId);
@@ -127,7 +136,7 @@
String nickName = currentUser.getNick_name();
// 鍑哄簱鍗曟祦姘磇d
Long outWarehouseFlowId = lWhFormTransfer.getOutWarehouseFlowId();
- if (outWarehouseFlowId == null){
+ if (outWarehouseFlowId == null) {
log.error("璋冩嫧澶辫触锛佹湭鎵惧埌鍑哄簱鍗�");
return;
}
@@ -172,12 +181,13 @@
ArrayList<Long> allChangModelList = new ArrayList<>();
LWhGoodsRecord lWhGoodsRecord = new LWhGoodsRecord();
lWhGoodsRecord.setWarehouseFlowId(outWarehouseFlowId);
- List<LWhGoodsRecord> whGoodsRecordList = lWhGoodsRecordService.select(lWhGoodsRecord);
+ List<LWhGoodsRecord> whGoodsRecordList = lWhGoodsRecordServiceImpl.select(lWhGoodsRecord);
for (LWhGoodsRecord whGoodsRecord : whGoodsRecordList) {
Long oldRecordId = whGoodsRecord.getId();
Long baseGoodsModelsId = whGoodsRecord.getBaseGoodsModelsId();
allChangModelList.add(baseGoodsModelsId);
- whGoodsRecord.setId(NumberGenerator.getLongSequenceNumber());
+ whGoodsRecord.setId(IdUtil.generateId());
+ whGoodsRecord.setWarehouseFlowId(inWarehouseFlowId);
whGoodsRecord.setWarehouseType(inWarehouseType);
whGoodsRecord.setWarehouseId(inWarehouseId);
whGoodsRecord.setDealTime(dealTime);
@@ -187,7 +197,7 @@
synchronized (warehouseModelLockObj) {
// 鏍规嵁鍑哄簱娴佹按ID 鏌ヨ 鍑哄簱鐨勭墿鍝両D
outGoodsIds = getGoodsidByFlowId(outWarehouseFlowId, oldRecordId);
- if (CollectionUtils.isEmpty(outGoodsIds)){
+ if (CollectionUtils.isEmpty(outGoodsIds)) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
throw new RuntimeException("鍏ュ簱鍗曞け璐ワ紝鏈煡璇㈠埌鐗╁搧锛�");
}
@@ -203,60 +213,59 @@
}
if (businessType == 1) {
// List<Map<String, Object>> modelInfo = baseGoodsModelsService.queryGoodsModelInfo(baseGoodsModelsId);
-
// 1閮ㄩ棬鍒嗗彂 姝ゆ椂瑕佸線 鐗╁搧浣跨敤璁板綍銆怢_GOODS_USER_RECORD銆戞坊鍔犳暟鎹�
//鏌ヨ閮ㄩ棬鍒嗗彂浣跨敤浜�
LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
lWhProcureModelUser.setTransBusinessId(whFormTransferId);
lWhProcureModelUser.setBaseGoodsModelsId(baseGoodsModelsId);
List<LWhProcureModelUser> goodsUserInfo = goodsBaseService.select(lWhProcureModelUser);
- if (CollectionUtils.isEmpty(goodsUserInfo)){
- continue;
- }
- int totalGoodsNum = goodsUserInfo.stream().filter(item -> item.getGoodsNum() != null).mapToInt(LWhProcureModelUser::getGoodsNum).sum();
- if (totalGoodsNum != outGoodsIds.size()) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- throw new RuntimeException("鍏ュ簱鍗曞け璐ワ紝浣跨敤浜轰娇鐢ㄦ暟閲忎笌鐗╁搧鏁伴噺涓嶄竴鑷�");
-// log.error("鍒涘缓鍏ュ簱鍗曞け璐�");
- }
//灏嗙墿鍝佸瀷鍙蜂互鍓嶇殑浣跨敤璁板綍璁剧疆涓洪潪鏈�鏂�
lGoodsUserRecordService.updSetNotLast(outGoodsIds);
- ArrayList<LGoodsUserRecord> goodsUserRecordList = new ArrayList<>();
- int startIndex = 0;
- for (LWhProcureModelUser whProcureModelUser : goodsUserInfo) {
- Integer goodsNum = whProcureModelUser.getGoodsNum();
- String nowUserName = whProcureModelUser.getNowUserName();
- Long nowUserPhone = whProcureModelUser.getNowUserPhone();
- Long procureModelUserRecordId = whProcureModelUser.getProcureModelUserRecordId();
- List<Long> goodsIds = outGoodsIds.subList(startIndex, startIndex + goodsNum);
- for (Long goodsId : goodsIds) {
- LGoodsUserRecord tmp = new LGoodsUserRecord();
- tmp.setWhGoodsId(goodsId);
- tmp.setRecordType(recordType);
- tmp.setTransBusinessId(whFormTransferId);
- if (businessType == 1) {
- tmp.setNowUserName(nowUserName);
- tmp.setNowUserPhone(nowUserPhone);
- } else if (businessType == 2) {
- tmp.setNowUserName(null);
- tmp.setNowUserPhone(null);
- }
- tmp.setProcureModelUserRecordId(procureModelUserRecordId);
- tmp.setOperatorId(userId);
- tmp.setOperatorName(nickName);
- tmp.setDealTime(dealTime);
- tmp.setLastRecord(1);
- goodsUserRecordList.add(tmp);
+ if (!CollectionUtils.isEmpty(goodsUserInfo)) {
+ //璁や负鏄疉绫荤墿鍝�
+ int totalGoodsNum = goodsUserInfo.stream().filter(item -> item.getGoodsNum() != null).mapToInt(LWhProcureModelUser::getGoodsNum).sum();
+ if (totalGoodsNum != outGoodsIds.size()) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ throw new RuntimeException("鍏ュ簱鍗曞け璐ワ紝浣跨敤浜轰娇鐢ㄦ暟閲忎笌鐗╁搧鏁伴噺涓嶄竴鑷�");
+// log.error("鍒涘缓鍏ュ簱鍗曞け璐�");
}
- // 鏇存柊涓嬫爣浣嶇疆
- startIndex += goodsNum;
+
+ ArrayList<LGoodsUserRecord> goodsUserRecordList = new ArrayList<>();
+ int startIndex = 0;
+ for (LWhProcureModelUser whProcureModelUser : goodsUserInfo) {
+ Integer goodsNum = whProcureModelUser.getGoodsNum();
+ String nowUserName = whProcureModelUser.getNowUserName();
+ Long nowUserPhone = whProcureModelUser.getNowUserPhone();
+ Long procureModelUserRecordId = whProcureModelUser.getProcureModelUserRecordId();
+ List<Long> goodsIds = outGoodsIds.subList(startIndex, startIndex + goodsNum);
+ for (Long goodsId : goodsIds) {
+ LGoodsUserRecord tmp = new LGoodsUserRecord();
+ tmp.setWhGoodsId(goodsId);
+ tmp.setRecordType(recordType);
+ tmp.setTransBusinessId(whFormTransferId);
+ if (businessType == 1) {
+ tmp.setNowUserName(nowUserName);
+ tmp.setNowUserPhone(nowUserPhone);
+ } else if (businessType == 2) {
+ tmp.setNowUserName(null);
+ tmp.setNowUserPhone(null);
+ }
+ tmp.setProcureModelUserRecordId(procureModelUserRecordId);
+ tmp.setOperatorId(userId);
+ tmp.setOperatorName(nickName);
+ tmp.setDealTime(dealTime);
+ tmp.setLastRecord(1);
+ goodsUserRecordList.add(tmp);
+ }
+ // 鏇存柊涓嬫爣浣嶇疆
+ startIndex += goodsNum;
+ }
+ //鎵归噺鎻掑叆浣跨敤浜鸿褰�
+ lGoodsUserRecordService.insertBatch(goodsUserRecordList);
}
- //鎵归噺鎻掑叆浣跨敤浜鸿褰�
- lGoodsUserRecordService.insertBatch(goodsUserRecordList);
}
//灏嗕繚绠′粨搴撲俊鎭洿鏂板埌 鐗╁搧浠撳簱淇濈璁板綍銆怢_GOODS_WH_RECORD銆�
lGoodsWhRecordService.insertNewRecord(outGoodsIds, inWarehouseFlowId, dealTime);
-
LWhGoodsRecordDetails lWhGoodsRecordDetails = new LWhGoodsRecordDetails();
lWhGoodsRecordDetails.setWhGoodsRecordId(oldRecordId);
@@ -268,7 +277,7 @@
}
lWhGoodsRecordDetailsService.insertBatch(goodsRecordDetailsList);
}
- lWhGoodsRecordService.insertBatch(whGoodsRecordList);
+ lWhGoodsRecordServiceImpl.insertBatch(whGoodsRecordList);
// 鏇存柊璋冩嫧鍗�
lWhFormTransfer = new LWhFormTransfer(whFormTransferId);
@@ -281,7 +290,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