From 7bb6b996d2993ea2f6cb20132316c0fc6885cb6d Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 16 一月 2026 13:29:44 +0800
Subject: [PATCH] #pda-订单出库
---
rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java | 12 +++++++++---
1 files changed, 9 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..f580e64 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
@@ -5,6 +5,7 @@
import com.vincent.rsf.framework.common.SpringUtils;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.utils.DateUtils;
+import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.entity.SerialRule;
import com.vincent.rsf.server.system.entity.SerialRuleItem;
import com.vincent.rsf.server.system.enums.SerialRuleReset;
@@ -55,6 +56,12 @@
throw new CoolException("缂栫爜瑙勫垯鏄庣粏涓虹┖锛侊紒");
}
+ //閾跺骇鐗逛緵
+ if (code.equals(SerialRuleCode.SYS_ASN_ORDER)){
+ StringBuffer buffer = new StringBuffer();
+ Object poCode = objectToMap(obj).get("poCode");
+ return poCode == null ? "" : buffer.append(poCode).toString();
+ }
StringBuffer buffer = new StringBuffer();
ruleItems.forEach(rule -> {
if (rule.getWkType().equals(SerialRuleType.WK_CONSTANT.wkType)) {
@@ -64,9 +71,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(), "yyMM");
} else if (serialRule.getReset().equals(SerialRuleReset.SERIAL_REST_TYPE_DAYS.type)){
- format = DateUtils.format(new Date(), "dd");
+ format = DateUtils.format(new Date(), "yyMMdd");
}
//褰撳墠鍊艰嚜鍔ㄥ姞1
Integer curVal = serialRule.getCurrValue() + 1;
@@ -91,7 +98,6 @@
}
}
});
-
serialRule.setLastCode(buffer.toString());
//淇敼褰撳墠瑙勫垯缂栫爜鍙疯嚦鏁版嵁搴�
if (!ruleService.saveOrUpdate(serialRule)) {
--
Gitblit v1.9.1