From 87f07e589fb1c8103513a5fcc8febe3b14f5535f Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期五, 01 十二月 2023 17:30:46 +0800
Subject: [PATCH] feat: 1、图片预览使用半路径 2、部门物品退回详情
---
consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java | 42 +++++++++++++++++-------------------------
1 files changed, 17 insertions(+), 25 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java b/consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java
index b92480e..d893072 100644
--- a/consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java
+++ b/consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java
@@ -1,22 +1,21 @@
package com.consum.base.core;
-import com.consum.base.core.tools.SqlParameter;
+import com.consum.base.core.utils.SqlParameter;
import com.consum.model.po.BaseCodeIndexing;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.NumberGenerator;
import com.walker.jdbc.service.BaseServiceImpl;
-import io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
-import org.springframework.util.IdGenerator;
-
-import java.util.List;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
/**
* 缂栫爜缁熶竴鐢熸垚鏈嶅姟
*/
@Service
+@Transactional(propagation = Propagation.NOT_SUPPORTED)
public class CodeGeneratorService extends BaseServiceImpl {
@@ -58,7 +57,7 @@
*
* @return 浠撳簱缂栫爜瑙勫垯涓猴細WH+鍥涗綅鏁板瓧杩炲彿锛�0001锛�
*/
- public String createWarehouseCode() {
+ public synchronized String createWarehouseCode() {
/*
1.SELECT CODE_INDEX from BASE_CODE_INDEXING where CODE_PREFIX=:CODE_PREFIX
CODE_PREFIX鏄�"WH"
@@ -66,20 +65,17 @@
insert BASE_CODE_INDEXING CODE_INDEX=1 CODE_PREFIX鏄�="WH" where CODE_PREFIX=:CODE_PREFIX;
2.濡傛灉鑳藉鑾峰彇鍒帮紝鍒欏皢CODE_INDEX=CODE_INDEX+1鍚庢洿鏂板埌鏁版嵁搴擄紝琛ュ叏鍓嶉潰鐨�"0"杩斿洖 "0001"
*/
- synchronized (this){
- String CODE_PREFIX = CodeGeneratorEnum.Warehouse.getValue();
- return createCodeByPrefix(CODE_PREFIX,4);
- }
+ String CODE_PREFIX = CodeGeneratorEnum.Warehouse.getValue();
+ return createCodeByPrefix(CODE_PREFIX,4);
}
/**
* 鐢熸垚鐗╁搧缂栫爜
*
* @param classify A,B,C
- * @param type 1=闆嗛噰锛�2=鑷噰
* @return 鍏�8浣嶏紝 涓�浣嶇墿鍝佸垎绫伙紙A/B/C锛�+涓�浣嶇被鍨嬶紙1涓洪泦閲囷紝2涓鸿嚜閲囷級+6浣嶈繛缁暟瀛楀彿
*/
- public String createGoodsTemplateCode(String classify, int type) {
+ public synchronized String createGoodsTemplateCode(String classify) {
/*
1.SELECT CODE_INDEX from BASE_CODE_INDEXING where CODE_PREFIX=:CODE_PREFIX
CODE_PREFIX鏄� prefix
@@ -87,10 +83,8 @@
insert BASE_CODE_INDEXING CODE_INDEX=1 CODE_PREFIX鏄�=:prefix where CODE_PREFIX=:CODE_PREFIX;
2.濡傛灉鑳藉鑾峰彇鍒帮紝鍒欏皢CODE_INDEX=CODE_INDEX+1鍚庢洿鏂板埌鏁版嵁搴擄紝琛ュ叏鍓嶉潰鐨�"0"杩斿洖 "000001"
*/
- synchronized (this){
- String prefix = classify + Integer.valueOf(type).toString();
- return createCodeByPrefix(prefix,6);
- }
+ String prefix = classify;
+ return createCodeByPrefix(prefix,6);
}
/**
@@ -99,16 +93,14 @@
* @param codeGeneratorEnum CodeGeneratorEnum
* @return 1.涓や綅鍓嶇紑锛堝锛欳G浠ｈ〃閲囪喘鍗曪級+鍏綅骞存湀鏃ワ紙230226锛�23骞�2鏈�26鏃ワ級+鍥涗綅鏁板瓧杩炲彿锛�0002锛�
*/
- public String createBusinessFormCode(CodeGeneratorEnum codeGeneratorEnum) {
+ public synchronized String createBusinessFormCode(CodeGeneratorEnum codeGeneratorEnum) {
- synchronized (this){
- String prefix = codeGeneratorEnum.getValue();
- int[] days = DateUtils.getCurrentYearMonthDay();
- prefix += StringUtils.removeStart(Integer.valueOf(days[0]).toString(),"20");
- prefix += days[1] < 9 ? "0" + Integer.valueOf(days[1]).toString() : days[1];
- prefix += days[2] < 9 ? "0" + Integer.valueOf(days[2]).toString() : days[2];
- return createCodeByPrefix(prefix,4);
- }
+ String prefix = codeGeneratorEnum.getValue();
+ int[] days = DateUtils.getCurrentYearMonthDay();
+ prefix += StringUtils.removeStart(Integer.valueOf(days[0]).toString(),"20");
+ prefix += days[1] < 9 ? "0" + Integer.valueOf(days[1]).toString() : days[1];
+ prefix += days[2] < 9 ? "0" + Integer.valueOf(days[2]).toString() : days[2];
+ return createCodeByPrefix(prefix,4);
}
--
Gitblit v1.9.1