From 43a8037b60150b65651c03fd654621d37075d051 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 16 四月 2025 18:00:26 +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/manager/entity/Matnr.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 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 3978f0c..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;
@@ -43,19 +45,19 @@
/**
* 鍚嶇О
*/
- @ApiModelProperty(value= "鍚嶇О")
+ @ApiModelProperty(value= "鐗╂枡鍚嶇О")
private String name;
/**
* 缂栫爜
*/
- @ApiModelProperty(value= "缂栫爜")
+ @ApiModelProperty(value= "鐗╂枡缂栫爜")
private String code;
/**
* 璐т富ID
*/
- @ApiModelProperty(value= "璐т富ID")
+ @ApiModelProperty(value= "璐т富鏍囪瘑")
private Long shipperId;
// @ApiModelProperty(value = "璐т富缂栫爜")
@@ -64,7 +66,7 @@
/**
* 鍒嗙粍ID(*)
*/
- @ApiModelProperty(value= "鍒嗙粍ID(*)")
+ @ApiModelProperty(value= "鐗╂枡鍒嗙粍(*)")
private Long groupId;
/**
@@ -82,7 +84,7 @@
/**
* 瑙勫垯浠ｇ爜
*/
- @ApiModelProperty(value= "瑙勫垯浠ｇ爜")
+ @ApiModelProperty(value= "鎵规瑙勫垯鏍囪瘑")
private Long rglarId;
/**
@@ -118,7 +120,7 @@
/**
* 闀�*瀹�*楂�(m)
*/
- @ApiModelProperty(value= "闀�*瀹�*楂�(m)")
+ @ApiModelProperty(value= "灏哄(m)")
private String size;
/**
@@ -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