From 29d3f24dc43df41103bc5f483bfc439494a80971 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 17 十二月 2025 09:30:32 +0800
Subject: [PATCH] 对接mes 对接华晓agv 对接海康agv 初始化开发
---
src/main/java/com/zy/asrs/entity/LocMast.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 3103c4b..c9c6ba9 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.zy.asrs.service.BasLocStsService;
-import com.zy.asrs.service.BasWhsService;
+import com.zy.asrs.service.BasWhsTypeService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import com.core.common.Cools;
@@ -96,15 +96,29 @@
@TableField("loc_type")
private String locType;
+ /**
+ * 1.浣庡簱浣�
+ * 2.楂樺簱浣�
+ *
+ */
@ApiModelProperty(value= "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿")
@TableField("loc_type1")
private Short locType1;
- @ApiModelProperty(value= "瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿")
+ /**
+ * 1.灏忔墭鐩�
+ * 2.澶ф墭鐩�
+ */
+ @ApiModelProperty(value= "")
@TableField("loc_type2")
private Short locType2;
- @ApiModelProperty(value= "杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿")
+ /**
+ * 婊戝潡鍜岃繛鎺ュ櫒搴撳尯鍒�
+ * 1.婊戝潡搴�
+ * 2.閾炬帴鍣ㄥ簱
+ */
+ @ApiModelProperty(value= "")
@TableField("loc_type3")
private Short locType3;
@@ -197,10 +211,10 @@
public String getWhsType$(){
- BasWhsService service = SpringUtils.getBean(BasWhsService.class);
- BasWhs basWhs = service.selectById(this.whsType);
- if (!Cools.isEmpty(basWhs)){
- return String.valueOf(basWhs.getWhsDesc());
+ BasWhsTypeService service = SpringUtils.getBean(BasWhsTypeService.class);
+ BasWhsType basWhsType = service.selectById(this.whsType);
+ if (!Cools.isEmpty(basWhsType)){
+ return String.valueOf(basWhsType.getWhsDesc());
}
return null;
}
@@ -310,14 +324,14 @@
}
public String getFrozen$() {
- if (null == this.frozen){ return null; }
+ if (null == this.frozen){ return "鏈喕缁�"; }
switch (this.frozen){
case 0:
return "鏈喕缁�";
case 1:
return "宸插喕缁�";
default:
- return null;
+ return "鏈喕缁�";
}
}
--
Gitblit v1.9.1