From 3836720e3b0fc9ab884d178e0ac27e942b175da2 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 05 十二月 2023 15:23:01 +0800
Subject: [PATCH] 报废单添加金额字段
---
consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java | 47 +++++++++++++++++++++++------------------------
1 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java
index 5dfc08d..c1a5c9e 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java
@@ -1,8 +1,19 @@
package com.consum.base.service;
-import cn.hutool.core.convert.Convert;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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.LWarehouseFlow;
import com.consum.model.po.LWhFormScrapped;
@@ -10,17 +21,9 @@
import com.consum.model.po.LWhGoodsRecord;
import com.iplatform.model.po.S_user_core;
import com.walker.infrastructure.utils.CollectionUtils;
-import com.walker.infrastructure.utils.NumberGenerator;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
+import cn.hutool.core.convert.Convert;
+import lombok.extern.slf4j.Slf4j;
/**
* @ClassName LWhFormScrappedCoreService
@@ -30,24 +33,25 @@
**/
@Service
@Slf4j
+@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
public class LWhFormScrappedCoreService {
private GoodsBaseServiceImpl goodsBaseService;
private LWhFormScrappedGoodsService lWhFormScrappedGoodsService;
- private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
+ private BaseGoodsTemplateService baseGoodsTemplateService;
private LWhGoodsService lWhGoodsService;
private LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService;
- private LWhGoodsRecordService lWhGoodsRecordService;
+ private LWhGoodsRecordService lWhGoodsRecordServiceImpl;
private LWarehouseFlowService lWarehouseFlowService;
private LWhWarningCoreServiceImpl lWhWarningCoreService;
@Autowired
public LWhFormScrappedCoreService(GoodsBaseServiceImpl goodsBaseService,
LWhFormScrappedGoodsService lWhFormScrappedGoodsService,
- BaseGoodsTemplateServiceImpl baseGoodsTemplateService,
+ BaseGoodsTemplateService baseGoodsTemplateService,
LWhGoodsService lWhGoodsService,
LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService,
- LWhGoodsRecordService lWhGoodsRecordService,
+ LWhGoodsRecordService lWhGoodsRecordServiceImpl,
LWarehouseFlowService lWarehouseFlowService,
LWhWarningCoreServiceImpl lWhWarningCoreService) {
// this.lWhFormScrappedService = lWhFormScrappedService;
@@ -55,7 +59,7 @@
this.baseGoodsTemplateService = baseGoodsTemplateService;
this.lWhGoodsService = lWhGoodsService;
this.lWhGoodsRecordDetailsService = lWhGoodsRecordDetailsService;
- this.lWhGoodsRecordService = lWhGoodsRecordService;
+ this.lWhGoodsRecordServiceImpl = lWhGoodsRecordServiceImpl;
this.lWarehouseFlowService = lWarehouseFlowService;
this.goodsBaseService = goodsBaseService;
this.lWhWarningCoreService = lWhWarningCoreService;
@@ -87,7 +91,7 @@
Long warehouseId = lWhFormScrapped.getWarehouseId();
String warehouseName = lWhFormScrapped.getWarehouseName();
// 娴佹按璁板綍鎬昏〃ID
- long lWarehouseFlowId = NumberGenerator.getLongSequenceNumberNano();
+ long lWarehouseFlowId = IdUtil.generateId();
//瑕佹姤搴熺殑鐗╁搧
LWhFormScrappedGoods goods = new LWhFormScrappedGoods();
@@ -117,7 +121,7 @@
String goodsName = (String) tempGoodsInfo.get("goodsname");
String modelName = (String) tempGoodsInfo.get("modelname");
// 鎻掑叆 鍚勮鏍肩墿鍝佺殑杩涘嚭搴撹褰� L_WH_GOODS_RECORD
- long whGoodsRecordId = NumberGenerator.getLongSequenceNumberNano();
+ long whGoodsRecordId = IdUtil.generateId();
LWhGoodsRecord whGoodsRecord = new LWhGoodsRecord();
whGoodsRecord.setId(whGoodsRecordId);
whGoodsRecord.setWarehouseType(warehouseType);
@@ -167,7 +171,7 @@
// 鎵归噺鎻掑叆 杩涘嚭搴撴祦姘存槑缁哰L_WH_GOODS_RECORD_DETAILS]
lWhGoodsRecordDetailsService.sameGoodsInsertMore(srappedGoodsIds, whGoodsRecordId, (short) 2);
}
- lWhGoodsRecordService.insert(whGoodsRecord);
+ lWhGoodsRecordServiceImpl.insert(whGoodsRecord);
}
}
@@ -190,11 +194,6 @@
}
// 鏇存柊鎶ュ簾鍗�
lWhFormScrapped = new LWhFormScrapped(formScrappedId);
- lWhFormScrapped = goodsBaseService.get(lWhFormScrapped);
- if (lWhFormScrapped != null && lWhFormScrapped.getStates() != 0) {
- log.error("鎶ュ簾澶辫触锛佽妫�鏌ユ姤搴熷崟鐘舵��");
- return null;
- }
lWhFormScrapped.setLWarehouseFlowId(lWarehouseFlowId);
lWhFormScrapped.setStates(1);
lWhFormScrapped.setOperatorId(userId);
--
Gitblit v1.9.1