From 17f9f7d74b7f2f3344b335441f9bf1653cff03f0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 15:38:52 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java
index 5bbc861..4e67c2f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java
@@ -64,9 +64,9 @@
if (serialRule.getReset().equals(SerialRuleReset.SERIAL_REST_TYPE_YEAR.type)) {
format = DateUtils.format(new Date(), "yyyy");
} else if (serialRule.getReset().equals(SerialRuleReset.SERIAL_REST_TYPE_MONTH.type)) {
- format = DateUtils.format(new Date(), "MM");
+ format = DateUtils.format(new Date(), "yyyyMM");
} else if (serialRule.getReset().equals(SerialRuleReset.SERIAL_REST_TYPE_DAYS.type)){
- format = DateUtils.format(new Date(), "dd");
+ format = DateUtils.format(new Date(), "yyyyMMdd");
}
//褰撳墠鍊艰嚜鍔ㄥ姞1
Integer curVal = serialRule.getCurrValue() + 1;
@@ -91,7 +91,6 @@
}
}
});
-
serialRule.setLastCode(buffer.toString());
//淇敼褰撳墠瑙勫垯缂栫爜鍙疯嚦鏁版嵁搴�
if (!ruleService.saveOrUpdate(serialRule)) {
--
Gitblit v1.9.1