From 1c0dbad152362ac704a27ecfc5b5d08247385d87 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 21 十月 2025 17:12:48 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/entity/LocMast.java | 138 +++++++++++++++++++++++++---------------------
1 files changed, 75 insertions(+), 63 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..f9440ba 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -4,12 +4,12 @@
import com.baomidou.mybatisplus.annotations.TableId;
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.system.entity.User;
-import com.zy.system.service.UserService;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasLocStsService;
+import com.zy.asrs.service.BasWhsTypeService;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -26,7 +26,7 @@
/**
* 搴撲綅鍙�
*/
- @ApiModelProperty(value= "搴撲綅鍙�")
+ @ApiModelProperty(value = "搴撲綅鍙�")
@TableId(value = "loc_no", type = IdType.INPUT)
@TableField("loc_no")
private String locNo;
@@ -34,198 +34,208 @@
/**
* 搴撲綅绫诲瀷
*/
- @ApiModelProperty(value= "搴撲綅绫诲瀷")
+ @ApiModelProperty(value = "搴撲綅绫诲瀷")
@TableField("whs_type")
private Long whsType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("plt_type")
private Integer pltType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_type")
private Integer ctnType;
- @ApiModelProperty(value= "搴撲綅鐘舵��")
+ @ApiModelProperty(value = "搴撲綅鐘舵��")
@TableField("loc_sts")
private String locSts;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("sheet_no")
private String sheetNo;
/**
* 鍫嗗灈鏈哄彿(asr_bas_crnp)
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
+ @ApiModelProperty(value = "鍫嗗灈鏈哄彿")
@TableField("crn_no")
private Integer crnNo;
/**
* 鎺�
*/
- @ApiModelProperty(value= "鎺�")
+ @ApiModelProperty(value = "鎺�")
private Integer row1;
/**
* 鍒�
*/
- @ApiModelProperty(value= "鍒�")
+ @ApiModelProperty(value = "鍒�")
private Integer bay1;
/**
* 灞�
*/
- @ApiModelProperty(value= "灞�")
+ @ApiModelProperty(value = "灞�")
private Integer lev1;
+
+ /**
+ * 缁�
+ */
+ @ApiModelProperty(value = "缁�")
+ private Integer gro1;
/**
* 婊℃澘
*/
- @ApiModelProperty(value= "婊℃澘")
+ @ApiModelProperty(value = "婊℃澘")
@TableField("full_plt")
private String fullPlt;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("loc_type")
private String locType;
- @ApiModelProperty(value= "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿")
+ @ApiModelProperty(value = "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿")
@TableField("loc_type1")
private Short locType1;
- @ApiModelProperty(value= "瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿")
+ @ApiModelProperty(value = "瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿")
@TableField("loc_type2")
private Short locType2;
- @ApiModelProperty(value= "杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿")
+ @ApiModelProperty(value = "杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿")
@TableField("loc_type3")
private Short locType3;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("out_enable")
private String outEnable;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("io_time")
private Date ioTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("first_time")
private Date firstTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("error_time")
private Date errorTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("error_memo")
private String errorMemo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_kind")
private Integer ctnKind;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("sc_weight")
private Double scWeight;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("inv_wh")
private String invWh;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String mk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String barcode;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("Pdc_type")
private String PdcType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_no")
private String ctnNo;
- public String getWhsType$(){
- BasWhsService service = SpringUtils.getBean(BasWhsService.class);
- BasWhs basWhs = service.selectById(this.whsType);
- if (!Cools.isEmpty(basWhs)){
+ public String getWhsType$() {
+ BasWhsTypeService service = SpringUtils.getBean(BasWhsTypeService.class);
+ BasWhsType basWhs = service.selectById(this.whsType);
+ if (!Cools.isEmpty(basWhs)) {
return String.valueOf(basWhs.getWhsDesc());
}
return null;
}
- public String getLocSts$(){
+ public String getLocSts$() {
BasLocStsService service = SpringUtils.getBean(BasLocStsService.class);
BasLocSts basLocSts = service.selectById(this.locSts);
- if (!Cools.isEmpty(basLocSts)){
+ if (!Cools.isEmpty(basLocSts)) {
return String.valueOf(basLocSts.getLocDesc());
}
return null;
}
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
+ public String getIoTime$() {
+ if (Cools.isEmpty(this.ioTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public String getFirstTime$(){
- if (Cools.isEmpty(this.firstTime)){
+ public String getFirstTime$() {
+ if (Cools.isEmpty(this.firstTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.firstTime);
}
public String getLocType1$() {
- if (null == this.locType1){ return null; }
- switch (this.locType1){
+ if (null == this.locType1) {
+ return null;
+ }
+ switch (this.locType1) {
case 0:
return "鏈煡";
case 1:
- return "灏忓簱浣�";
+ return "浣庡簱浣�";
case 2:
- return "澶у簱浣�";
+ return "楂樺簱浣�";
default:
return String.valueOf(this.locType1);
}
}
public String getLocType2$() {
- if (null == this.locType2){ return null; }
- switch (this.locType2){
+ if (null == this.locType2) {
+ return null;
+ }
+ switch (this.locType2) {
case 0:
return "鏈煡";
case 1:
@@ -238,8 +248,10 @@
}
public String getLocType3$() {
- if (null == this.locType3){ return null; }
- switch (this.locType3){
+ if (null == this.locType3) {
+ return null;
+ }
+ switch (this.locType3) {
case 0:
return "鏈煡";
case 1:
@@ -251,40 +263,40 @@
}
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
- public String getErrorTime$(){
- if (Cools.isEmpty(this.errorTime)){
+ public String getErrorTime$() {
+ if (Cools.isEmpty(this.errorTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
--
Gitblit v1.9.1