|
|
@@ -203,7 +203,6 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
|
|
|
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- @GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
|
|
|
public R importUser(List<StockGoodsExcel> data, Boolean isCovered) {
|
|
|
StringBuffer good = new StringBuffer();//未找到商品信息的商品
|
|
|
StringBuffer corp = new StringBuffer();//未找到供应商的商品
|
|
|
@@ -407,7 +406,6 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
|
|
|
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- @GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
|
|
|
public R<StockGoods> updateMessage(StockGoods stockGoods) {
|
|
|
StockGoods details = new StockGoods();
|
|
|
if (stockGoods.getId() == null) {
|