From 014270352f8e19b51bbb4367ae2ff256050a30a2 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 22 四月 2025 14:03:42 +0800 Subject: [PATCH] #修改优化 1. 字典优化修改 2. 编码规则优化 3. 出库单编码生成为空问题修复 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java index 46c25f4..44cd0d1 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java @@ -9,6 +9,8 @@ import com.vincent.rsf.server.manager.service.CompanysService; import com.vincent.rsf.server.manager.service.MatnrGroupService; import com.vincent.rsf.server.manager.service.ShipperService; +import com.vincent.rsf.server.system.entity.SerialRule; +import com.vincent.rsf.server.system.service.SerialRuleService; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; import java.text.SimpleDateFormat; @@ -364,15 +366,14 @@ } return null; } - - public String getRglarId$(){ - BatchRegularService service = SpringUtils.getBean(BatchRegularService.class); - BatchRegular batchRegular = service.getById(this.rglarId); - if (!Cools.isEmpty(batchRegular)){ - return String.valueOf(batchRegular.getCode()); - } - return null; - } +// public String getRglarId$(){ +// SerialRuleService service = SpringUtils.getBean(SerialRuleService.class); +// SerialRule batchRegular = service.getById(this.rglarId); +// if (!Cools.isEmpty(batchRegular)){ +// return String.valueOf(batchRegular.getCode()); +// } +// return null; +// } public String getStockLeval$(){ if (null == this.stockLevel){ return null; } -- Gitblit v1.9.1