From e10b63a4b69eb4a55079ad372f1fa3b58d08a054 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 13 四月 2026 16:12:10 +0800
Subject: [PATCH] refactor(utils): 优化订单编号生成逻辑
---
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | 2
src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java | 2
src/main/java/com/ruoyi/projectManagement/controller/RolesController.java | 2
src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java | 2
src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java | 2
src/main/java/com/ruoyi/common/utils/OrderUtils.java | 49 ++++++++++++++----------
src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java | 2
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java | 2
src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java | 2
src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java | 2
src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java | 2
11 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
index 4a9317b..9e74e2a 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -99,7 +99,7 @@
// String approveID = today + formattedCount;
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
ApproveProcess approveProcess = new ApproveProcess();
- String no = OrderUtils.countTodayByCreateTime(approveProcessMapper, "SP");
+ String no = OrderUtils.countTodayByCreateTime(approveProcessMapper, "SP","approveId");
approveProcess.setApproveId(no);
approveProcess.setApproveUser(approveProcessVO.getApproveUser());
approveProcess.setApproveUserName(sysUser.getNickName());
diff --git a/src/main/java/com/ruoyi/common/utils/OrderUtils.java b/src/main/java/com/ruoyi/common/utils/OrderUtils.java
index 7bb9aba..476e207 100644
--- a/src/main/java/com/ruoyi/common/utils/OrderUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/OrderUtils.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.ruoyi.common.utils.uuid.UUID;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Component;
@@ -72,32 +73,40 @@
* @param mapper 瀹炰綋绫诲搴旂殑BaseMapper
* @param <T> 瀹炰綋绫绘硾鍨�
* @return 褰撳ぉ璁板綍鏁伴噺
+ * code 琛ㄧ紪鐮佸瓧娈�
*/
- public static <T> String countTodayByCreateTime(BaseMapper<T> mapper,String preFix) {
- // 鑾峰彇褰撳ぉ寮�濮嬫椂闂达紙00:00:00锛�
- LocalDateTime todayStart = LocalDateTime.of(
- LocalDateTime.now().toLocalDate(),
- LocalTime.MIN
- );
- // 鑾峰彇褰撳ぉ缁撴潫鏃堕棿锛�23:59:59.999锛�
- LocalDateTime todayEnd = LocalDateTime.of(
- LocalDateTime.now().toLocalDate(),
- LocalTime.MAX
- );
+ public static <T> String countTodayByCreateTime(BaseMapper<T> mapper,String preFix,String code) {
+ // 1. 褰撳ぉ鏃堕棿鑼冨洿
+ LocalDateTime todayStart = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
+ LocalDateTime todayEnd = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
- // 杞崲涓篋ate绫诲瀷锛堝鏋滃疄浣撶被涓璫reateTime鏄疞ocalDateTime鍙洿鎺ヤ娇鐢級
Date startDate = Date.from(todayStart.atZone(ZoneId.systemDefault()).toInstant());
Date endDate = Date.from(todayEnd.atZone(ZoneId.systemDefault()).toInstant());
- // 鏋勫缓鏌ヨ鏉′欢
- QueryWrapper<T> queryWrapper = new QueryWrapper<>();
- queryWrapper.ge("create_time", startDate) // 澶т簬绛変簬褰撳ぉ寮�濮�
- .lt("create_time", endDate); // 灏忎簬褰撳ぉ缁撴潫锛堥伩鍏嶆绉掔簿搴﹂棶棰橈級
+ // 2. 鏃ユ湡瀛楃涓� yyyyMMdd
+ String dateStr = LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE);
- // 鎵ц鏌ヨ
- Long aLong = mapper.selectCount(queryWrapper);
- // 鎷兼帴璁㈠崟缂栧彿 preFix + 鏃堕棿锛坹yyyMMdd锛� + 璁㈠崟鏁伴噺(001)
- return preFix + LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE).replaceAll("-", "") + String.format("%03d", (aLong + 1)) + "-" + new Date().getTime();
+ // 4. 鏌ヨ浠婂ぉ鏈�鍚庝竴鏉＄紪鍙凤紙鎸夋椂闂村�掑簭锛屽彇鏈�鏂颁竴鏉★級
+ QueryWrapper<T> wrapper = new QueryWrapper<>();
+ wrapper.ge("create_time", startDate)
+ .lt("create_time", endDate)
+ .orderByDesc("create_time")
+ .last("LIMIT 1");
+
+ // 杩欓噷蹇呴』鐢� selectMaps 鎴� selectMap锛屼笉瑕佺敤 selectOne锛岄伩鍏嶅疄浣撶被闂
+ Map<String, Object> result = (Map<String, Object>) mapper.selectOne(wrapper);
+
+ long nextSeq = 1;
+ if (result != null && result.get(code) != null) {
+ String fullCode = result.get(code).toString(); // 渚嬪锛欰BC20250122005
+
+ // 鉁� 鍏抽敭锛氭埅鍙栨渶鍚� 3 浣嶅簭鍙�
+ String seqStr = fullCode.substring(fullCode.length() - 3);
+ nextSeq = Long.parseLong(seqStr) + 1;
+ }
+
+ // 5. 鐢熸垚缂栧彿
+ return preFix + dateStr + String.format("%03d", nextSeq);
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
index 19509a3..1e31842 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -535,7 +535,7 @@
Long aLong = customStorageMapper.selectCount(null);
item.setInboundBatches(aLong.equals(0L) ? "绗�1鎵规(鑷畾涔夊叆搴�)" : "绗�"+ (aLong + 1) + "鎵规(鑷畾涔夊叆搴�)" );
item.setCreateBy(loginUser.getNickName());
- item.setCode(OrderUtils.countTodayByCreateTime(customStorageMapper, ""));
+ item.setCode(OrderUtils.countTodayByCreateTime(customStorageMapper, "", "code"));
customStorageMapper.insert(item);
});
return AjaxResult.success("鑷畾涔夊叆搴撴垚鍔�");
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
index d2b6142..151b965 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
@@ -72,7 +72,7 @@
@Override
public boolean addReturnManagementDto(ReturnManagementDto returnManagementDto) {
- String rt = OrderUtils.countTodayByCreateTime(returnManagementMapper, "RT");
+ String rt = OrderUtils.countTodayByCreateTime(returnManagementMapper, "RT","returnNo");
returnManagementDto.setReturnNo(rt);
save(returnManagementDto);
for (ReturnSaleProduct returnSaleProduct : returnManagementDto.getReturnSaleProducts()) {
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java b/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
index e3ca4a3..3385128 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
@@ -35,7 +35,7 @@
@ApiOperation("鏂板")
public AjaxResult add(@RequestBody RoleDto roleDto) {
if (roleDto.getIsDefaultNo()) {
- roleDto.setNo(OrderUtils.countTodayByCreateTime(rolesMapper, "XMJS"));
+ roleDto.setNo(OrderUtils.countTodayByCreateTime(rolesMapper, "XMJS","no"));
}
return AjaxResult.success(rolesservice.save(roleDto));
}
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
index 9eebe0a..d23cc11 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
@@ -42,7 +42,7 @@
@PostMapping("/add")
public AjaxResult add(@RequestBody PurchaseReturnOrderDto purchaseReturnOrderDto) throws Exception {
if (purchaseReturnOrderDto.getIsDefaultNo()) {
- purchaseReturnOrderDto.setNo(OrderUtils.countTodayByCreateTime(purchaseReturnOrdersMapper, "CGTL"));
+ purchaseReturnOrderDto.setNo(OrderUtils.countTodayByCreateTime(purchaseReturnOrdersMapper, "CGTL","no"));
}
return AjaxResult.success(purchaseReturnOrdersService.add(purchaseReturnOrderDto));
}
diff --git a/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java b/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
index c67d438..8318580 100644
--- a/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
+++ b/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
@@ -43,7 +43,7 @@
@ApiOperation("娣诲姞鏀粯涓庡彂璐т俊鎭�")
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(@RequestBody PaymentShipping paymentShipping) {
- String ord = OrderUtils.countTodayByCreateTime(paymentShippingMapper, "ORD");
+ String ord = OrderUtils.countTodayByCreateTime(paymentShippingMapper, "ORD","orderNo");
paymentShipping.setOrderNo(ord);
boolean save = paymentShippingService.save(paymentShipping);
return save ? success() : error();
diff --git a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
index db3c5b9..bd73a67 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
@@ -74,7 +74,7 @@
@Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody ShippingInfoDto req) throws Exception {
LoginUser loginUser = SecurityUtils.getLoginUser();
- String sh = OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SH");
+ String sh = OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SH","shippingNo");
// 鍙戣揣瀹℃壒
ApproveProcessVO approveProcessVO = new ApproveProcessVO();
approveProcessVO.setApproveType(7);
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java
index 8e18058..ce3358e 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java
@@ -63,7 +63,7 @@
LoginUser loginUser = SecurityUtils.getLoginUser();
SalesQuotation salesQuotation = new SalesQuotation();
BeanUtils.copyProperties(salesQuotationDto, salesQuotation);
- String quotationNo = OrderUtils.countTodayByCreateTime(salesQuotationMapper, "QT");
+ String quotationNo = OrderUtils.countTodayByCreateTime(salesQuotationMapper, "QT","quotationNo");
salesQuotation.setQuotationNo(quotationNo);
salesQuotation.setStatus("寰呭鎵�");
salesQuotationMapper.insert(salesQuotation);
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
index 30e545f..4f96ff5 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
@@ -46,7 +46,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public int add(StockInRecordDto stockInRecordDto) {
- String no = OrderUtils.countTodayByCreateTime(stockInRecordMapper, "RK");
+ String no = OrderUtils.countTodayByCreateTime(stockInRecordMapper, "RK","inboundBatches");
stockInRecordDto.setInboundBatches(no);
StockInRecord stockInRecord = new StockInRecord();
BeanUtils.copyProperties(stockInRecordDto, stockInRecord);
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
index e01fe5d..99cc760 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
@@ -51,7 +51,7 @@
@Override
public int add(StockOutRecordDto stockOutRecordDto) {
- String no = OrderUtils.countTodayByCreateTime(stockOutRecordMapper, "CK");
+ String no = OrderUtils.countTodayByCreateTime(stockOutRecordMapper, "CK","outboundBatches");
stockOutRecordDto.setOutboundBatches(no);
StockInRecord stockInRecord = new StockInRecord();
BeanUtils.copyProperties(stockOutRecordDto, stockInRecord);
--
Gitblit v1.9.3