From 2af69a47b08aa4988cc9733a361a733a671a5f81 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 09 十二月 2023 17:37:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java
index 144e817..74df6dc 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java
@@ -1,10 +1,11 @@
package com.consum.base.service;
-import com.consum.base.core.utils.LockManage;
-import com.consum.model.po.*;
-import com.walker.infrastructure.utils.CollectionUtils;
-import com.walker.infrastructure.utils.NumberGenerator;
-import lombok.extern.slf4j.Slf4j;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.annotation.PostConstruct;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -12,11 +13,19 @@
import org.springframework.jdbc.core.namedparam.SqlParameterSource;
import org.springframework.jdbc.core.simple.SimpleJdbcCall;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.PostConstruct;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
+import com.consum.base.core.utils.IdUtil;
+import com.consum.base.core.utils.LockManage;
+import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.LWarehouseFlow;
+import com.consum.model.po.LWhFormProcure;
+import com.consum.model.po.LWhGoodsRecord;
+import com.consum.model.po.LWhProcureModel;
+import com.walker.infrastructure.utils.CollectionUtils;
+
+import lombok.extern.slf4j.Slf4j;
/**
* @ClassName LWarehouseFlowService
@@ -26,14 +35,15 @@
**/
@Service
@Slf4j
+@Transactional(propagation = Propagation.REQUIRED)
public class LWarehouseFlowCoreService {
private final JdbcTemplate jdbcTemplate;
private SimpleJdbcCall simpleJdbcCall;
private LWarehouseFlowService lWarehouseFlowService;
private LWhGoodsService lWhGoodsService;
- private LWhGoodsRecordService lWhGoodsRecordService;
- private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
+ private LWhGoodsRecordService lWhGoodsRecordServiceImpl;
+ private BaseGoodsTemplateService baseGoodsTemplateService;
@Value("${spring.datasource.dataBaseName}")
private String dataBaseName;
@@ -45,12 +55,12 @@
@Autowired
public LWarehouseFlowCoreService(JdbcTemplate jdbcTemplate, LWarehouseFlowService lWarehouseFlowService, LWhGoodsService lWhGoodsService,
- BaseGoodsTemplateServiceImpl baseGoodsTemplateService, LWhGoodsRecordService lWhGoodsRecordService) {
+ BaseGoodsTemplateService baseGoodsTemplateService, LWhGoodsRecordService lWhGoodsRecordServiceImpl) {
this.jdbcTemplate = jdbcTemplate;
this.lWarehouseFlowService = lWarehouseFlowService;
this.baseGoodsTemplateService = baseGoodsTemplateService;
this.lWhGoodsService = lWhGoodsService;
- this.lWhGoodsRecordService = lWhGoodsRecordService;
+ this.lWhGoodsRecordServiceImpl = lWhGoodsRecordServiceImpl;
}
/**
@@ -78,8 +88,8 @@
//閲囪喘鏂瑰紡锛�1锛氶泦閲囷紱2=鑷噰锛�
short buyType = lWhFormProcure.getBuyType().shortValue();
//閲囪喘鏃堕棿
- Long procureTime = lWhFormProcure.getProcureTime();
-
+ Long procureTime2 = lWhFormProcure.getProcureTime();
+ Long procureTime = procureTime2 == null ? dealTime : procureTime2;
// 鎻掑叆娴佹按鎬昏〃
int flowInsertFlag = lWarehouseFlowService.insert(warehouseFlow);
if (flowInsertFlag == 0) {
@@ -109,7 +119,7 @@
String goodsUnit = (String) tempGoodsInfo.get("unit");
// 鎻掑叆 鍚勮鏍肩墿鍝佺殑杩涘嚭搴撹褰� L_WH_GOODS_RECORD
- long whGoodsRecordId = NumberGenerator.getLongSequenceNumberNano();
+ long whGoodsRecordId = IdUtil.generateId();
LWhGoodsRecord whGoodsRecord = new LWhGoodsRecord();
whGoodsRecord.setId(whGoodsRecordId);
whGoodsRecord.setWarehouseId(warehouseId);
@@ -150,7 +160,7 @@
;
whGoodsRecord.setTotalPrice(totalPrice);
}
- lWhGoodsRecordService.insert(whGoodsRecord);
+ lWhGoodsRecordServiceImpl.insert(whGoodsRecord);
});
return 1;
--
Gitblit v1.9.1