From bb2ba875a4c7ed5f0c31a216862c5fd4cbf88c6e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 19 九月 2025 09:24:24 +0800
Subject: [PATCH] 新增仓库 新增库区 新增缓冲区库位
---
src/main/java/com/zy/asrs/entity/LocMast.java | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 24b93ea..7eaa33e 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;
@@ -78,6 +78,12 @@
*/
@ApiModelProperty(value= "灞�")
private Integer lev1;
+
+ /**
+ * 缁�
+ */
+ @ApiModelProperty(value= "缁�")
+ private Integer gro1;
/**
* 婊℃澘
@@ -176,12 +182,25 @@
@TableField("ctn_no")
private String ctnNo;
+ /**
+ * 鏄惁鍐荤粨
+ */
+ @ApiModelProperty(value= "鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�")
+ private Integer frozen;
+
+ /**
+ * 鍐荤粨澶囨敞
+ */
+ @ApiModelProperty(value= "鍐荤粨澶囨敞")
+ @TableField("frozen_memo")
+ private String frozenMemo;
+
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;
}
@@ -215,9 +234,9 @@
case 0:
return "鏈煡";
case 1:
- return "灏忓簱浣�";
+ return "浣庡簱浣�";
case 2:
- return "澶у簱浣�";
+ return "楂樺簱浣�";
default:
return String.valueOf(this.locType1);
}
@@ -290,4 +309,16 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
}
+ public String getFrozen$() {
+ if (null == this.frozen){ return "鏈喕缁�"; }
+ switch (this.frozen){
+ case 0:
+ return "鏈喕缁�";
+ case 1:
+ return "宸插喕缁�";
+ default:
+ return "鏈喕缁�";
+ }
+ }
+
}
--
Gitblit v1.9.1