From d07154d92334ba2ec312bf738a2a02a60350d5d9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 29 九月 2025 13:34:21 +0800
Subject: [PATCH] 2. pda 组托加减号 应该是整数加减(完成) 3. 站点状态，显示清楚 （完成） 4. 站点保存报错， 修改人，创建人员显示 错误（完成） 5. agv入库不显示 历史库位记录 (完成) 6. 任务类型，应该为入库 (完成)
---
src/main/java/com/zy/asrs/entity/BasStation.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasStation.java b/src/main/java/com/zy/asrs/entity/BasStation.java
index fc6a71e..f2f4b9d 100644
--- a/src/main/java/com/zy/asrs/entity/BasStation.java
+++ b/src/main/java/com/zy/asrs/entity/BasStation.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.zy.asrs.enums.LocStsType;
import org.springframework.format.annotation.DateTimeFormat;
import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
@@ -40,7 +42,7 @@
*/
@ApiModelProperty(value= "缂栧彿")
@TableField("dev_no")
- private Integer devNo;
+ private String devNo;
/**
* 璁惧鎻忚堪
@@ -145,6 +147,10 @@
@ApiModelProperty(value= "")
private String area;
+ @ApiModelProperty("搴撳尯ID")
+ @TableField("area_id")
+ private String areaId;
+
@ApiModelProperty(value= "")
@TableField("in_ok")
private String inOk;
@@ -221,7 +227,7 @@
public BasStation() {}
- public BasStation(Integer devNo,String decDesc,String devMk,String inEnable,String outEnable,String autoing,String loading,String locSts,String canining,String canouting,String fronting,String rearing,String uping,String downing,Integer wrkNo,Integer ctnType,String barcode,Integer inQty,Integer row1,Date ioTime,String area,String inOk,String outOk,Short locType1,Short locType2,Short locType3,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Double stdQty,Double minWt,Double grossWt) {
+ public BasStation(String devNo,String decDesc,String devMk,String inEnable,String outEnable,String autoing,String loading,String locSts,String canining,String canouting,String fronting,String rearing,String uping,String downing,Integer wrkNo,Integer ctnType,String barcode,Integer inQty,Integer row1,Date ioTime,String area,String inOk,String outOk,Short locType1,Short locType2,Short locType3,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Double stdQty,Double minWt,Double grossWt) {
this.devNo = devNo;
this.decDesc = decDesc;
this.devMk = devMk;
@@ -300,6 +306,26 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
+ public String getLocSts$() {
+ if (Cools.isEmpty(this.locSts)){
+ return null;
+ }
+ if (this.locSts.equals(LocStsType.LOC_STS_TYPE_O.type)) {
+ return LocStsType.LOC_STS_TYPE_O.type + "." + LocStsType.LOC_STS_TYPE_O.desc;
+ } else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_R.type)) {
+ return LocStsType.LOC_STS_TYPE_R.type + "." + LocStsType.LOC_STS_TYPE_R.desc;
+ } else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_S.type)) {
+ return LocStsType.LOC_STS_TYPE_S.type + "." + LocStsType.LOC_STS_TYPE_S.desc;
+ } else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_F.type)) {
+ return LocStsType.LOC_STS_TYPE_F.type + "." + LocStsType.LOC_STS_TYPE_F.desc;
+ } else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_X.type)) {
+ return LocStsType.LOC_STS_TYPE_X.type + "." + LocStsType.LOC_STS_TYPE_X.desc;
+ } else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_D.type)) {
+ return LocStsType.LOC_STS_TYPE_D.type + "." + LocStsType.LOC_STS_TYPE_D.desc;
+ }
+ return null;
+ }
+
public String getLocType1$(){
if (null == this.locType1){ return null; }
switch (this.locType1){
--
Gitblit v1.9.1