From 57e23c353a177b9c003a2f524a2adeaf641e2e4c Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期五, 16 八月 2024 17:09:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wms-dev' into wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ShelvesRule.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ShelvesRule.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ShelvesRule.java
index 952206e..6916686 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ShelvesRule.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ShelvesRule.java
@@ -5,7 +5,9 @@
import java.text.SimpleDateFormat;
import java.util.*;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.wms.asrs.service.LanewayRuleService;
+import com.zy.asrs.wms.asrs.service.ShelvesRuleDetlService;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
@@ -42,6 +44,12 @@
private Long id;
/**
+ * 瑙勫垯鍚嶇О
+ */
+ @ApiModelProperty(value= "瑙勫垯鍚嶇О")
+ private String name;
+
+ /**
* 瑙勫垯绫诲瀷 0: 浼樺厛骞冲眰 1: 浼樺厛绔嬩綋
*/
@ApiModelProperty(value= "瑙勫垯绫诲瀷 0: 浼樺厛骞冲眰 1: 浼樺厛绔嬩綋 ")
@@ -69,7 +77,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
@@ -156,6 +163,11 @@
return list;
}
+ public List<ShelvesRuleDetl> getRuleDetl$() {
+ ShelvesRuleDetlService service = SpringUtils.getBean(ShelvesRuleDetlService.class);
+ return service.list(new LambdaQueryWrapper<ShelvesRuleDetl>().eq(ShelvesRuleDetl::getRuleId, id));
+ }
+
public String getRuleType$(){
if (null == this.ruleType){ return null; }
switch (this.ruleType){
--
Gitblit v1.9.1