From 40d9cd510741a098bd52cbe22a5f9e5528f45abc Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 23 四月 2025 17:09:01 +0800
Subject: [PATCH] # 新增 1. 通过单据新增出库单功能 2. 新增生成出库单接口
---
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java | 37 ++++++++-----------------------------
1 files changed, 8 insertions(+), 29 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java
index 329be84..dd4893a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java
@@ -4,6 +4,8 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.vincent.rsf.server.system.service.DictDataService;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
@@ -153,38 +155,15 @@
this.memo = memo;
}
-// SerialRule serialRule = new SerialRule(
-// null, // 缂栧彿
-// null, // 鍚嶇О
-// null, // 鍒嗛殧绗�
-// null, // 搴忓彿閲嶇疆瑙勫垯[闈炵┖]
-// null, // 閲嶇疆渚濊禆
-// null, // 褰撳墠鍊�
-// null, // 鏈�杩戠敓鎴愮紪鐮�
-// null, // 鐘舵�乕闈炵┖]
-// null, // 鏄惁鍒犻櫎[闈炵┖]
-// null, // 绉熸埛
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿[闈炵┖]
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿[闈炵┖]
-// null // 澶囨敞
-// );
-
public String getReset$(){
if (null == this.reset){ return null; }
- switch (this.reset){
- case "year":
- return " 骞�";
- case "month":
- return " 鏈�";
- case "dd":
- return " 澶�";
- case "non":
- return " 鏃�";
- default:
- return String.valueOf(this.reset);
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode,"sys_rule_type").eq(DictData::getValue, this.reset));
+ if (null != dictData){
+ return dictData.getLabel();
}
+ return String.valueOf(this.reset);
}
public String getStatus$(){
--
Gitblit v1.9.1