From a76e1d17d67641993dea6335cb8e1465a94df58d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 21 五月 2026 15:39:05 +0800
Subject: [PATCH] feat(stock): 优化库存管理和成品树结构功能 1- 为ApproveProcessMapper.xml和ProductBomMapper.xml添加排序功能 2- 在ProductionProductMainDto中新增bomInputQty字段用于产品结构投入数量 3- 修改ProductionProductMainServiceImpl中投入数量计算逻辑，使用前端传入的bomInputQty值 4- 在ProductWorkOrderDto中添加bomInputQty字段并在服务实现中计算标准投入数量 5- 更新SalesLedgerMapper.xml查询逻辑，从product_summary获取电压信息 6- 为SalesLedgerProduct添加stockId字段并修改库存扣减逻辑使用具体库存ID 7- 重构StockInventoryController中的成品库存树查询接口和导入导出功能 8- 新增成品和非成品库存导入导出的数据模型和Excel工具类 9- 优化StockInventoryServiceImpl中的库存扣减逻辑，支持按特定库存ID操作 10- 更新库存导入导出功能，区分成品和非成品类型并提供相应模板
---
src/main/java/com/ruoyi/common/utils/OrderUtils.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/utils/OrderUtils.java b/src/main/java/com/ruoyi/common/utils/OrderUtils.java
index 52df76b..bd3ac49 100644
--- a/src/main/java/com/ruoyi/common/utils/OrderUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/OrderUtils.java
@@ -13,6 +13,7 @@
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -54,4 +55,54 @@
// 鎷兼帴璁㈠崟缂栧彿 preFix + 鏃堕棿锛坹yyyMMdd锛� + 璁㈠崟鏁伴噺(001)
return preFix + LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE).replaceAll("-", "") + String.format("%03d", (aLong + 1)) + "-" + new Date().getTime();
}
+
+ /**
+ * 鏌ヨ褰撳ぉ鍩轰簬 create_time 鐨勬渶鏂扮紪鍙凤紝骞剁敓鎴愪笅涓�涓紪鍙�
+ * @param mapper mapper
+ * @param preFix 缂栧彿鍓嶇紑
+ * @param code 缂栧彿瀛楁
+ * @param <T> 瀹炰綋绫诲瀷
+ * @return 璁㈠崟缂栧彿
+ */
+ public static <T> String countTodayByCreateTime(BaseMapper<T> mapper,String preFix,String code) {
+ LocalDate today = LocalDate.now();
+ LocalDateTime todayStart = today.atStartOfDay();
+ LocalDateTime tomorrowStart = today.plusDays(1).atStartOfDay();
+ String dateStr = today.format(DateTimeFormatter.BASIC_ISO_DATE);
+ String codePrefix = preFix + dateStr;
+
+ QueryWrapper<T> wrapper = new QueryWrapper<>();
+ wrapper.select(code)
+ .ge("create_time", todayStart)
+ .lt("create_time", tomorrowStart)
+ .likeRight(code, codePrefix)
+ .orderByDesc(code)
+ .last("LIMIT 1");
+
+ long nextSeq = 1;
+ List<Map<String, Object>> records = mapper.selectMaps(wrapper);
+ if (!records.isEmpty()) {
+ Object lastCode = records.get(0).get(code);
+ if (lastCode != null) {
+ nextSeq = extractSequence(lastCode.toString(), codePrefix) + 1;
+ }
+ }
+
+ return preFix + dateStr + String.format("%03d", nextSeq);
+ }
+
+ private static long extractSequence(String fullCode, String codePrefix) {
+ if (!fullCode.startsWith(codePrefix)) {
+ return 0;
+ }
+ String seqStr = fullCode.substring(codePrefix.length()).trim();
+ if (seqStr.isEmpty()) {
+ return 0;
+ }
+ try {
+ return Long.parseLong(seqStr);
+ } catch (NumberFormatException e) {
+ return 0;
+ }
+ }
}
--
Gitblit v1.9.3