From 458760a9367ada2b046752b8918e5171876cd959 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期一, 30 十月 2023 10:57:45 +0800
Subject: [PATCH] feat: 仓库调拨出入库
---
consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java | 45 +++++++++++++++++++++++++++++++++++----------
consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java | 2 +-
2 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
index e8988b6..b0b9fad 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
@@ -149,7 +149,7 @@
* 鏍规嵁 鍑哄簱鍗� 鍑哄簱
*
* @param outWarehouseFormId 鍑哄簱鍗旾d
- * @return
+ * @return 娴佹按璁板綍鎬昏〃ID
*/
@Transactional(rollbackFor = Exception.class)
public Long outFormByTransId(Long outWarehouseFormId, S_user_core currentUser, Long dealTime) {
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 ab0191b..87031aa 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
@@ -19,23 +19,13 @@
@Slf4j
public class LWhFormTransferCoreService {
@Resource
- private LWhProcureModelService lWhProcureModelService;
- @Resource
private LWhFormTransferService lWhFormTransferService;
- @Resource
- private LWarehouseFlowCoreService lWarehouseFlowService;
@Resource
private LWhFormOutputCoreService lWhFormOutputCoreService;
/**
* 鎵ц璋冩嫧鍑哄簱鎿嶄綔
- * 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
*/
public void doTransferOutPut(Long whFormTransferId, S_user_core currentUser) {
@@ -75,4 +65,39 @@
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 outWarehouseFormId = lWhFormTransfer.getOutWarehouseFormId();
+ long dealTime = DateUtils.getDateTimeNumber(System.currentTimeMillis());
+ // 娴佹按璁板綍鎬昏〃ID
+ long lWarehouseFlowId = lWhFormOutputCoreService.outFormByTransId(outWarehouseFormId, currentUser, dealTime);
+
+ // 鏇存柊璋冩嫧鍗�
+ lWhFormTransfer = new LWhFormTransfer(whFormTransferId);
+ lWhFormTransfer.setInWarehouseFormId(lWarehouseFlowId);
+ lWhFormTransfer.setStates(2);
+ lWhFormTransfer.setInOperatorId(userId);
+ lWhFormTransfer.setInOperatorName(nickName);
+ lWhFormTransfer.setInTime(dealTime);
+ lWhFormTransferService.update(lWhFormTransfer);
+
+ log.info("璋冩嫧鍗曪細{} 鍏ュ簱瀹屾垚", whFormTransferId);
+ return;
+ }
}
--
Gitblit v1.9.1