From c46191d359fb8dcf9ea875d16200eff4fa8cad79 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 25 三月 2025 13:39:35 +0800
Subject: [PATCH] #新增 1. 新增库区批量修改接口 2. 物料分组删除上级编码必传判断
---
rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java | 6 +++---
1 files changed, 3 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 c026c72..4f37cc8 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
@@ -41,7 +41,7 @@
.getOne(new LambdaQueryWrapper<SerialRule>()
.eq(SerialRule::getCode, code));
if (Objects.isNull(serialRule)) {
- throw new CoolException("閲囪喘缂栫爜瑙勫垯涓嶅瓨鍦紒锛�");
+ throw new CoolException("褰撳墠涓氬姟锛�" + code + "锛岀紪鐮佽鍒欎笉瀛樺湪锛侊紒");
}
SerialRuleItemService serialRuleItemService = SpringUtils.getBean(SerialRuleItemService.class);
@@ -64,7 +64,7 @@
format = DateUtils.format(new Date(), "yyyy");
} else if (serialRule.getReset().equals(SerialRuleReset.SERIAL_REST_TYPE_MONTH.type)) {
format = DateUtils.format(new Date(), "MM");
- } else {
+ } else if (serialRule.getReset().equals(SerialRuleReset.SERIAL_REST_TYPE_DAYS.type)){
format = DateUtils.format(new Date(), "dd");
}
//褰撳墠鍊艰嚜鍔ㄥ姞1
@@ -128,7 +128,7 @@
* @time 2025/3/5 14:00
*/
public static Map<?, ?> objectToMap (Object obj) {
- if (obj == null) {
+ if (Objects.isNull(obj)) {
return null;
}
ObjectMapper objectMapper = new ObjectMapper();
--
Gitblit v1.9.1