From d41a06bb77cca03b97eba0630d0e4dcf3557cbd4 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期一, 04 十二月 2023 13:20:50 +0800
Subject: [PATCH] feat: 登录页图片更换 导航栏标题更换
---
consum-base/src/main/java/com/consum/base/core/WarehouseCoreService.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/core/WarehouseCoreService.java b/consum-base/src/main/java/com/consum/base/core/WarehouseCoreService.java
index feab773..265d3ad 100644
--- a/consum-base/src/main/java/com/consum/base/core/WarehouseCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/core/WarehouseCoreService.java
@@ -1,14 +1,17 @@
package com.consum.base.core;
import com.consum.base.core.param.BaseWarehouseParam;
-import com.consum.base.core.utils.SqlParameter;
import com.consum.base.core.utils.DateUtil;
+import com.consum.base.core.utils.IdUtil;
+import com.consum.base.core.utils.SqlParameter;
import com.consum.model.po.*;
import com.walker.infrastructure.utils.NumberGenerator;
import com.walker.jdbc.service.BaseServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import java.util.ArrayList;
@@ -20,6 +23,7 @@
*/
@Service
@Slf4j
+@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
public class WarehouseCoreService extends BaseServiceImpl {
public static void main(String[] args) {
@@ -187,7 +191,7 @@
//濡傛灉鍑哄簱鐨勫瀷鍙蜂笌鍒嗗彂鍗曢噷鐨勫瀷鍙风浉鍚�
if (goods.getBaseGoodsModelsId().longValue() == output.getWhGoods().getBaseGoodsModelsId().longValue()){
DepFormLendingModel model = new DepFormLendingModel();
- model.setId(NumberGenerator.getLongSequenceNumber());
+ model.setId(IdUtil.generateId());
model.setCounts(goods.getCounts());
model.setDepFormLendingGoodsId(goods.getId());
model.setDepFormLendingId(goods.getDepFormLendingId());
@@ -267,7 +271,7 @@
//鍙樻洿鐘舵�佷负璋冩嫧
nGoods.setStates(param.getOutput_type());
nGoods.setWhCount(param.getCount());
- nGoods.setId(NumberGenerator.getLongSequenceNumber());
+ nGoods.setId(IdUtil.generateId());
insert(nGoods);
CheckWarehouseResult nresult = new CheckWarehouseResult();
@@ -317,7 +321,7 @@
WhFormProcure procure = get(new WhFormProcure(),"ID=?",new Object[]{procureModel.getWhFormProcureId()});
WhGoods goods = new WhGoods();
- goods.setId(NumberGenerator.getLongSequenceNumber());
+ goods.setId(IdUtil.generateId());
goods.setBaseGoodsTemplateId(procureModel.getBaseGoodsTemplateId());
goods.setGoodsTemplateName(procureModel.getGoodsTemplateName());
goods.setBaseGoodsModelsId(procureModel.getBaseGoodsModelsId());
--
Gitblit v1.9.1