From ba45c490755fafe369038b3b1901096a83bdceb7 Mon Sep 17 00:00:00 2001
From: luqingyang <lqy5492@163.com>
Date: 星期五, 03 十一月 2023 14:32:24 +0800
Subject: [PATCH] fix:代码调整
---
consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 158 insertions(+), 15 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 70c38b4..983c870 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,40 +1,54 @@
package com.consum.base.service;
+import com.consum.base.core.util.LockManage;
+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.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.Transactional;
import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* @ClassName LWhFormTransferCoreService
- * @Author cy
* @Date 2023/10/26
* @Description
* @Version 1.0
**/
@Service
@Slf4j
+@Transactional(rollbackFor = Exception.class)
public class LWhFormTransferCoreService {
@Resource
- private LWhProcureModelService lWhProcureModelService;
- @Resource
- private LWhFormTransferService lWhFormTransferService;
- @Resource
- private LWarehouseFlowCoreService lWarehouseFlowService;
+ private LWhFormTransferServiceImpl lWhFormTransferService;
@Resource
private LWhFormOutputCoreService lWhFormOutputCoreService;
+ @Resource
+ private GoodsBaseServiceImpl goodsBaseService;
+ @Resource
+ private LWhGoodsRecordService lWhGoodsRecordService;
+ @Resource
+ private LWhGoodsService lWhGoodsService;
+ @Resource
+ private LGoodsWhRecordServiceImpl lGoodsWhRecordService;
+ @Resource
+ private LWarehouseFlowService lWarehouseFlowService;
+// @Resource
+// private LWarehouseFlowService LWhGoodsRecordDetailsService;
/**
* 鎵ц璋冩嫧鍑哄簱鎿嶄綔
- * 1. 閫氳繃璋冩嫧鍗曘�怶H_FORM_TRANSFER銆� 纭畾璋冩嫧鍗曠墿鍝併�怢_WH_PROCURE_MODEL銆�
- * 2. 鏍￠獙搴撳瓨
- * 3. 鏇存柊杩涘嚭搴撴祦姘存�昏〃[L_WAREHOUSE_FLOW]銆佸悇瑙勬牸鐗╁搧鐨勮繘鍑哄簱銆怢_WH_GOODS_RECORD銆戙�佽繘鍑哄簱娴佹按鏄庣粏[L_WH_GOODS_RECORD_DETAILS]銆�
- * 搴撳瓨鐗╁搧璇︽儏锛圠_WH_GOODS锛�
- * 4. 鏇存柊璋冩嫧鍗曘�怶H_FORM_TRANSFER銆戜负寰呮帴鏀讹紝鏇存柊璋冩嫧鍗曠墿鍝併�怶H_FORM_TRANSFER_MODEL銆戝嚭搴撴祦姘碔D
*
* @param whFormTransferId 璋冩嫧鍗昳d
*/
@@ -54,17 +68,146 @@
Long outWarehouseFormId = null;
try {
// 鏍规嵁璋冩嫧鍗� 鐢熸垚 鍑哄簱鍗�
- outWarehouseFormId = lWhFormOutputCoreService.createOutFormByTransId(whFormTransferId, currentUser);
+ outWarehouseFormId = lWhFormOutputCoreService.createOutFormByTransId(whFormTransferId, currentUser, dealTime);
} catch (Exception e) {
log.error(e.getMessage());
return;
}
- // 鍑哄簱鍗� 鍑哄簱
- Long aLong = lWhFormOutputCoreService.outFormByTransId(whFormTransferId, currentUser);
+ // 鍑哄簱鍗� 鍑哄簱锛岃繑鍥� 鍑哄簱鍗曟祦姘碔d
+ Long lWarehouseFlowId = lWhFormOutputCoreService.outFormByTransId(outWarehouseFormId, currentUser, dealTime);
-
+ // 鏇存柊璋冩嫧鍗�
+ lWhFormTransfer = new LWhFormTransfer(whFormTransferId);
+ lWhFormTransfer.setOutWarehouseFormId(outWarehouseFormId);
+ lWhFormTransfer.setStates(1);
+ lWhFormTransfer.setOutOperatorId(userId);
+ lWhFormTransfer.setOutOperatorName(nickName);
+ lWhFormTransfer.setOutputTime(dealTime);
+ lWhFormTransfer.setOutWarehouseFlowId(lWarehouseFlowId);
+ lWhFormTransferService.update(lWhFormTransfer);
log.info("璋冩嫧鍗曪細{} 鍑哄簱瀹屾垚", whFormTransferId);
return;
}
+
+ /**
+ * 璋冩嫧鍗曞叆搴�
+ *
+ * @param whFormTransferId
+ * @param currentUser
+ */
+ public void doTransferInPut(Long whFormTransferId, S_user_core currentUser) {
+ LWhFormTransfer lWhFormTransfer = new LWhFormTransfer(whFormTransferId);
+ lWhFormTransfer = lWhFormTransferService.get(lWhFormTransfer);
+ if (lWhFormTransfer == null || lWhFormTransfer.getStates() != 1) {
+ log.error("璋冩嫧澶辫触锛佽妫�鏌ヨ皟鎷ㄥ崟鐘舵��");
+ return;
+ }
+ Long userId = currentUser.getId();
+ String nickName = currentUser.getNick_name();
+ // 鍑哄簱鍗曟祦姘磇d
+ Long outWarehouseFlowId = lWhFormTransfer.getOutWarehouseFlowId();
+ // 鍏ュ簱浠撳簱绫诲瀷 0鏈烘瀯1閮ㄩ棬
+ Integer inWarehouseType = lWhFormTransfer.getInWarehouseType();
+ Long inWarehouseId = lWhFormTransfer.getInWarehouseId();
+ String inWarehouseName = lWhFormTransfer.getInWarehouseName();
+
+ long dealTime = DateUtils.getDateTimeNumber(System.currentTimeMillis());
+
+ // 娴佹按璁板綍鎬昏〃ID
+ long inWarehouseFlowId = NumberGenerator.getLongSequenceNumber();
+ // 鏍规嵁鍑哄簱娴佹按ID 鏌ヨ 鍑哄簱鐨勭墿鍝両D
+ List<Long> outGoodsIds = getGoodsidByFlowId(outWarehouseFlowId);
+
+ // 鎻掑叆 杩涘嚭搴撴祦姘存�昏〃[L_WAREHOUSE_FLOW]
+ LWarehouseFlow inwarehouseFlow = new LWarehouseFlow();
+ inwarehouseFlow.setId(inWarehouseFlowId);
+ inwarehouseFlow.setWarehouseType(inWarehouseType);
+ inwarehouseFlow.setWarehouseId(inWarehouseId);
+ inwarehouseFlow.setWarehouseName(inWarehouseName);
+ inwarehouseFlow.setThisType(1);
+ inwarehouseFlow.setBusinessType(2);
+ inwarehouseFlow.setBusinessFormId(whFormTransferId);
+ inwarehouseFlow.setOperatorId(userId);
+ inwarehouseFlow.setOperatorName(nickName);
+ inwarehouseFlow.setDealTime(dealTime);
+ lWarehouseFlowService.insert(inwarehouseFlow);
+
+ LWhGoodsRecord lWhGoodsRecord = new LWhGoodsRecord();
+ lWhGoodsRecord.setWarehouseFlowId(outWarehouseFlowId);
+ List<LWhGoodsRecord> whGoodsRecordList = lWhGoodsRecordService.select(lWhGoodsRecord);
+ for (LWhGoodsRecord whGoodsRecord : whGoodsRecordList) {
+ Long oldRecordId = whGoodsRecord.getId();
+ Long baseGoodsModelsId = whGoodsRecord.getBaseGoodsModelsId();
+ whGoodsRecord.setId(NumberGenerator.getLongSequenceNumber());
+ whGoodsRecord.setWarehouseType(inWarehouseType);
+ whGoodsRecord.setWarehouseId(inWarehouseId);
+ whGoodsRecord.setDealTime(dealTime);
+ //閫氳繃LockManage鑾峰緱閿�
+ Object warehouseModelLockObj = LockManage.acquireLock(inWarehouseType, inWarehouseId, baseGoodsModelsId);
+ synchronized (warehouseModelLockObj) {
+ // 鑾峰緱閿佸悗鏌ヨ璇ュ瀷鍙风殑鏈熷垵鏁伴噺
+ int goodsModelNum = lWhGoodsService.queryGoodsModelNum(inWarehouseType, inWarehouseId, baseGoodsModelsId, (short) 1, null);
+ whGoodsRecord.setInitialCount(goodsModelNum);
+ whGoodsRecord.setEndCount(goodsModelNum + whGoodsRecord.getThisCount());
+ }
+ LWhGoodsRecordDetails lWhGoodsRecordDetails = new LWhGoodsRecordDetails();
+ lWhGoodsRecordDetails.setWhGoodsRecordId(oldRecordId);
+ List<LWhGoodsRecordDetails> goodsRecordDetailsList = null;// LWhGoodsRecordDetailsService.select(lWhGoodsRecordDetails);
+ for (LWhGoodsRecordDetails whGoodsRecordDetails : goodsRecordDetailsList) {
+ whGoodsRecordDetails.setId(NumberGenerator.getLongSequenceNumber());
+ whGoodsRecordDetails.setThisType(1);
+ }
+// LWhGoodsRecordDetailsService.insertBatch(goodsRecordDetailsList);
+ }
+ lWhGoodsRecordService.insertBatch(whGoodsRecordList);
+
+ // 搴撳瓨鐗╁搧璇︽儏锛圠_WH_GOODS锛変腑 鐘舵�佽缃负1
+ lWhGoodsService.modGoodsTransfering(outGoodsIds, inWarehouseType, inWarehouseId, inWarehouseName, (short) 1);
+ //灏嗕繚绠′粨搴撲俊鎭洿鏂板埌 鐗╁搧浠撳簱淇濈璁板綍銆怢_GOODS_WH_RECORD銆�
+ lGoodsWhRecordService.insertNewRecord(outGoodsIds, inWarehouseFlowId, dealTime);
+
+ //鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��
+ Integer businessType = lWhFormTransfer.getBusinessType();
+ if (businessType == 1) {
+ // 闇�瑕佸線 鐗╁搧浣跨敤璁板綍銆怢_GOODS_USER_RECORD銆� 澧炲姞璁板綍
+
+ } else if (businessType == 2) {
+ // 闇�瑕佸線 鐗╁搧浣跨敤璁板綍銆怢_GOODS_USER_RECORD銆� 澧炲姞璁板綍
+
+ }
+
+
+ // 鏇存柊璋冩嫧鍗�
+ lWhFormTransfer = new LWhFormTransfer(whFormTransferId);
+ lWhFormTransfer.setInWarehouseFormId(inWarehouseFlowId);
+ lWhFormTransfer.setStates(2);
+ lWhFormTransfer.setInOperatorId(userId);
+ lWhFormTransfer.setInOperatorName(nickName);
+ lWhFormTransfer.setInTime(dealTime);
+ lWhFormTransferService.update(lWhFormTransfer);
+ log.info("璋冩嫧鍗曪細{} 鍏ュ簱瀹屾垚", whFormTransferId);
+ return;
+ }
+
+
+ private static String GET_GOODSID_BY_FLOWID = "SELECT goods.id FROM L_WH_GOODS_RECORD gr LEFT JOIN L_WH_GOODS_RECORD_DETAILS grd ON gr.id=grd.WH_GOODS_RECORD_ID LEFT JOIN L_WH_GOODS goods ON goods.id=grd.WH_GOODS_ID WHERE 1=1";
+
+ /**
+ * 鏍规嵁鍑哄簱娴佹按ID 鏌ヨ 鍑哄簱鐨勭墿鍝両D
+ *
+ * @param lWarehouseFlowId
+ */
+ private List<Long> getGoodsidByFlowId(long lWarehouseFlowId) {
+ StringBuilder sql = new StringBuilder(GET_GOODSID_BY_FLOWID);
+ Map<String, Object> paramts = new HashMap<>();
+ sql.append(" and gr.WAREHOUSE_FLOW_ID =:lWarehouseFlowId");
+ paramts.put("lWarehouseFlowId", lWarehouseFlowId);
+ List<Map<String, Object>> outGoods = goodsBaseService.select(sql.toString(), paramts);
+ if (CollectionUtils.isEmpty(outGoods)) {
+ return null;
+ }
+ List<Long> whGoodsIds = outGoods.stream().map(map -> (Long) map.get("id")).collect(Collectors.toList());
+ return whGoodsIds;
+ }
}
--
Gitblit v1.9.1