From 053f53f9e0d6d20404c1a00c70d4a01da9a54fd6 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 27 六月 2026 13:59:17 +0800
Subject: [PATCH] fix: 出入库批号生成修改
---
src/main/java/com/ruoyi/common/utils/OrderUtils.java | 120 +++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 94 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/utils/OrderUtils.java b/src/main/java/com/ruoyi/common/utils/OrderUtils.java
index 2364bf9..ecd91e7 100644
--- a/src/main/java/com/ruoyi/common/utils/OrderUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/OrderUtils.java
@@ -6,6 +6,7 @@
import org.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Component;
+import java.lang.reflect.Field;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
@@ -13,6 +14,7 @@
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -21,38 +23,104 @@
*/
public class OrderUtils {
+ /**
+ * List<Integer> 杞崲涓� Long[] 鏁扮粍
+ * @param ids
+ * @return
+ */
+ public static Long[] listIntegerToLongArray(List<Integer> ids) {
+ return ids.stream()
+ // 澶勭悊null鍊硷細濡傛灉鍏冪礌涓簄ull锛岃浆鎹负0L锛堝彲鏍规嵁涓氬姟璋冩暣锛屾瘮濡傛姏寮傚父锛�
+ .map(id -> id != null ? id.longValue() : -1L)
+ // 灏哠tream<Long>杞崲涓篖ong[]鏁扮粍
+ .toArray(Long[]::new);
+ }
/**
- * 鏌ヨ褰撳ぉ锛堝熀浜巆reateTime瀛楁锛夌殑璁板綍鏁伴噺
- * @param mapper 瀹炰綋绫诲搴旂殑BaseMapper
- * @param <T> 瀹炰綋绫绘硾鍨�
- * @return 褰撳ぉ璁板綍鏁伴噺
+ * 鍒ゆ柇鐩爣id鏄惁鍦ㄩ�楀彿鍒嗛殧鐨勫瓧绗︿覆涓�
+ * @param targetId
+ * @param str
+ * @return
*/
- 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 boolean isStaffIdExist(Object targetId,String str) {
+ // 绌哄�兼牎楠岋紝閬垮厤绌烘寚閽�
+ if (str == null || str.trim().isEmpty() || targetId == null) {
+ return false;
+ }
+ // 鎸夐�楀彿鍒嗗壊鎴愭暟缁�
+ String[] idArray = str.split(",");
+ // 閬嶅巻鏁扮粍鍒ゆ柇鏄惁鍖呭惈鐩爣id
+ for (String id : idArray) {
+ // 鍘婚櫎绌烘牸锛堥槻姝㈠瓧绗︿覆涓湁澶氫綑绌烘牸锛屽"1, 121"锛�
+ String cleanId = id.trim();
+ // 杞崲涓烘暟瀛楀苟姣旇緝
+ try {
+ if (cleanId.equals(String.valueOf(targetId))) {
+ return true;
+ }
+ } catch (NumberFormatException e) {
+ // 鑻ュ瓨鍦ㄩ潪鏁板瓧ID锛岀洿鎺ヨ繑鍥瀎alse
+ return false;
+ }
+ }
+ return false;
+ }
- // 杞崲涓篋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); // 灏忎簬褰撳ぉ缁撴潫锛堥伩鍏嶆绉掔簿搴﹂棶棰橈級
- // 鎵ц鏌ヨ
- 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();
+ /**
+ * 鐢熸垚褰撳ぉ鎵规鍙凤細鍓嶇紑 + yyyyMMdd + 杩炲彿搴忓彿锛堝綋澶╁凡鏈夊悓绫绘壒娆′腑鏈�澶у簭鍙�+1锛�
+ *
+ * <p>瑙勫垯锛氭煡鍑哄綋澶╂墍鏈� batch 瀛楁浠� prefix 寮�澶寸殑璁板綍锛屽彇鍚庣紑鏈�澶ф暟瀛�+1銆�
+ * 鏍煎紡绀轰緥锛歊K20260627-0001</p>
+ *
+ * @param mapper 瀹炰綋绫诲搴旂殑 BaseMapper
+ * @param preFix 鍓嶇紑锛屽 "RK" / "CK"
+ * @param batchField 鏁版嵁搴撳瓧娈靛悕锛屽 "inbound_batches" / "outbound_batches"
+ * @param <T> 瀹炰綋绫绘硾鍨�
+ * @return 鎵规鍙凤紝濡� "RK20260627-0001"
+ */
+ public static <T> String countTodayByCreateTime(BaseMapper<T> mapper, String preFix, String batchField) {
+ String dateStr = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+ String prefix = preFix + dateStr;
+
+ LocalDateTime todayStart = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
+ LocalDateTime todayEnd = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
+
+ QueryWrapper<T> qw = new QueryWrapper<>();
+ qw.ge("create_time", Date.from(todayStart.atZone(ZoneId.systemDefault()).toInstant()))
+ .lt("create_time", Date.from(todayEnd.atZone(ZoneId.systemDefault()).toInstant()))
+ .likeRight(batchField, prefix);
+
+ List<T> list = mapper.selectList(qw);
+
+ int maxSeq = 0;
+ for (T record : list) {
+ try {
+ Field f = record.getClass().getDeclaredField(
+ batchField.equals("inbound_batches") ? "inboundBatches" : "outboundBatches");
+ f.setAccessible(true);
+ String batch = (String) f.get(record);
+ if (batch != null && batch.startsWith(prefix + "-")) {
+ String suffix = batch.substring((prefix + "-").length());
+ // 鍙尮閰嶇函鏁板瓧搴忓彿锛�1-99999锛夛紝鎺掗櫎鏃堕棿鎴虫牸寮�
+ if (suffix.matches("\\d{1,5}")) {
+ int n = Integer.parseInt(suffix);
+ if (n > maxSeq) maxSeq = n;
+ }
+ }
+ } catch (Exception ignored) {
+ }
+ }
+
+ return prefix + "-" + String.format("%04d", maxSeq + 1);
+ }
+
+ /**
+ * 鍏煎鏃х鍚嶁�斺�旈粯璁� batchField 涓� "inbound_batches"
+ */
+ public static <T> String countTodayByCreateTime(BaseMapper<T> mapper, String preFix) {
+ return countTodayByCreateTime(mapper, preFix, "inbound_batches");
}
--
Gitblit v1.9.3