From b3585e6475b7a7ab38fcb8af79def5e938a297ea Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期三, 22 十一月 2023 18:45:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/LWhFormProcureCoreService.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureCoreService.java
index db31877..adb9a3e 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureCoreService.java
@@ -9,13 +9,14 @@
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.List;
/**
* @ClassName LWhFormProcureCoreService
- * @Author cy
+
* @Date 2023/10/26
* @Description
* @Version 1.0
@@ -37,13 +38,17 @@
* 绗竴姝ワ細閫氳繃閲囪喘鍗旾D鏌ヨ閲囪喘鍗曞瀷鍙枫�怢_WH_PROCURE_MODEL銆戝緱鍒板晢鍝佸瀷鍙蜂互鍙婃暟閲�
* 绗簩姝ワ細璁板綍杩涘嚭搴撴祦姘达細L_WAREHOUSE_FLOW
*/
- public void doProcure(Long whFormProcureId, S_user_core currentUser) {
+ @Transactional(rollbackFor = Exception.class)
+ public String doProcure(Long whFormProcureId, S_user_core currentUser) {
+ if (whFormProcureId == null) {
+ return "閲囪喘鍗昳d涓虹┖";
+ }
//閲囪喘鍗曚俊鎭�
LWhFormProcure whFormProcure = new LWhFormProcure(whFormProcureId);
LWhFormProcure lWhFormProcure = lWhFormProcureService.get(whFormProcure);
- if (lWhFormProcure == null || lWhFormProcure.getStates() != 0) {
+ if (lWhFormProcure == null || lWhFormProcure.getStates() != 1) {
log.error("鍏ュ簱澶辫触锛佽妫�鏌ュ叆搴撳崟鐘舵��");
- return;
+ return "鍏ュ簱澶辫触锛佽妫�鏌ュ叆搴撳崟鐘舵��";
}
Long userId = currentUser.getId();
String nickName = currentUser.getNick_name();
@@ -54,6 +59,7 @@
long lWarehouseFlowId = NumberGenerator.getLongSequenceNumberNano();
LWarehouseFlow warehouseFlow = new LWarehouseFlow();
warehouseFlow.setId(lWarehouseFlowId);
+ warehouseFlow.setWarehouseType(0);
warehouseFlow.setWarehouseId(lWhFormProcure.getWarehouseId());
warehouseFlow.setWarehouseName(lWhFormProcure.getWarehouseName());
warehouseFlow.setThisType(1);
@@ -65,7 +71,8 @@
int flowInsertFlag = lWarehouseFlowService.buyInsertWareFlow(goodsModelNum, lWhFormProcure, warehouseFlow);
if (flowInsertFlag == 1) {
// 鏇存柊閲囪喘鍗曘�怢_WH_FORM_PROCURE銆�
- whFormProcure.setStates(1);
+ whFormProcure = new LWhFormProcure(whFormProcureId);
+ whFormProcure.setStates(2);
whFormProcure.setLWarehouseFlowId(lWarehouseFlowId);
whFormProcure.setIncomeId(userId);
whFormProcure.setIncomeName(nickName);
@@ -73,7 +80,7 @@
lWhFormProcureService.update(whFormProcure);
}
log.info("鍏ュ簱鍗曪細{} 鍏ュ簱瀹屾垚", whFormProcureId);
- return;
+ return null;
}
}
--
Gitblit v1.9.1