From 8ae2f2dcfe7e263d42c21ed7644641c780445b95 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 16 一月 2026 17:45:50 +0800
Subject: [PATCH] 空板改余料回库优化
---
src/main/java/com/zy/asrs/entity/LocAroundBind.java | 53 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocAroundBind.java b/src/main/java/com/zy/asrs/entity/LocAroundBind.java
index 77f9731..f18f3ed 100644
--- a/src/main/java/com/zy/asrs/entity/LocAroundBind.java
+++ b/src/main/java/com/zy/asrs/entity/LocAroundBind.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasLocStsService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
@@ -20,16 +22,16 @@
private Long id;
/**
- * 鍙版満ID
+ * 鏈哄彴ID
*/
- @ApiModelProperty(value= "鍙版満ID")
+ @ApiModelProperty(value= "鏈哄彴ID")
@TableField("dev_id")
private Long devId;
/**
- * 鍙版満鍙�
+ * 鏈哄彴鍙�
*/
- @ApiModelProperty(value= "鍙版満鍙�")
+ @ApiModelProperty(value= "鏈哄彴鍙�")
@TableField("dev_no")
private String devNo;
@@ -45,20 +47,53 @@
*/
@ApiModelProperty(value= "搴撲綅鐮�")
@TableField("b_loc_no")
- private String bLocNo;
+ private String blocNo;
+
+ @ApiModelProperty("鏄惁榛樿")
+ @TableField("is_default")
+ private Integer isDefault;
+
+ @ApiModelProperty("宸ヤ綅鐘舵��")
+ @TableField("loc_type")
+ private String locType;
+
+ @ApiModelProperty("鏈哄彴鍚嶇О")
+ @TableField("dev_name")
+ private String devName;
public LocAroundBind() {}
- public LocAroundBind(Long devId,String devNo,Long bLocId,String bLocNo) {
+ public LocAroundBind(Long devId,String devNo,Long bLocId,String blocNo) {
this.devId = devId;
this.devNo = devNo;
this.bLocId = bLocId;
- this.bLocNo = bLocNo;
+ this.blocNo = blocNo;
+ }
+
+ public String getDef$() {
+ if (this.isDefault == 0) {
+ return "澶囩敤";
+ } else {
+ return "榛樿";
+ }
+ }
+
+ public String getLocType$() {
+ if (this.locType == null) {
+ return null;
+ }
+ BasLocStsService service = SpringUtils.getBean(BasLocStsService.class);
+ BasLocSts basLocSts = service.selectById(this.locType);
+ if (!Cools.isEmpty(basLocSts)){
+ return String.valueOf(basLocSts.getLocDesc());
+ }
+ return null;
+
}
// LocAroundBind locAroundBind = new LocAroundBind(
-// null, // 鍙版満ID[闈炵┖]
-// null, // 鍙版満鍙穂闈炵┖]
+// null, // 鏈哄彴ID[闈炵┖]
+// null, // 鏈哄彴鍙穂闈炵┖]
// null, // 搴撲綅ID[闈炵┖]
// null // 搴撲綅鐮乕闈炵┖]
// );
--
Gitblit v1.9.1